Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleaned include files

Browse Source 
- removed some dependencies between other header files
- removed many includes of <QtGui> and replaced it with only needed files

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3312 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-07-23 18:52:58 +00:00
parent ba47eedfe3
commit 569ac25843
94 changed files with 251 additions and 462 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
retroshare-gui/src/gui/ChannelFeed.cpp
View File

@ -18,7 +18,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, * Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <QtGui>
#include <QMenu>
#include <QTimer>
#include <QStandardItemModel>
#include <iostream> #include <iostream>
#include <algorithm> #include <algorithm>

3
retroshare-gui/src/gui/ChannelFeed.h
View File

@ -27,8 +27,6 @@
#include "ui_ChannelFeed.h" #include "ui_ChannelFeed.h"
#include <QStandardItemModel>
#include "gui/feeds/FeedHolder.h" #include "gui/feeds/FeedHolder.h"
#define OWN 0 #define OWN 0
@ -37,6 +35,7 @@
#define OTHER 3 #define OTHER 3
class ChanMsgItem; class ChanMsgItem;
class QStandardItemModel;
class ChannelFeed : public RsAutoUpdatePage, public FeedHolder, private Ui::ChannelFeed class ChannelFeed : public RsAutoUpdatePage, public FeedHolder, private Ui::ChannelFeed
{ {

18
retroshare-gui/src/gui/DetailsDialog.cpp
View File

@ -19,25 +19,13 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include "DetailsDialog.h"
#include <QAction>
#include <QTreeView>
#include <QList>
#include <QtDebug>
#include <QContextMenuEvent>
#include <QMenu>
#include <QCursor>
#include <QPoint>
#include <QPixmap>
#include <QHeaderView>
#include <QModelIndex>
#include <QStandardItemModel> #include <QStandardItemModel>
#include "util/misc.h" #include "DetailsDialog.h"
#include "TransfersDialog.h" #include "TransfersDialog.h"
#include "util/misc.h"
/** Default constructor */ /** Default constructor */
DetailsDialog::DetailsDialog(QWidget *parent, Qt::WFlags flags) DetailsDialog::DetailsDialog(QWidget *parent, Qt::WFlags flags)
: QDialog(parent, flags) : QDialog(parent, flags)

5
retroshare-gui/src/gui/DetailsDialog.h
View File

@ -22,12 +22,7 @@
#ifndef _DETAILSDIALOG_H #ifndef _DETAILSDIALOG_H
#define _DETAILSDIALOG_H #define _DETAILSDIALOG_H
#include <QtGui>
#include <QObject>
#include <QModelIndex>
#include <QVariant>
#include <stdint.h> #include <stdint.h>
#include "ui_DetailsDialog.h" #include "ui_DetailsDialog.h"
class FileChunksInfo ; class FileChunksInfo ;

9
retroshare-gui/src/gui/ForumsDialog.cpp
View File

@ -19,22 +19,25 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <QMenu>
#include <QFile>
#include <QDateTime>
#include <QMessageBox>
#include "ForumsDialog.h" #include "ForumsDialog.h"
#include "gui/RetroShareLink.h" #include "gui/RetroShareLink.h"
#include "gui/forums/CreateForum.h" #include "gui/forums/CreateForum.h"
#include "gui/forums/CreateForumMsg.h" #include "gui/forums/CreateForumMsg.h"
#include "gui/forums/ForumDetails.h" #include "gui/forums/ForumDetails.h"
#include "msgs/MessageComposer.h" #include "msgs/MessageComposer.h"
#include "gui/settings/rsharesettings.h"
#include "rsiface/rsiface.h"
#include "rsiface/rspeers.h" #include "rsiface/rspeers.h"
#include "rsiface/rsmsgs.h"
#include "rsiface/rsforums.h" #include "rsiface/rsforums.h"
#include <sstream> #include <sstream>
#include <algorithm> #include <algorithm>
#include <QtGui>
/* Images for context menu icons */ /* Images for context menu icons */
#define IMAGE_MESSAGE ":/images/folder-draft.png" #define IMAGE_MESSAGE ":/images/folder-draft.png"

2
retroshare-gui/src/gui/GenCertDialog.h
View File

@ -23,7 +23,7 @@
#ifndef _GENCERTDIALOG_H #ifndef _GENCERTDIALOG_H
#define _GENCERTDIALOG_H #define _GENCERTDIALOG_H
#include "rsiface/rsiface.h" //#include "rsiface/rsiface.h"
#include "ui_GenCertDialog.h" #include "ui_GenCertDialog.h"

13
retroshare-gui/src/gui/LinksDialog.cpp
View File

@ -19,27 +19,20 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <QFile> #include <QMenu>
#include <QFileInfo> #include <QTimer>
#include <QMessageBox>
#include <QDateTime> #include <QDateTime>
#include <QDesktopServices> #include <QDesktopServices>
#include <QUrl>
#include "common/vmessagebox.h"
//#include "rshare.h"
#include "LinksDialog.h" #include "LinksDialog.h"
#include "RetroShareLink.h" #include "RetroShareLink.h"
#include "rsiface/rspeers.h" #include "rsiface/rspeers.h"
#include "rsiface/rsrank.h" #include "rsiface/rsrank.h"
#include "rsiface/rsfiles.h" #include "rsiface/rsfiles.h"
#include <iostream>
#include <sstream> #include <sstream>
#include <QMenu>
#include <QTimer>
/* Images for context menu icons */ /* Images for context menu icons */
#define IMAGE_EXPORTFRIEND ":/images/exportpeers_16x16.png" #define IMAGE_EXPORTFRIEND ":/images/exportpeers_16x16.png"

2
retroshare-gui/src/gui/LinksDialog.h
View File

@ -22,8 +22,6 @@
#ifndef _LINKS_DIALOG_H #ifndef _LINKS_DIALOG_H
#define _LINKS_DIALOG_H #define _LINKS_DIALOG_H
#include <QFileDialog>
#include "mainpage.h" #include "mainpage.h"
#include "ui_LinksDialog.h" #include "ui_LinksDialog.h"

8
retroshare-gui/src/gui/MainWindow.cpp
View File

@ -24,6 +24,7 @@
#include <QtDebug> #include <QtDebug>
#include <QIcon> #include <QIcon>
#include <QPixmap> #include <QPixmap>
#include <QColorDialog>
#ifdef BLOGS #ifdef BLOGS
#include "gui/unfinished/blogs/BlogsDialog.h" #include "gui/unfinished/blogs/BlogsDialog.h"
@ -47,6 +48,13 @@
#include "HelpDialog.h" #include "HelpDialog.h"
#include "AboutDialog.h" #include "AboutDialog.h"
#include "QuickStartWizard.h" #include "QuickStartWizard.h"
#include "ChannelFeed.h"
#include "bwgraph/bwgraph.h"
#include "help/browser/helpbrowser.h"
#ifdef UNFINISHED
#include "unfinished/ApplicationWindow.h"
#endif
#include "gui/TurtleRouterDialog.h" #include "gui/TurtleRouterDialog.h"
#include "idle/idle.h" #include "idle/idle.h"

17
retroshare-gui/src/gui/MainWindow.h
View File

@ -25,18 +25,11 @@
#include <QSystemTrayIcon> #include <QSystemTrayIcon>
#include <set> #include <set>
#ifdef UNFINISHED
#include "unfinished/ApplicationWindow.h"
#endif
#include "ChannelFeed.h"
#include "bwgraph/bwgraph.h"
#include "help/browser/helpbrowser.h"
#include "ui_MainWindow.h" #include "ui_MainWindow.h"
#include "gui/common/rwindow.h" #include "gui/common/rwindow.h"
class QComboBox;
class QLabel;
class Idle; class Idle;
class PeerStatus; class PeerStatus;
class NATStatus; class NATStatus;
@ -51,6 +44,8 @@ class MessagesDialog;
class SharedFilesDialog; class SharedFilesDialog;
class MessengerWindow; class MessengerWindow;
class PluginsPage; class PluginsPage;
class ChannelFeed;
class BandwidthGraph;
#ifndef RS_RELEASE_VERSION #ifndef RS_RELEASE_VERSION
class LinksDialog; class LinksDialog;
@ -61,6 +56,10 @@ class NewsFeed;
class BlogsDialog; class BlogsDialog;
#endif #endif
#ifdef UNFINISHED
class ApplicationWindow;
#endif
class MainWindow : public RWindow class MainWindow : public RWindow
{ {
Q_OBJECT Q_OBJECT

14
retroshare-gui/src/gui/MessagesDialog.cpp
View File

@ -19,19 +19,29 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <QItemDelegate>
#include <QPainter>
#include <QPaintEvent>
#include <QStandardItemModel>
#include <QShortcut>
#include <QTimer>
#include <QDateTime>
#include <QPrinter>
#include <QPrintDialog>
#include <QTextStream>
#include <QTextCodec>
#include "MessagesDialog.h" #include "MessagesDialog.h"
#include "msgs/MessageComposer.h" #include "msgs/MessageComposer.h"
#include "gui/RetroShareLink.h" #include "gui/RetroShareLink.h"
#include "util/printpreview.h" #include "util/printpreview.h"
#include "settings/rsharesettings.h"
#include "util/misc.h" #include "util/misc.h"
#include "rsiface/rsinit.h" #include "rsiface/rsinit.h"
#include "rsiface/rsiface.h"
#include "rsiface/rspeers.h" #include "rsiface/rspeers.h"
#include "rsiface/rsfiles.h" #include "rsiface/rsfiles.h"
#include <QtGui>
/* Images for context menu icons */ /* Images for context menu icons */
#define IMAGE_MESSAGE ":/images/folder-draft.png" #define IMAGE_MESSAGE ":/images/folder-draft.png"

1
retroshare-gui/src/gui/MessengerWindow.cpp
View File

@ -21,6 +21,7 @@
#include <QFile> #include <QFile>
#include <QFileInfo> #include <QFileInfo>
#include <QWidgetAction>
#include "common/vmessagebox.h" #include "common/vmessagebox.h"
#include "rsiface/rsiface.h" #include "rsiface/rsiface.h"

39
retroshare-gui/src/gui/NetworkDialog.cpp
View File

@ -19,39 +19,24 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <QFile> #include <QTreeWidget>
#include <QFileInfo> #include <QFileDialog>
#include <QCursor> #include <QDebug>
#include <QTimer>
#include <QTime>
#include <QMenu>
#include "rshare.h"
#include "common/vmessagebox.h"
#include "NetworkDialog.h"
#include "NetworkView.h"
#include "TrustView.h"
#include "GenCertDialog.h"
#include "rsiface/rsiface.h" #include "rsiface/rsiface.h"
#include "rsiface/rspeers.h" #include "rsiface/rspeers.h"
#include "rsiface/rsdisc.h" #include "rsiface/rsdisc.h"
#include "settings/rsharesettings.h"
#include <algorithm>
/* for GPGME */
#include "rsiface/rsinit.h"
#include <gpgme.h>
#include <sstream>
#include <QTimer>
#include <QTime>
#include <QContextMenuEvent>
#include <QMenu>
#include <QCursor>
#include <QPoint>
#include <QPixmap>
#include <QHeaderView>
#include "common/vmessagebox.h"
#include "NetworkDialog.h"
#include "TrustView.h"
#include "GenCertDialog.h"
#include "connect/ConfCertDialog.h" #include "connect/ConfCertDialog.h"
#include "settings/rsharesettings.h"
/* Images for context menu icons */ /* Images for context menu icons */
#define IMAGE_LOADCERT ":/images/loadcert16.png" #define IMAGE_LOADCERT ":/images/loadcert16.png"

4
retroshare-gui/src/gui/NetworkDialog.h
View File

@ -23,10 +23,6 @@
#ifndef _CONNECTIONSDIALOG_H #ifndef _CONNECTIONSDIALOG_H
#define _CONNECTIONSDIALOG_H #define _CONNECTIONSDIALOG_H
#include <QFileDialog>
#include <QtGui>
#include "mainpage.h"
#include "ui_NetworkDialog.h" #include "ui_NetworkDialog.h"
#include "RsAutoUpdatePage.h" #include "RsAutoUpdatePage.h"

5
retroshare-gui/src/gui/NetworkView.cpp
View File

@ -21,14 +21,9 @@
#include "NetworkView.h" #include "NetworkView.h"
#include "rsiface/rspeers.h" #include "rsiface/rspeers.h"
#include "rsiface/rsdisc.h"
#include "rsiface/rsinit.h"
#include <gpgme.h> #include <gpgme.h>
#include <QGraphicsItem>
#include <iostream> #include <iostream>
#include <algorithm> #include <algorithm>

5
retroshare-gui/src/gui/NewsFeed.cpp
View File

@ -18,12 +18,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, * Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <QtGui>
#include <QTimer>
#include "NewsFeed.h" #include "NewsFeed.h"
#include <iostream>
#include "rsiface/rsnotify.h" #include "rsiface/rsnotify.h"
#include "feeds/ChanNewItem.h" #include "feeds/ChanNewItem.h"

8
retroshare-gui/src/gui/PeersDialog.cpp
View File

@ -21,6 +21,13 @@
#include <QFile> #include <QFile>
#include <QFileInfo> #include <QFileInfo>
#include <QShortcut>
#include <QWidgetAction>
#include <QScrollBar>
#include <QDesktopWidget>
#include <QColorDialog>
#include <QFontDialog>
#include <QDropEvent>
#include "common/vmessagebox.h" #include "common/vmessagebox.h"
#include <gui/mainpagestack.h> #include <gui/mainpagestack.h>
@ -43,6 +50,7 @@
#include "gui/connect/ConnectFriendWizard.h" #include "gui/connect/ConnectFriendWizard.h"
#include "gui/forums/CreateForum.h" #include "gui/forums/CreateForum.h"
#include "gui/channels/CreateChannel.h" #include "gui/channels/CreateChannel.h"
#include "gui/feeds/AttachFileItem.h"
#include "RetroShareLink.h" #include "RetroShareLink.h"
#include "MainWindow.h" #include "MainWindow.h"

18
retroshare-gui/src/gui/RemoteDirModel.cpp
View File

@ -19,21 +19,21 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <set> #include <QFileInfo>
#include <QDir>
#include <QDesktopServices>
#include <QUrl>
#include <QMimeData>
#include "RemoteDirModel.h" #include "RemoteDirModel.h"
#include "rsiface/rsfiles.h" #include "rsiface/rsfiles.h"
#include "rsiface/rstypes.h" #include "rsiface/rstypes.h"
#include <QtGui>
#include <QIcon>
#include <QPixmap>
#include <iostream>
#include <sstream>
#include <math.h>
#include <algorithm>
#include "util/misc.h" #include "util/misc.h"
#include <set>
#include <sstream>
#include <algorithm>
/***** /*****
* #define RDM_DEBUG * #define RDM_DEBUG
****/ ****/

9
retroshare-gui/src/gui/RemoteDirModel.h
View File

@ -23,12 +23,11 @@
#define REMOTE_DIR_MODEL #define REMOTE_DIR_MODEL
#include <QAbstractItemModel> #include <QAbstractItemModel>
#include <QIcon>
#include <vector> #include <vector>
#include <list> #include <stdint.h>
#include <string>
#include "rsiface/rsfiles.h" class DirDetails;
#include "util/misc.h"
#include "rsiface/rstypes.h"
static const uint32_t IND_LAST_DAY = 3600*24 ; static const uint32_t IND_LAST_DAY = 3600*24 ;
static const uint32_t IND_LAST_WEEK = 3600*24*7 ; static const uint32_t IND_LAST_WEEK = 3600*24*7 ;

24
retroshare-gui/src/gui/SearchDialog.cpp
View File

@ -19,31 +19,17 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <set> #include <QMessageBox>
#include "rshare.h"
#include "SearchDialog.h" #include "SearchDialog.h"
#include "RetroShareLink.h" #include "RetroShareLink.h"
#include "msgs/MessageComposer.h" #include "msgs/MessageComposer.h"
#include <gui/RSHumanReadableDelegate.h> #include "gui/RSHumanReadableDelegate.h"
#include "rsiface/rsiface.h"
#include "rsiface/rsexpr.h"
#include "rsiface/rsfiles.h"
#include "rsiface/rspeers.h"
#include "rsiface/rsturtle.h"
#include "util/misc.h"
#include "settings/rsharesettings.h" #include "settings/rsharesettings.h"
#include "advsearch/advancedsearchdialog.h"
#include <iostream> #include "rsiface/rsfiles.h"
#include <sstream> #include "rsiface/rsturtle.h"
#include <QContextMenuEvent>
#include <QMenu>
#include <QCursor>
#include <QPoint>
#include <QPixmap>
#include <QHeaderView>
/* Images for context menu icons */ /* Images for context menu icons */
#define IMAGE_START ":/images/download.png" #define IMAGE_START ":/images/download.png"

13
retroshare-gui/src/gui/SearchDialog.h
View File

@ -22,15 +22,12 @@
#ifndef _SEARCHDIALOG_H #ifndef _SEARCHDIALOG_H
#define _SEARCHDIALOG_H #define _SEARCHDIALOG_H
#include <QFileDialog> #include "rsiface/rstypes.h"
#include <QMessageBox>
#include <QModelIndex>
#include <rsiface/rsfiles.h>
#include "mainpage.h"
#include "ui_SearchDialog.h" #include "ui_SearchDialog.h"
#include "advsearch/advancedsearchdialog.h" #include "mainpage.h"
class AdvancedSearchDialog;
class Expression;
#define FRIEND_SEARCH 1 #define FRIEND_SEARCH 1
#define ANONYMOUS_SEARCH 2 #define ANONYMOUS_SEARCH 2

2
retroshare-gui/src/gui/SearchTreeWidget.cpp
View File

@ -19,6 +19,8 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <QMimeData>
#include "SearchTreeWidget.h" #include "SearchTreeWidget.h"
#include <iostream> #include <iostream>

2
retroshare-gui/src/gui/SearchTreeWidget.h
View File

@ -22,7 +22,7 @@
#ifndef _SEARCH_TREE_WIDGET_H #ifndef _SEARCH_TREE_WIDGET_H
#define _SEARCH_TREE_WIDGET_H #define _SEARCH_TREE_WIDGET_H
#include <QtGui> #include <QTreeWidget>
class SearchTreeWidget : public QTreeWidget class SearchTreeWidget : public QTreeWidget
{ {

35
retroshare-gui/src/gui/SharedFilesDialog.cpp
View File

@ -19,40 +19,25 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include "rshare.h" #include <QString>
#include <QTreeView>
#include <QClipboard>
#include <QMenu>
#include <QMovie>
#include <QProcess>
#include "SharedFilesDialog.h" #include "SharedFilesDialog.h"
#include "settings/AddFileAssociationDialog.h" #include "settings/AddFileAssociationDialog.h"
#include "rsiface/rsiface.h"
#include "rsiface/rsmsgs.h"
#include "rsiface/rspeers.h"
#include "rsiface/rsfiles.h"
#include "util/RsAction.h" #include "util/RsAction.h"
#include "msgs/MessageComposer.h" #include "msgs/MessageComposer.h"
#include "settings/rsharesettings.h" #include "settings/rsharesettings.h"
#include "AddLinksDialog.h" #include "AddLinksDialog.h"
#include "SendLinkDialog.h"
#include "RetroShareLink.h" #include "RetroShareLink.h"
#include "gui/RemoteDirModel.h"
#include <iostream> #include "rsiface/rspeers.h"
#include <sstream> #include "rsiface/rsfiles.h"
#include <QClipboard>
#include <QDesktopServices>
#include <QContextMenuEvent>
#include <QMenu>
#include <QCursor>
#include <QPoint>
#include <QPixmap>
#include <QHeaderView>
#include <QTimer>
#include <QMovie>
#include <QLabel>
#include <QMessageBox>
#include <QProcess>
/* Images for context menu icons */ /* Images for context menu icons */
#define IMAGE_DOWNLOAD ":/images/download16.png" #define IMAGE_DOWNLOAD ":/images/download16.png"

6
retroshare-gui/src/gui/SharedFilesDialog.h
View File

@ -22,14 +22,10 @@
#ifndef _SHAREDFILESDIALOG_H #ifndef _SHAREDFILESDIALOG_H
#define _SHAREDFILESDIALOG_H #define _SHAREDFILESDIALOG_H
#include <QFileDialog>
#include <QMovie>
#include "RsAutoUpdatePage.h" #include "RsAutoUpdatePage.h"
#include "ui_SharedFilesDialog.h" #include "ui_SharedFilesDialog.h"
#include "rsiface/rstypes.h" class RemoteDirModel;
#include "gui/RemoteDirModel.h"
class SharedFilesDialog : public RsAutoUpdatePage class SharedFilesDialog : public RsAutoUpdatePage
{ {

3
retroshare-gui/src/gui/SoundManager.cpp
View File

@ -18,6 +18,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, * Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <QSound>
#include "SoundManager.h" #include "SoundManager.h"
#include "settings/rsharesettings.h" #include "settings/rsharesettings.h"

4
retroshare-gui/src/gui/SoundManager.h
View File

@ -21,9 +21,7 @@
#ifndef SOUND_MANAGER_H #ifndef SOUND_MANAGER_H
#define SOUND_MANAGER_H #define SOUND_MANAGER_H
#include <QSound> #include <QObject>
#include <QSettings>
#include <QtGui>
class SoundManager :public QObject class SoundManager :public QObject
{ {

21
retroshare-gui/src/gui/TransfersDialog.cpp
View File

@ -23,9 +23,14 @@
#include <windows.h> #include <windows.h>
#endif #endif
#include <set> #include <QMenu>
#include <QStandardItemModel>
#include <QTreeView>
#include <QShortcut>
#include <QFileInfo>
#include <QMessageBox>
#include <QDesktopServices>
#include "rshare.h"
#include "TransfersDialog.h" #include "TransfersDialog.h"
#include "RetroShareLink.h" #include "RetroShareLink.h"
#include "DetailsDialog.h" #include "DetailsDialog.h"
@ -35,21 +40,9 @@
#include "TurtleRouterDialog.h" #include "TurtleRouterDialog.h"
#include "xprogressbar.h" #include "xprogressbar.h"
#include <QContextMenuEvent>
#include <QMenu>
#include <QCursor>
#include <QPoint>
#include <QPixmap>
#include <QHeaderView>
#include <QStandardItemModel>
#include <QUrl>
#include <sstream>
#include "rsiface/rsfiles.h" #include "rsiface/rsfiles.h"
#include "rsiface/rspeers.h" #include "rsiface/rspeers.h"
#include "rsiface/rsdisc.h" #include "rsiface/rsdisc.h"
#include "rsiface/rstypes.h"
#include <algorithm>
#include "util/misc.h" #include "util/misc.h"
/* Images for context menu icons */ /* Images for context menu icons */

14
retroshare-gui/src/gui/TransfersDialog.h
View File

@ -24,18 +24,8 @@
#include <set> #include <set>
#include <QFileDialog> #include "rsiface/rstypes.h"
#include <QProgressBar>
#include <QtGui>
#include <QObject>
#include <QModelIndex>
#include <QVariant>
#include <stdint.h>
#include <rsiface/rstypes.h>
#include "mainpage.h"
#include "RsAutoUpdatePage.h" #include "RsAutoUpdatePage.h"
#include "xprogressbar.h"
#include "ui_TransfersDialog.h" #include "ui_TransfersDialog.h"
@ -43,7 +33,9 @@
class DLListDelegate; class DLListDelegate;
class ULListDelegate; class ULListDelegate;
class QStandardItemModel; class QStandardItemModel;
class QStandardItem;
class DetailsDialog; class DetailsDialog;
class FileProgressInfo;
class TransfersDialog : public RsAutoUpdatePage class TransfersDialog : public RsAutoUpdatePage
{ {

9
retroshare-gui/src/gui/ULListDelegate.cpp
View File

@ -19,15 +19,10 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <rsiface/rstypes.h> #include <QFileDialog>
#include <QModelIndex>
#include <QPainter>
#include <QStyleOptionProgressBarV2>
#include <QProgressBar>
#include <QApplication>
#include <QtGui>
#include "ULListDelegate.h" #include "ULListDelegate.h"
#include "xprogressbar.h"
Q_DECLARE_METATYPE(FileProgressInfo) Q_DECLARE_METATYPE(FileProgressInfo)

1
retroshare-gui/src/gui/ULListDelegate.h
View File

@ -23,7 +23,6 @@
#define ULLISTDELEGATE_H #define ULLISTDELEGATE_H
#include <QAbstractItemDelegate> #include <QAbstractItemDelegate>
#include "xprogressbar.h"
// Defines for upload list list columns // Defines for upload list list columns
#define UNAME 0 #define UNAME 0

3
retroshare-gui/src/gui/channels/CreateChannel.cpp
View File

@ -19,8 +19,9 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <QtGui>
#include <QMessageBox> #include <QMessageBox>
#include <QBuffer>
#include <QFileDialog>
#include <algorithm> #include <algorithm>

2
retroshare-gui/src/gui/channels/CreateChannel.h
View File

@ -23,8 +23,6 @@
#ifndef _CREATE_CHANNEL_DIALOG_H #ifndef _CREATE_CHANNEL_DIALOG_H
#define _CREATE_CHANNEL_DIALOG_H #define _CREATE_CHANNEL_DIALOG_H
#include <QMainWindow>
#include "ui_CreateChannel.h" #include "ui_CreateChannel.h"
class CreateChannel : public QDialog class CreateChannel : public QDialog

15
retroshare-gui/src/gui/channels/CreateChannelMsg.cpp
View File

@ -18,17 +18,18 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, * Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <QtGui>
#include <QDragEnterEvent>
#include <QUrl>
#include <QFileDialog>
#include <QTimer>
#include <QMessageBox>
#include <QBuffer>
#include "CreateChannelMsg.h" #include "CreateChannelMsg.h"
#include "gui/feeds/SubFileItem.h" #include "gui/feeds/SubFileItem.h"
#include "rsiface/rstypes.h"
#include "rsiface/rspeers.h"
#include "rsiface/rsforums.h"
#include "rsiface/rschannels.h" #include "rsiface/rschannels.h"
#include "rsiface/rsmsgs.h"
#include "rsiface/rsfiles.h" #include "rsiface/rsfiles.h"
#include <iostream> #include <iostream>
@ -446,7 +447,7 @@ void CreateChannelMsg::sendMessage(std::wstring subject, std::wstring msg, std::
if(name.isEmpty()) if(name.isEmpty())
{ /* error message */ { /* error message */
int ret = QMessageBox::warning(this, tr("RetroShare"), QMessageBox::warning(this, tr("RetroShare"),
tr("Please add a Subject"), tr("Please add a Subject"),
QMessageBox::Ok, QMessageBox::Ok); QMessageBox::Ok, QMessageBox::Ok);

14
retroshare-gui/src/gui/chat/PopupChatDialog.cpp
View File

@ -19,7 +19,18 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <QtGui> #include <QMessageBox>
#include <QTimer>
#include <QScrollBar>
#include <QCloseEvent>
#include <QColorDialog>
#include <QDateTime>
#include <QFontDialog>
#include <QDir>
#include <QDesktopWidget>
#include <QFileDialog>
#include <QBuffer>
#include <QTextCodec>
#include <sys/stat.h> #include <sys/stat.h>
#include "PopupChatDialog.h" #include "PopupChatDialog.h"
@ -30,6 +41,7 @@
#include "rsiface/rsmsgs.h" #include "rsiface/rsmsgs.h"
#include "rsiface/rsfiles.h" #include "rsiface/rsfiles.h"
#include "rsiface/rsnotify.h" #include "rsiface/rsnotify.h"
#include "rsiface/rsiface.h"
#include "gui/settings/rsharesettings.h" #include "gui/settings/rsharesettings.h"

10
retroshare-gui/src/gui/chat/PopupChatDialog.h
View File

@ -23,20 +23,12 @@
#ifndef _POPUPCHATDIALOG_H #ifndef _POPUPCHATDIALOG_H
#define _POPUPCHATDIALOG_H #define _POPUPCHATDIALOG_H
#include <QtGui>
#include <QDialog>
#include "ui_PopupChatDialog.h" #include "ui_PopupChatDialog.h"
#include "rsiface/rsiface.h"
#include "gui/feeds/AttachFileItem.h"
class QAction; class QAction;
class QTextEdit; class QTextEdit;
class QTextCharFormat; class QTextCharFormat;
class AttachFileItem;
class ChatInfo; class ChatInfo;
class PopupChatDialog : public QMainWindow class PopupChatDialog : public QMainWindow

11
retroshare-gui/src/gui/connect/ConfCertDialog.cpp
View File

@ -20,12 +20,17 @@
****************************************************************/ ****************************************************************/
#include "ConfCertDialog.h" #include "ConfCertDialog.h"
#include "rsiface/rsiface.h" #include <QMessageBox>
#include <QDateTime>
#include <QMenu>
#include <QClipboard>
#include <iostream>
#include "rsiface/rspeers.h" #include "rsiface/rspeers.h"
#include "rsiface/rsdisc.h" #include "rsiface/rsdisc.h"
#include <QTime> #include "gui/help/browser/helpbrowser.h"
#include <QtGui>
ConfCertDialog *ConfCertDialog::instance() ConfCertDialog *ConfCertDialog::instance()
{ {

2
retroshare-gui/src/gui/connect/ConfCertDialog.h
View File

@ -24,8 +24,6 @@
#define _CONFCERTDIALOG_H #define _CONFCERTDIALOG_H
#include <QDialog> #include <QDialog>
#include "gui/help/browser/helpbrowser.h"
#include "ui_ConfCertDialog.h" #include "ui_ConfCertDialog.h"

1
retroshare-gui/src/gui/elastic/graphwidget.cpp
View File

@ -80,7 +80,6 @@ GraphWidget::GraphWidget(QWidget *parent)
bool GraphWidget::clearGraph() bool GraphWidget::clearGraph()
{ {
QGraphicsScene *oldscene = scene(); QGraphicsScene *oldscene = scene();
Node *oldcenterNode = centerNode;
QGraphicsScene *scene = new QGraphicsScene(this); QGraphicsScene *scene = new QGraphicsScene(this);
scene->setItemIndexMethod(QGraphicsScene::NoIndex); scene->setItemIndexMethod(QGraphicsScene::NoIndex);

32
retroshare-gui/src/gui/elastic/node.cpp
View File

@ -34,29 +34,23 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QFileDialog>
#include <QtGui>
#include <QGraphicsScene> #include <QGraphicsScene>
#include <QGraphicsSceneMouseEvent> #include <QGraphicsSceneMouseEvent>
#include <QPainter> #include <QPainter>
#include <QStyleOption> #include <QStyleOption>
#include <QContextMenuEvent>
#include <QMenu> #include <QMenu>
#include <QCursor>
#include <QPoint>
#include "edge.h" #include "edge.h"
#include "arrow.h" #include "arrow.h"
#include "node.h" #include "node.h"
#include "graphwidget.h" #include "graphwidget.h"
#include <math.h> #include <math.h>
#include "../connect/ConfCertDialog.h"
#include "rsiface/rspeers.h" #include "rsiface/rspeers.h"
#include <iostream> #include <iostream>
#include "../connect/ConfCertDialog.h"
Node::Node(GraphWidget *graphWidget, uint32_t t, std::string id_in, std::string n) Node::Node(GraphWidget *graphWidget, uint32_t t, std::string id_in, std::string n)
: graph(graphWidget), ntype(t), id(id_in), name(n), : graph(graphWidget), ntype(t), id(id_in), name(n),
mDeterminedBB(false) mDeterminedBB(false)
@ -386,11 +380,11 @@ void Node::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
QMenu *sslMenu = menu.addMenu (sslTitle); QMenu *sslMenu = menu.addMenu (sslTitle);
if (RS_PEER_STATE_FRIEND & d2.state) if (RS_PEER_STATE_FRIEND & d2.state)
{ {
QAction *sslAction = sslMenu->addAction("Deny"); sslMenu->addAction("Deny");
} }
else else
{ {
QAction *sslAction = sslMenu->addAction("Allow"); sslMenu->addAction("Allow");
} }
nssl++; nssl++;
} }
@ -421,10 +415,10 @@ void Node::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
} }
case ELASTIC_NODE_TYPE_FRIEND: case ELASTIC_NODE_TYPE_FRIEND:
{ {
QAction *chatAction = menu.addAction("Chat"); menu.addAction("Chat");
QAction *msgAction = menu.addAction("Msg"); menu.addAction("Msg");
menu.addSeparator(); menu.addSeparator();
QAction *connction = menu.addAction("Connect"); menu.addAction("Connect");
menu.addSeparator(); menu.addSeparator();
break; break;
} }
@ -436,12 +430,12 @@ void Node::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
{ {
if (haveSSLcerts) if (haveSSLcerts)
{ {
QAction *makeAction = menu.addAction("Sign Peer and Add Friend"); menu.addAction("Sign Peer and Add Friend");
menu.addSeparator(); menu.addSeparator();
} }
else else
{ {
QAction *makeAction = menu.addAction("Sign Peer to Authenticate"); menu.addAction("Sign Peer to Authenticate");
menu.addSeparator(); menu.addSeparator();
} }
break; break;
@ -451,12 +445,12 @@ void Node::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
{ {
if (haveSSLcerts) if (haveSSLcerts)
{ {
QAction *makeAction = menu.addAction("Sign Peer and Add Friend"); menu.addAction("Sign Peer and Add Friend");
menu.addSeparator(); menu.addSeparator();
} }
else else
{ {
QAction *makeAction = menu.addAction("Sign Peer to Authenticate"); menu.addAction("Sign Peer to Authenticate");
menu.addSeparator(); menu.addSeparator();
} }
break; break;
@ -467,9 +461,9 @@ void Node::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
QObject::connect( detailAction , SIGNAL( triggered() ), this, SLOT( peerdetails() ) ); QObject::connect( detailAction , SIGNAL( triggered() ), this, SLOT( peerdetails() ) );
connect( detailAction , SIGNAL( triggered() ), this, SLOT( peerdetails() ) ); connect( detailAction , SIGNAL( triggered() ), this, SLOT( peerdetails() ) );
QAction *expAction = menu.addAction("Export Certificate"); menu.addAction("Export Certificate");
QAction *selectedAction = menu.exec(event->screenPos()); menu.exec(event->screenPos());
} }
void Node::peerdetails() void Node::peerdetails()

3
retroshare-gui/src/gui/elastic/node.h
View File

@ -38,11 +38,8 @@
#define NODE_H #define NODE_H
#include <QGraphicsItem> #include <QGraphicsItem>
#include <QList>
#include <stdint.h> #include <stdint.h>
#include <string>
#define ELASTIC_NODE_TYPE_OWN 1 #define ELASTIC_NODE_TYPE_OWN 1
#define ELASTIC_NODE_TYPE_FRIEND 2 #define ELASTIC_NODE_TYPE_FRIEND 2
#define ELASTIC_NODE_TYPE_AUTHED 3 #define ELASTIC_NODE_TYPE_AUTHED 3

5
retroshare-gui/src/gui/feeds/AttachFileItem.cpp
View File

@ -18,14 +18,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, * Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <QtGui>
#include <QTimer>
#include "AttachFileItem.h" #include "AttachFileItem.h"
#include "rsiface/rsfiles.h" #include "rsiface/rsfiles.h"
#include <iostream>
/**** /****
* #define DEBUG_ITEM 1 * #define DEBUG_ITEM 1
****/ ****/

2
retroshare-gui/src/gui/feeds/AttachFileItem.h
View File

@ -23,8 +23,6 @@
#define _ATTACH_FILE_ITEM_DIALOG_H #define _ATTACH_FILE_ITEM_DIALOG_H
#include "ui_AttachFileItem.h" #include "ui_AttachFileItem.h"
#include <string>
#include <stdint.h> #include <stdint.h>
const uint32_t AFI_MASK_STATE = 0x000f; const uint32_t AFI_MASK_STATE = 0x000f;

5
retroshare-gui/src/gui/feeds/BlogMsgItem.cpp
View File

@ -18,15 +18,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, * Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <QtGui>
#include <QTimer>
#include "BlogMsgItem.h" #include "BlogMsgItem.h"
#include "FeedHolder.h" #include "FeedHolder.h"
#include "SubFileItem.h" #include "SubFileItem.h"
#include <iostream>
/**** /****
* #define DEBUG_ITEM 1 * #define DEBUG_ITEM 1
****/ ****/

2
retroshare-gui/src/gui/feeds/BlogMsgItem.h
View File

@ -23,8 +23,6 @@
#define _BLOG_MSG_ITEM_DIALOG_H #define _BLOG_MSG_ITEM_DIALOG_H
#include "ui_BlogMsgItem.h" #include "ui_BlogMsgItem.h"
#include <string>
#include <stdint.h> #include <stdint.h>
class FeedHolder; class FeedHolder;

2
retroshare-gui/src/gui/feeds/BlogNewItem.cpp
View File

@ -18,7 +18,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, * Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <QtGui>
#include "BlogNewItem.h" #include "BlogNewItem.h"
#include "FeedHolder.h" #include "FeedHolder.h"
@ -27,7 +26,6 @@
#define BLOG_DEFAULT_IMAGE ":/images/hi64-app-kblogger.png" #define BLOG_DEFAULT_IMAGE ":/images/hi64-app-kblogger.png"
#include <iostream>
/**** /****
* #define DEBUG_ITEM 1 * #define DEBUG_ITEM 1

2
retroshare-gui/src/gui/feeds/BlogNewItem.h
View File

@ -23,8 +23,6 @@
#define _BLOG_NEW_ITEM_DIALOG_H #define _BLOG_NEW_ITEM_DIALOG_H
#include "ui_BlogNewItem.h" #include "ui_BlogNewItem.h"
#include <string>
#include <stdint.h> #include <stdint.h>
class FeedHolder; class FeedHolder;

4
retroshare-gui/src/gui/feeds/ChanMsgItem.cpp
View File

@ -18,8 +18,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, * Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <QtGui>
#include <QDateTime> #include <QDateTime>
#include <QTimer>
#include "ChanMsgItem.h" #include "ChanMsgItem.h"
@ -28,7 +29,6 @@
#include "rsiface/rschannels.h" #include "rsiface/rschannels.h"
#include <iostream>
#include <sstream> #include <sstream>

2
retroshare-gui/src/gui/feeds/ChanMsgItem.h
View File

@ -23,8 +23,6 @@
#define _CHAN_MSG_ITEM_DIALOG_H #define _CHAN_MSG_ITEM_DIALOG_H
#include "ui_ChanMsgItem.h" #include "ui_ChanMsgItem.h"
#include <string>
#include <stdint.h> #include <stdint.h>
class FeedHolder; class FeedHolder;

3
retroshare-gui/src/gui/feeds/ChanNewItem.cpp
View File

@ -18,7 +18,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, * Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <QtGui>
#include "ChanNewItem.h" #include "ChanNewItem.h"
#include "FeedHolder.h" #include "FeedHolder.h"
@ -27,8 +26,6 @@
#define CHAN_DEFAULT_IMAGE ":/images/channels.png" #define CHAN_DEFAULT_IMAGE ":/images/channels.png"
#include <iostream>
/**** /****
* #define DEBUG_ITEM 1 * #define DEBUG_ITEM 1
****/ ****/

2
retroshare-gui/src/gui/feeds/ChanNewItem.h
View File

@ -23,8 +23,6 @@
#define _CHANNEL_NEW_ITEM_DIALOG_H #define _CHANNEL_NEW_ITEM_DIALOG_H
#include "ui_ChanNewItem.h" #include "ui_ChanNewItem.h"
#include <string>
#include <stdint.h> #include <stdint.h>
class FeedHolder; class FeedHolder;

5
retroshare-gui/src/gui/feeds/ForumMsgItem.cpp
View File

@ -18,7 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, * Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <QtGui>
#include <QDateTime>
#include "ForumMsgItem.h" #include "ForumMsgItem.h"
#include "FeedHolder.h" #include "FeedHolder.h"
@ -27,8 +28,6 @@
#include "gui/forums/CreateForumMsg.h" #include "gui/forums/CreateForumMsg.h"
#include <iostream>
/**** /****
* #define DEBUG_ITEM 1 * #define DEBUG_ITEM 1
****/ ****/

2
retroshare-gui/src/gui/feeds/ForumMsgItem.h
View File

@ -26,9 +26,7 @@
class FeedHolder; class FeedHolder;
#include <string>
#include <stdint.h> #include <stdint.h>
class ForumMsgItem : public QWidget, private Ui::ForumMsgItem class ForumMsgItem : public QWidget, private Ui::ForumMsgItem
{ {
Q_OBJECT Q_OBJECT

3
retroshare-gui/src/gui/feeds/ForumNewItem.cpp
View File

@ -18,7 +18,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, * Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <QtGui>
#include "ForumNewItem.h" #include "ForumNewItem.h"
#include "FeedHolder.h" #include "FeedHolder.h"
@ -26,8 +25,6 @@
#include "rsiface/rsforums.h" #include "rsiface/rsforums.h"
#include "gui/forums/CreateForumMsg.h" #include "gui/forums/CreateForumMsg.h"
#include <iostream>
/**** /****
* #define DEBUG_ITEM 1 * #define DEBUG_ITEM 1
****/ ****/

2
retroshare-gui/src/gui/feeds/ForumNewItem.h
View File

@ -23,8 +23,6 @@
#define _FORUM_NEW_ITEM_DIALOG_H #define _FORUM_NEW_ITEM_DIALOG_H
#include "ui_ForumNewItem.h" #include "ui_ForumNewItem.h"
#include <string>
#include <stdint.h> #include <stdint.h>
class FeedHolder; class FeedHolder;

10
retroshare-gui/src/gui/feeds/MsgItem.cpp
View File

@ -18,20 +18,18 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, * Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <QtGui>
#include <QDateTime>
#include <QTimer>
#include "MsgItem.h" #include "MsgItem.h"
#include "FeedHolder.h" #include "FeedHolder.h"
#include "SubFileItem.h" #include "SubFileItem.h"
#include "gui/msgs/MessageComposer.h"
#include "rsiface/rsmsgs.h" #include "rsiface/rsmsgs.h"
#include "rsiface/rspeers.h" #include "rsiface/rspeers.h"
#include "gui/msgs/MessageComposer.h"
#include <iostream>
/**** /****
* #define DEBUG_ITEM 1 * #define DEBUG_ITEM 1
****/ ****/

2
retroshare-gui/src/gui/feeds/MsgItem.h
View File

@ -23,8 +23,6 @@
#define _MSG_ITEM_DIALOG_H #define _MSG_ITEM_DIALOG_H
#include "ui_MsgItem.h" #include "ui_MsgItem.h"
#include <string>
#include <stdint.h> #include <stdint.h>
class FeedHolder; class FeedHolder;

9
retroshare-gui/src/gui/feeds/PeerItem.cpp
View File

@ -18,20 +18,19 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, * Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <QtGui>
#include <QDateTime>
#include <QTimer>
#include "PeerItem.h" #include "PeerItem.h"
#include "FeedHolder.h" #include "FeedHolder.h"
#include "../RsAutoUpdatePage.h" #include "../RsAutoUpdatePage.h"
#include "gui/msgs/MessageComposer.h"
#include "rsiface/rsmsgs.h" #include "rsiface/rsmsgs.h"
#include "rsiface/rspeers.h" #include "rsiface/rspeers.h"
#include "gui/msgs/MessageComposer.h"
#include <iostream>
#include <sstream> #include <sstream>
#include <time.h>
/***** /*****
* #define DEBUG_ITEM 1 * #define DEBUG_ITEM 1

2
retroshare-gui/src/gui/feeds/PeerItem.h
View File

@ -23,8 +23,6 @@
#define _PEER_ITEM_DIALOG_H #define _PEER_ITEM_DIALOG_H
#include "ui_PeerItem.h" #include "ui_PeerItem.h"
#include <string>
#include <stdint.h> #include <stdint.h>
const uint32_t PEER_TYPE_STD = 0x0001; const uint32_t PEER_TYPE_STD = 0x0001;

3
retroshare-gui/src/gui/feeds/SubDestItem.cpp
View File

@ -18,7 +18,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, * Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <QtGui>
#include "SubDestItem.h" #include "SubDestItem.h"
#include "FeedHolder.h" #include "FeedHolder.h"
@ -27,8 +26,6 @@
#include "rsiface/rsforums.h" #include "rsiface/rsforums.h"
#include "rsiface/rschannels.h" #include "rsiface/rschannels.h"
#include <iostream>
/**** /****
* #define DEBUG_ITEM 1 * #define DEBUG_ITEM 1
****/ ****/

2
retroshare-gui/src/gui/feeds/SubDestItem.h
View File

@ -23,8 +23,6 @@
#define _SUB_DEST_ITEM_DIALOG_H #define _SUB_DEST_ITEM_DIALOG_H
#include "ui_SubDestItem.h" #include "ui_SubDestItem.h"
#include <string>
#include <stdint.h> #include <stdint.h>
class SubDestItem : public QWidget, private Ui::SubDestItem class SubDestItem : public QWidget, private Ui::SubDestItem

11
retroshare-gui/src/gui/feeds/SubFileItem.cpp
View File

@ -18,16 +18,17 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, * Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <QtGui>
#include <QTimer>
#include <QMessageBox>
#include <QFileDialog>
#include <QDesktopServices>
#include <QUrl>
#include "SubFileItem.h" #include "SubFileItem.h"
#include "rsiface/rsfiles.h" #include "rsiface/rsfiles.h"
/* hack for openFile() */
#include "gui/MainWindow.h"
#include <iostream>
/**** /****
* #define DEBUG_ITEM 1 * #define DEBUG_ITEM 1

3
retroshare-gui/src/gui/feeds/SubFileItem.h
View File

@ -23,10 +23,7 @@
#define _SUB_FILE_ITEM_DIALOG_H #define _SUB_FILE_ITEM_DIALOG_H
#include "ui_SubFileItem.h" #include "ui_SubFileItem.h"
#include <string>
#include <stdint.h> #include <stdint.h>
const uint32_t SFI_MASK_STATE = 0x000f; const uint32_t SFI_MASK_STATE = 0x000f;
const uint32_t SFI_MASK_TYPE = 0x00f0; const uint32_t SFI_MASK_TYPE = 0x00f0;
const uint32_t SFI_MASK_FT = 0x0f00; const uint32_t SFI_MASK_FT = 0x0f00;

1
retroshare-gui/src/gui/forums/CreateForum.cpp
View File

@ -19,7 +19,6 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <QtGui>
#include <QMessageBox> #include <QMessageBox>
#include "CreateForum.h" #include "CreateForum.h"

2
retroshare-gui/src/gui/forums/CreateForum.h
View File

@ -23,8 +23,6 @@
#ifndef _CREATE_FORUM_DIALOG_H #ifndef _CREATE_FORUM_DIALOG_H
#define _CREATE_FORUM_DIALOG_H #define _CREATE_FORUM_DIALOG_H
#include <QMainWindow>
#include "ui_CreateForum.h" #include "ui_CreateForum.h"
class CreateForum : public QDialog class CreateForum : public QDialog

16
retroshare-gui/src/gui/msgs/MessageComposer.cpp
View File

@ -19,6 +19,18 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <QMessageBox>
#include <QCloseEvent>
#include <QClipboard>
#include <QTextCodec>
#include <QPrintDialog>
#include <QPrinter>
#include <QFileDialog>
#include <QTextList>
#include <QColorDialog>
#include <QTextDocumentFragment>
#include <QTimer>
#include "rshare.h" #include "rshare.h"
#include "MessageComposer.h" #include "MessageComposer.h"
@ -32,10 +44,6 @@
#include "textformat.h" #include "textformat.h"
#include "util/misc.h" #include "util/misc.h"
#include <sstream>
#include <QtGui>
/** Constructor */ /** Constructor */
MessageComposer::MessageComposer(QWidget *parent, Qt::WFlags flags) MessageComposer::MessageComposer(QWidget *parent, Qt::WFlags flags)

9
retroshare-gui/src/gui/msgs/MessageComposer.h
View File

@ -23,19 +23,16 @@
#define _MESSAGECOMPOSER_H #define _MESSAGECOMPOSER_H
#include <QMainWindow> #include <QMainWindow>
#include <QMap> #include <QSettings>
#include <QPointer> #include "rsiface/rstypes.h"
#include <gui/settings/rsharesettings.h>
#include "gui/feeds/AttachFileItem.h"
#include "ui_MessageComposer.h" #include "ui_MessageComposer.h"
#include "rsiface/rsfiles.h"
class QAction; class QAction;
class QComboBox; class QComboBox;
class QFontComboBox; class QFontComboBox;
class QTextEdit; class QTextEdit;
class QTextCharFormat; class QTextCharFormat;
class AttachFileItem;
class MessageComposer : public QMainWindow class MessageComposer : public QMainWindow
{ {

2
retroshare-gui/src/gui/notifyqt.cpp
View File

@ -1,3 +1,5 @@
#include <QInputDialog>
#include <QMessageBox>
#include "notifyqt.h" #include "notifyqt.h"
#include "rsiface/rsnotify.h" #include "rsiface/rsnotify.h"

1
retroshare-gui/src/gui/settings/AddFileAssociationDialog.h
View File

@ -23,7 +23,6 @@
#define __AddFileAssociationDialog__ #define __AddFileAssociationDialog__
#include <QString>
#include <QDialog> #include <QDialog>
class QPushButton; class QPushButton;

4
retroshare-gui/src/gui/settings/AppearancePage.cpp
View File

@ -19,7 +19,11 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <QStyleFactory>
#include <QFileInfo>
#include <QDir>
#include "lang/languagesupport.h"
#include <rshare.h> #include <rshare.h>
#include "AppearancePage.h" #include "AppearancePage.h"
#include "rsharesettings.h" #include "rsharesettings.h"

6
retroshare-gui/src/gui/settings/AppearancePage.h
View File

@ -22,12 +22,6 @@
#ifndef _APPERARANCEPAGE_H #ifndef _APPERARANCEPAGE_H
#define _APPERARANCEPAGE_H #define _APPERARANCEPAGE_H
#include <QFileDialog>
#include <QStyleFactory>
#include <QtGui>
#include <lang/languagesupport.h>
#include "configpage.h" #include "configpage.h"
#include "ui_AppearancePage.h" #include "ui_AppearancePage.h"

10
retroshare-gui/src/gui/settings/ChatPage.cpp
View File

@ -19,16 +19,12 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include "rsiface/rspeers.h" //for rsPeers variable #include <QFontDialog>
#include "rsiface/rsiface.h"
#include "ChatPage.h"
#include "rsharesettings.h" #include "rsharesettings.h"
#include <QtGui>
#include <rshare.h>
#include "ChatPage.h"
/** Constructor */ /** Constructor */
ChatPage::ChatPage(QWidget * parent, Qt::WFlags flags) ChatPage::ChatPage(QWidget * parent, Qt::WFlags flags)
: ConfigPage(parent, flags) : ConfigPage(parent, flags)

3
retroshare-gui/src/gui/settings/ChatPage.h
View File

@ -22,9 +22,6 @@
#ifndef _CHATPAGE_H #ifndef _CHATPAGE_H
#define _CHATPAGE_H #define _CHATPAGE_H
#include <QFileDialog>
#include <QtGui/QWidget>
#include "configpage.h" #include "configpage.h"
#include "ui_ChatPage.h" #include "ui_ChatPage.h"

13
retroshare-gui/src/gui/settings/CryptoPage.cpp
View File

@ -19,18 +19,15 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include "rsiface/rspeers.h" //for rsPeers variable #include <QMessageBox>
#include "rsiface/rsiface.h"
#include <QtGui>
#include <QClipboard> #include <QClipboard>
#include <QFileDialog>
#include <QTextStream>
#include <QTextCodec>
#include <rshare.h>
#include "CryptoPage.h" #include "CryptoPage.h"
#include <sstream> #include "rsiface/rspeers.h" //for rsPeers variable
#include <iostream>
#include <set>
/** Constructor */ /** Constructor */
CryptoPage::CryptoPage(QWidget * parent, Qt::WFlags flags) CryptoPage::CryptoPage(QWidget * parent, Qt::WFlags flags)

5
retroshare-gui/src/gui/settings/CryptoPage.h
View File

@ -22,11 +22,6 @@
#ifndef _CRYPTOPAGE_H #ifndef _CRYPTOPAGE_H
#define _CRYPTOPAGE_H #define _CRYPTOPAGE_H
#include <QFileDialog>
#include <QtGui/QWidget>
#include "gui/connect/ConnectFriendWizard.h"
#include "configpage.h" #include "configpage.h"
#include "ui_CryptoPage.h" #include "ui_CryptoPage.h"

4
retroshare-gui/src/gui/settings/DirectoriesPage.h
View File

@ -22,10 +22,6 @@
#ifndef DIRECTORIESPAGE_H #ifndef DIRECTORIESPAGE_H
# define DIRECTORIESPAGE_H # define DIRECTORIESPAGE_H
#include <QFileDialog>
#include <QWidget>
#include <QtGui>
#include "configpage.h" #include "configpage.h"
#include "ui_DirectoriesPage.h" #include "ui_DirectoriesPage.h"

8
retroshare-gui/src/gui/settings/FileAssociationsPage.h
View File

@ -24,14 +24,6 @@
#include "configpage.h" #include "configpage.h"
#include <QString>
#include <QWidget>
#include <QtGui>
//#include <QMap>
//#include <QFrame>
//#include <QDialog>
class QToolBar; class QToolBar;
class QAction; class QAction;
class QTableWidget; class QTableWidget;

6
retroshare-gui/src/gui/settings/GeneralPage.h
View File

@ -23,12 +23,6 @@
#ifndef _GENERALPAGE_H #ifndef _GENERALPAGE_H
#define _GENERALPAGE_H #define _GENERALPAGE_H
#include <QtGui>
#include <QFileDialog>
#include <QLineEdit>
#include "rsiface/rsiface.h"
#include "configpage.h" #include "configpage.h"
#include "ui_GeneralPage.h" #include "ui_GeneralPage.h"

2
retroshare-gui/src/gui/settings/rsettingswin.cpp
View File

@ -19,6 +19,8 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <QMessageBox>
#include "GeneralPage.h" #include "GeneralPage.h"
#include "DirectoriesPage.h" #include "DirectoriesPage.h"
#include "ServerPage.h" #include "ServerPage.h"

16
retroshare-gui/src/gui/statusbar/natstatus.cpp
View File

@ -18,22 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, * Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <QLabel>
#include "natstatus.h" #include "natstatus.h"
#include <QtGui>
#include <QString>
#include <QLayout>
#include <QLabel>
#include <QIcon>
#include <QPainter>
#include <QPixmap>
#include "rsiface/rsiface.h" #include "rsiface/rsiface.h"
#include "rsiface/rspeers.h"
#include <sstream>
#include <iomanip>
NATStatus::NATStatus(QWidget *parent) NATStatus::NATStatus(QWidget *parent)
: QWidget(parent) : QWidget(parent)

17
retroshare-gui/src/gui/statusbar/peerstatus.cpp
View File

@ -18,22 +18,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, * Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <QHBoxLayout>
#include <QLabel>
#include "peerstatus.h" #include "peerstatus.h"
#include <QtGui>
#include <QString>
#include <QLayout>
#include <QLabel>
#include <QIcon>
#include <QPainter>
#include <QPixmap>
#include "rsiface/rsiface.h"
#include "rsiface/rspeers.h"
#include <sstream> #include <sstream>
#include <iomanip>
PeerStatus::PeerStatus(QWidget *parent) PeerStatus::PeerStatus(QWidget *parent)
: QWidget(parent) : QWidget(parent)

3
retroshare-gui/src/gui/statusbar/peerstatus.h
View File

@ -20,12 +20,9 @@
****************************************************************/ ****************************************************************/
#ifndef PEERSTATUS_H #ifndef PEERSTATUS_H
#define PEERSTATUS_H #define PEERSTATUS_H
#include "gui/MainWindow.h"
#include <QWidget> #include <QWidget>
class PeerStatus : public QWidget class PeerStatus : public QWidget
{ {
Q_OBJECT Q_OBJECT

12
retroshare-gui/src/gui/statusbar/ratesstatus.cpp
View File

@ -18,19 +18,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, * Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include "ratesstatus.h"
#include <QtGui>
#include <QString>
#include <QLayout>
#include <QLabel> #include <QLabel>
#include <QIcon>
#include <QPainter>
#include <QPixmap>
#include "ratesstatus.h"
#include "rsiface/rsiface.h" #include "rsiface/rsiface.h"
#include "rsiface/rspeers.h"
#include <sstream> #include <sstream>
#include <iomanip> #include <iomanip>
@ -98,5 +90,3 @@ void RatesStatus::getRatesStatus()
} }

3
retroshare-gui/src/gui/toaster/MessageToaster.cpp
View File

@ -17,6 +17,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include <QTimer>
#include <QDesktopWidget>
#include "MessageToaster.h" #include "MessageToaster.h"
#include "../MainWindow.h" #include "../MainWindow.h"

2
retroshare-gui/src/gui/toaster/MessageToaster.h
View File

@ -26,8 +26,6 @@
#ifndef MESSAGETOASTER_H #ifndef MESSAGETOASTER_H
#define MESSAGETOASTER_H #define MESSAGETOASTER_H
#include <QtGui>
#include "ui_MessageToaster.h" #include "ui_MessageToaster.h"
enum DisplayState {dsInactive, dsShowing, dsWaiting, dsHiding}; enum DisplayState {dsInactive, dsShowing, dsWaiting, dsHiding};

10
retroshare-gui/src/gui/unfinished/blogs/BlogsDialog.cpp
View File

@ -18,13 +18,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, * Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <QtGui>
#include <QContextMenuEvent>
#include <QCursor>
#include <QMenu>
#include <QPoint>
#include <iostream> #include <QMenu>
#include <QTimer>
#include <QStandardItemModel>
#include <algorithm> #include <algorithm>
#include "rsiface/rsblogs.h" #include "rsiface/rsblogs.h"

4
retroshare-gui/src/gui/unfinished/blogs/BlogsDialog.h
View File

@ -25,10 +25,10 @@
#include "gui/mainpage.h" #include "gui/mainpage.h"
#include "ui_BlogsDialog.h" #include "ui_BlogsDialog.h"
#include <QStandardItemModel>
#include "gui/feeds/FeedHolder.h" #include "gui/feeds/FeedHolder.h"
class QStandardItemModel;
#define OWN 0 #define OWN 0
#define SUBSCRIBED 1 #define SUBSCRIBED 1
#define POPULAR 2 #define POPULAR 2

7
retroshare-gui/src/gui/unfinished/blogs/BlogsMsgItem.cpp
View File

@ -18,19 +18,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, * Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <QtGui>
#include <QDateTime> #include <QDateTime>
#include "BlogsMsgItem.h" #include "BlogsMsgItem.h"
#include "gui/feeds/FeedHolder.h" #include "gui/feeds/FeedHolder.h"
#include "gui/feeds/SubFileItem.h"
#include "rsiface/rsblogs.h" #include "rsiface/rsblogs.h"
#include <iostream>
#include <sstream>
/**** /****
* #define DEBUG_ITEM 1 * #define DEBUG_ITEM 1

3
retroshare-gui/src/gui/unfinished/blogs/BlogsMsgItem.h
View File

@ -23,10 +23,9 @@
#define _BLOGS_MSG_ITEM_DIALOG_H #define _BLOGS_MSG_ITEM_DIALOG_H
#include "ui_BlogsMsgItem.h" #include "ui_BlogsMsgItem.h"
#include <string>
#include <stdint.h> #include <stdint.h>
class FeedHolder; class FeedHolder;
class SubFileItem; class SubFileItem;

5
retroshare-gui/src/gui/unfinished/blogs/CreateBlog.cpp
View File

@ -19,8 +19,9 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <QtGui>
#include <QMessageBox> #include <QMessageBox>
#include <QFileDialog>
#include <QBuffer>
#include "CreateBlog.h" #include "CreateBlog.h"
@ -89,7 +90,7 @@ void CreateBlog::createBlog()
if(name.isEmpty()) if(name.isEmpty())
{ /* error message */ { /* error message */
int ret = QMessageBox::warning(this, tr("RetroShare"), QMessageBox::warning(this, tr("RetroShare"),
tr("Please add a Name"), tr("Please add a Name"),
QMessageBox::Ok, QMessageBox::Ok); QMessageBox::Ok, QMessageBox::Ok);

2
retroshare-gui/src/gui/unfinished/blogs/CreateBlog.h
View File

@ -22,8 +22,6 @@
#ifndef _CREATE_BLOG_DIALOG_H #ifndef _CREATE_BLOG_DIALOG_H
#define _CREATE_BLOG_DIALOG_H #define _CREATE_BLOG_DIALOG_H
#include <QMainWindow>
#include "ui_CreateBlog.h" #include "ui_CreateBlog.h"
class CreateBlog : public QDialog class CreateBlog : public QDialog

29
retroshare-gui/src/gui/unfinished/blogs/CreateBlogMsg.cpp
View File

@ -18,46 +18,25 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, * Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <QtGui>
//#include <QtWebKit>
#include <QAction>
#include <QApplication>
#include <QClipboard> #include <QClipboard>
#include <QColorDialog> #include <QColorDialog>
#include <QComboBox>
#include <QFontComboBox> #include <QFontComboBox>
#include <QFile> #include <QFile>
#include <QFileDialog> #include <QFileDialog>
#include <QFileInfo>
#include <QFontDatabase>
#include <QMenu>
#include <QMenuBar>
#include <QPrintDialog> #include <QPrintDialog>
#include <QPrinter> #include <QPrinter>
#include <QTextCodec> #include <QTextCodec>
#include <QTextEdit>
#include <QToolBar>
#include <QTextCursor>
#include <QTextDocumentWriter> #include <QTextDocumentWriter>
#include <QTextList> #include <QTextDocumentFragment>
#include <QtDebug>
#include <QCloseEvent>
#include <QMessageBox> #include <QMessageBox>
#include <QPrintPreviewDialog> #include <QPrintPreviewDialog>
#include <QTextBlock>
#include "CreateBlogMsg.h" #include "CreateBlogMsg.h"
#include "gui/feeds/SubFileItem.h"
#include "gui/msgs/textformat.h" #include "gui/msgs/textformat.h"
#include "rsiface/rstypes.h"
#include "rsiface/rspeers.h"
#include "rsiface/rsforums.h"
#include "rsiface/rsblogs.h" #include "rsiface/rsblogs.h"
#include "rsiface/rsmsgs.h"
#include "rsiface/rsfiles.h"
#include <iostream>
/** Constructor */ /** Constructor */
CreateBlogMsg::CreateBlogMsg(std::string cId ,QWidget* parent, Qt::WFlags flags) CreateBlogMsg::CreateBlogMsg(std::string cId ,QWidget* parent, Qt::WFlags flags)
@ -215,7 +194,7 @@ void CreateBlogMsg::sendMessage(std::wstring subject, std::wstring msg)
if(name.isEmpty()) if(name.isEmpty())
{ /* error message */ { /* error message */
int ret = QMessageBox::warning(this, tr("RetroShare"), QMessageBox::warning(this, tr("RetroShare"),
tr("Please add a Subject"), tr("Please add a Subject"),
QMessageBox::Ok, QMessageBox::Ok); QMessageBox::Ok, QMessageBox::Ok);

6
retroshare-gui/src/gui/unfinished/blogs/CreateBlogMsg.h
View File

@ -22,11 +22,7 @@
#ifndef _CREATEBLOGMSG_H #ifndef _CREATEBLOGMSG_H
#define _CREATEBLOGMSG_H #define _CREATEBLOGMSG_H
#include <QMainWindow> #include <QSettings>
#include <QMap>
#include <QPointer>
#include <QObject>
#include <qsettings.h>
#include "ui_CreateBlogMsg.h" #include "ui_CreateBlogMsg.h"
#include <stdint.h> #include <stdint.h>

1
retroshare-gui/src/main.cpp
View File

@ -20,6 +20,7 @@
****************************************************************/ ****************************************************************/
#include <QObject> #include <QObject>
#include <QMessageBox>
#include <rshare.h> #include <rshare.h>
#include "gui/MainWindow.h" #include "gui/MainWindow.h"
#include "gui/PeersDialog.h" #include "gui/PeersDialog.h"