diff options
Diffstat (limited to 'src/modules')
31 files changed, 33 insertions, 33 deletions
diff --git a/src/modules/aliaseditor/AliasEditorWindow.h b/src/modules/aliaseditor/AliasEditorWindow.h index d48fa6b24..e44db6675 100644 --- a/src/modules/aliaseditor/AliasEditorWindow.h +++ b/src/modules/aliaseditor/AliasEditorWindow.h @@ -27,7 +27,6 @@ #include "KviWindow.h" #include "KviCString.h" #include "KviPointerList.h" -#include "QMenu.h" #include "KviHeapObject.h" #include <QWidget> @@ -36,7 +35,7 @@ #include <QPushButton> #include <QLabel> #include <QTreeWidget> - +#include <QMenu> class QSplitter; class KviScriptEditor; diff --git a/src/modules/channelsjoin/ChannelsJoinDialog.h b/src/modules/channelsjoin/ChannelsJoinDialog.h index 91bd46a13..a2f99034f 100644 --- a/src/modules/channelsjoin/ChannelsJoinDialog.h +++ b/src/modules/channelsjoin/ChannelsJoinDialog.h @@ -32,10 +32,10 @@ #include "KviWindow.h" #include "KviCString.h" -#include "QMenu.h" #include <QTreeWidget> #include <QDialog> +#include <QMenu> class QCheckBox; class QPushButton; diff --git a/src/modules/classeditor/ClassEditorWindow.h b/src/modules/classeditor/ClassEditorWindow.h index cf41f64b6..d9eca0cb9 100644 --- a/src/modules/classeditor/ClassEditorWindow.h +++ b/src/modules/classeditor/ClassEditorWindow.h @@ -33,7 +33,6 @@ #include "KviWindow.h" #include "KviCString.h" #include "KviPointerList.h" -#include "QMenu.h" #include "KviHeapObject.h" #include "KviKvsObjectClass.h" @@ -43,6 +42,7 @@ #include <QLineEdit> #include <QCheckBox> #include <QTreeWidget> +#include <QMenu> class QLineEdit; class QStringList; diff --git a/src/modules/codetester/CodeTesterWindow.cpp b/src/modules/codetester/CodeTesterWindow.cpp index 28e8fc1b0..fbb254b08 100644 --- a/src/modules/codetester/CodeTesterWindow.cpp +++ b/src/modules/codetester/CodeTesterWindow.cpp @@ -36,11 +36,11 @@ #include "KviParameterList.h" #include "KviKvsScript.h" #include "KviKvsVariantList.h" -#include "QMenu.h" #include <QPushButton> #include <QLayout> #include <QLabel> +#include <QMenu> extern KviPointerList<CodeTesterWindow> * g_pCodeTesterWindowList; diff --git a/src/modules/dcc/DccFileTransfer.h b/src/modules/dcc/DccFileTransfer.h index 6f04013c5..d3aea57d2 100644 --- a/src/modules/dcc/DccFileTransfer.h +++ b/src/modules/dcc/DccFileTransfer.h @@ -34,7 +34,6 @@ #include "KviPointerList.h" #include "KviFileTransfer.h" #include "KviTimeUtils.h" -#include "QMenu.h" #include "KviTalHBox.h" #include "KviTalVBox.h" @@ -43,6 +42,7 @@ #include <QFile> #include <QDialog> #include <QCheckBox> +#include <QMenu> class QSpinBox; class QTimer; diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp index 20daa1418..a7b9f58cc 100644 --- a/src/modules/dcc/canvaswidget.cpp +++ b/src/modules/dcc/canvaswidget.cpp @@ -27,7 +27,6 @@ #ifdef COMPILE_DCC_CANVAS #include "KviCString.h" #include "KviLocale.h" - #include "QMenu.h" #include <QCursor> #include <QPainter> @@ -35,6 +34,7 @@ #include <QLineEdit> #include <QComboBox> #include <QValidator> + #include <QMenu> #include <math.h> #include <stdlib.h> diff --git a/src/modules/editor/ScriptEditorImplementation.h b/src/modules/editor/ScriptEditorImplementation.h index ad3d064e9..ec58669b2 100644 --- a/src/modules/editor/ScriptEditorImplementation.h +++ b/src/modules/editor/ScriptEditorImplementation.h @@ -28,7 +28,6 @@ #include "KviScriptEditor.h" #include "KviPointerList.h" #include "KviSelectors.h" -#include "QMenu.h" #include <QCompleter> #include <QLabel> @@ -39,6 +38,7 @@ #include <QCheckBox> #include <QSyntaxHighlighter> #include <QByteArray> +#include <QMenu> class QTimer; diff --git a/src/modules/eventeditor/EventEditorWindow.cpp b/src/modules/eventeditor/EventEditorWindow.cpp index 3ae064075..821ecd8b7 100644 --- a/src/modules/eventeditor/EventEditorWindow.cpp +++ b/src/modules/eventeditor/EventEditorWindow.cpp @@ -40,7 +40,6 @@ #include "KviFileDialog.h" #include "KviKvsEventManager.h" #include "KviTalVBox.h" -#include "QMenu.h" #include <QMessageBox> #include <QSplitter> @@ -48,6 +47,7 @@ #include <QToolTip> #include <QPushButton> #include <QMouseEvent> +#include <QMenu> extern EventEditorWindow * g_pEventEditorWindow; diff --git a/src/modules/eventeditor/EventEditorWindow.h b/src/modules/eventeditor/EventEditorWindow.h index ae51e2cb7..584f38113 100644 --- a/src/modules/eventeditor/EventEditorWindow.h +++ b/src/modules/eventeditor/EventEditorWindow.h @@ -26,11 +26,11 @@ #include "KviWindow.h" #include "KviCString.h" -#include "QMenu.h" #include <QWidget> #include <QLineEdit> #include <QTreeWidget> +#include <QMenu> class KviScriptEditor; diff --git a/src/modules/filetransferwindow/FileTransferWindow.h b/src/modules/filetransferwindow/FileTransferWindow.h index 3588439e7..fbf174248 100644 --- a/src/modules/filetransferwindow/FileTransferWindow.h +++ b/src/modules/filetransferwindow/FileTransferWindow.h @@ -33,11 +33,11 @@ #include "KviFileTransfer.h" #include "KviDynamicToolTip.h" #include "KviTalTableWidget.h" -#include "QMenu.h" #include "KviTalIconAndRichTextItemDelegate.h" #include <QTimer> #include <QPixmap> +#include <QMenu> class FileTransferItem; diff --git a/src/modules/http/HttpFileTransfer.cpp b/src/modules/http/HttpFileTransfer.cpp index 9a45e500b..ed2e92fa8 100644 --- a/src/modules/http/HttpFileTransfer.cpp +++ b/src/modules/http/HttpFileTransfer.cpp @@ -33,9 +33,9 @@ #include "KviKvsEventTriggers.h" #include "KviConsoleWindow.h" #include "KviKvsScript.h" -#include "QMenu.h" #include <QPainter> +#include <QMenu> static KviPointerList<HttpFileTransfer> * g_pHttpFileTransfers = 0; static QPixmap * g_pHttpIcon = 0; diff --git a/src/modules/links/LinksWindow.h b/src/modules/links/LinksWindow.h index 45b4d8e87..71822a888 100644 --- a/src/modules/links/LinksWindow.h +++ b/src/modules/links/LinksWindow.h @@ -30,10 +30,10 @@ #include "KviIrcServerParser.h" #include "KviConsoleWindow.h" #include "KviIrcContext.h" -#include "QMenu.h" #include "KviThemedTreeWidget.h" #include <QToolButton> +#include <QMenu> class KviThemedLabel; diff --git a/src/modules/list/ListWindow.h b/src/modules/list/ListWindow.h index edc0c190b..73b2bfa07 100644 --- a/src/modules/list/ListWindow.h +++ b/src/modules/list/ListWindow.h @@ -31,12 +31,12 @@ #include "KviIrcServerParser.h" #include "KviConsoleWindow.h" #include "KviIrcContext.h" -#include "QMenu.h" #include "KviThemedTreeWidget.h" #include <QToolButton> #include <QLineEdit> #include <QItemDelegate> +#include <QMenu> class KviThemedLabel; class KviThemedLineEdit; diff --git a/src/modules/logview/LogViewWindow.cpp b/src/modules/logview/LogViewWindow.cpp index c4c492e6a..71ff8406b 100644 --- a/src/modules/logview/LogViewWindow.cpp +++ b/src/modules/logview/LogViewWindow.cpp @@ -37,7 +37,6 @@ #include "KviQString.h" #include "KviApplication.h" #include "KviFileUtils.h" -#include "QMenu.h" #include "KviControlCodes.h" #include <QList> @@ -55,6 +54,7 @@ #include <QTextStream> #include <QTabWidget> #include <QCheckBox> +#include <QMenu> #include <limits.h> //for INT_MAX diff --git a/src/modules/notifier/NotifierWindow.h b/src/modules/notifier/NotifierWindow.h index 87f67c9b4..3ecc1ebda 100644 --- a/src/modules/notifier/NotifierWindow.h +++ b/src/modules/notifier/NotifierWindow.h @@ -30,7 +30,6 @@ #include "kvi_settings.h" #include "KviQString.h" #include "KviPointerList.h" -#include "QMenu.h" #include "KviTimeUtils.h" #include <QBitmap> @@ -44,6 +43,7 @@ #include <QWidget> #include <QTabWidget> #include <QProgressBar> +#include <QMenu> class QPainter; class KviWindow; diff --git a/src/modules/objects/KvsObject_popupMenu.cpp b/src/modules/objects/KvsObject_popupMenu.cpp index 02be27d46..891404f3e 100644 --- a/src/modules/objects/KvsObject_popupMenu.cpp +++ b/src/modules/objects/KvsObject_popupMenu.cpp @@ -30,7 +30,6 @@ #include "kvi_debug.h" #include "KviLocale.h" #include "KviIconManager.h" -#include "QMenu.h" #include <QCursor> #include <QMenu> diff --git a/src/modules/objects/KvsObject_toolButton.cpp b/src/modules/objects/KvsObject_toolButton.cpp index a37e8b0d8..4a4519d58 100644 --- a/src/modules/objects/KvsObject_toolButton.cpp +++ b/src/modules/objects/KvsObject_toolButton.cpp @@ -29,7 +29,8 @@ #include "KviLocale.h" #include "KviIconManager.h" -#include "QMenu.h" + +#include <QMenu> /* @doc: toolbutton @keyterms: diff --git a/src/modules/objects/KvsObject_webView.cpp b/src/modules/objects/KvsObject_webView.cpp index a490f527a..a4ba14dd9 100644 --- a/src/modules/objects/KvsObject_webView.cpp +++ b/src/modules/objects/KvsObject_webView.cpp @@ -30,7 +30,8 @@ #include "KvsObject_pixmap.h" #include "KviError.h" #include "KviLocale.h" -#include "QMenu.h" + +#include <QMenu> #if defined(COMPILE_WEBKIT_SUPPORT) #include <QWebView> diff --git a/src/modules/options/OptionsDialog.cpp b/src/modules/options/OptionsDialog.cpp index 20c4adcd3..9808c69a7 100644 --- a/src/modules/options/OptionsDialog.cpp +++ b/src/modules/options/OptionsDialog.cpp @@ -34,7 +34,6 @@ #include "KviPointerHashTable.h" #include "KviTalVBox.h" #include "KviTalToolTip.h" -#include "QMenu.h" #include "KviTalGroupBox.h" #include <QLayout> @@ -49,6 +48,7 @@ #include <QHeaderView> #include <QDesktopWidget> #include <QStackedWidget> +#include <QMenu> //FIXME: some headers must be hidden diff --git a/src/modules/options/OptionsWidget_message.h b/src/modules/options/OptionsWidget_message.h index cf1b71c80..c90ea61eb 100644 --- a/src/modules/options/OptionsWidget_message.h +++ b/src/modules/options/OptionsWidget_message.h @@ -26,7 +26,6 @@ #include "KviOptionsWidget.h" #include "KviMessageTypeSettings.h" -#include "QMenu.h" #include "KviIconManager.h" #include <QTreeWidget> @@ -35,6 +34,7 @@ #include <QToolButton> #include <QPainter> #include <QColorGroup> +#include <QMenu> #define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_message KviIconManager::Messages #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_message __tr2qs_no_lookup("Text") diff --git a/src/modules/options/OptionsWidget_proxy.cpp b/src/modules/options/OptionsWidget_proxy.cpp index 3849db285..9a399ea54 100644 --- a/src/modules/options/OptionsWidget_proxy.cpp +++ b/src/modules/options/OptionsWidget_proxy.cpp @@ -33,7 +33,6 @@ #include "kvi_settings.h" #include "KviOptions.h" #include "KviTalGroupBox.h" -#include "QMenu.h" #include "KviTalToolTip.h" #include <QLabel> @@ -42,6 +41,7 @@ #include <QCursor> #include <QIcon> #include <QToolButton> +#include <QMenu> ProxyOptionsTreeWidgetItem::ProxyOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,KviProxy * prx) diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp index 1c75a72ee..476328171 100644 --- a/src/modules/options/OptionsWidget_servers.cpp +++ b/src/modules/options/OptionsWidget_servers.cpp @@ -53,7 +53,6 @@ #include "KviProxyDataBase.h" #include "KviKvsScript.h" #include "KviPointerHashTable.h" -#include "QMenu.h" #include "KviTalToolTip.h" #include <QLineEdit> @@ -66,6 +65,7 @@ #include <QHeaderView> #include <QIcon> #include <QShortcut> +#include <QMenu> #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) || defined(COMPILE_ON_MAC) #include <QStyleFactory> diff --git a/src/modules/options/OptionsWidget_textIcons.cpp b/src/modules/options/OptionsWidget_textIcons.cpp index 6e3dacf6b..c8c318bec 100644 --- a/src/modules/options/OptionsWidget_textIcons.cpp +++ b/src/modules/options/OptionsWidget_textIcons.cpp @@ -32,7 +32,6 @@ #include "KviLocale.h" #include "KviFileDialog.h" #include "kvi_fileextensions.h" -#include "QMenu.h" #include "KviTalHBox.h" #include "KviFileUtils.h" @@ -41,6 +40,7 @@ #include <QCursor> #include <QHeaderView> #include <QWidgetAction> +#include <QMenu> TextIconTableItem::TextIconTableItem(QTableWidget *,KviTextIcon * icon) : QTableWidgetItem(QString(),Qt::ItemIsEditable) diff --git a/src/modules/popupeditor/PopupEditorWindow.h b/src/modules/popupeditor/PopupEditorWindow.h index 98b5bb429..5aa8e73d0 100644 --- a/src/modules/popupeditor/PopupEditorWindow.h +++ b/src/modules/popupeditor/PopupEditorWindow.h @@ -26,12 +26,12 @@ #include "KviWindow.h" #include "KviCString.h" -#include <QTreeWidget> -#include "QMenu.h" +#include <QTreeWidget> #include <QWidget> #include <QLineEdit> #include <QPushButton> +#include <QMenu> class KviKvsPopupMenu; class KviKvsPopupMenuItem; diff --git a/src/modules/raweditor/RawEditorWindow.cpp b/src/modules/raweditor/RawEditorWindow.cpp index 71755bfdf..9ef52015c 100644 --- a/src/modules/raweditor/RawEditorWindow.cpp +++ b/src/modules/raweditor/RawEditorWindow.cpp @@ -40,7 +40,6 @@ #include "KviKvsEventManager.h" #include "KviKvsEventHandler.h" #include "KviTalVBox.h" -#include "QMenu.h" #include <QMessageBox> #include <QSplitter> @@ -48,6 +47,7 @@ #include <QToolTip> #include <QInputDialog> #include <QPushButton> +#include <QMenu> extern RawEditorWindow * g_pRawEditorWindow; diff --git a/src/modules/reguser/RegisteredUserEntryDialog.h b/src/modules/reguser/RegisteredUserEntryDialog.h index 96dafde06..249d8e975 100644 --- a/src/modules/reguser/RegisteredUserEntryDialog.h +++ b/src/modules/reguser/RegisteredUserEntryDialog.h @@ -29,7 +29,6 @@ #include "KviSelectors.h" #include "KviPointerHashTable.h" #include <QTreeWidget> -#include "QMenu.h" #include <KviTalTabDialog.h> #include <QListWidget> @@ -38,6 +37,7 @@ #include <QPushButton> #include <QTableWidget> #include <QCheckBox> +#include <QMenu> class KviRegisteredUser; diff --git a/src/modules/reguser/RegisteredUsersDialog.h b/src/modules/reguser/RegisteredUsersDialog.h index aed4768c2..840d2889b 100644 --- a/src/modules/reguser/RegisteredUsersDialog.h +++ b/src/modules/reguser/RegisteredUsersDialog.h @@ -30,13 +30,13 @@ #include "KviPointerHashTable.h" #include <QTreeWidget> #include "KviTalListWidget.h" -#include "QMenu.h" #include <QWidget> #include <QLineEdit> #include <QPushButton> #include <QStyledItemDelegate> #include <QTextDocument> +#include <QMenu> class KviRegisteredUsersListView : public QTreeWidget { diff --git a/src/modules/theme/ThemeManagementDialog.cpp b/src/modules/theme/ThemeManagementDialog.cpp index a340385b6..50599a80d 100644 --- a/src/modules/theme/ThemeManagementDialog.cpp +++ b/src/modules/theme/ThemeManagementDialog.cpp @@ -47,7 +47,6 @@ #include "KviDynamicToolTip.h" #include "KviIconManager.h" #include "KviMessageBox.h" -#include "QMenu.h" #include "KviTalListWidget.h" @@ -71,6 +70,7 @@ #include <QTextDocument> #include <QAbstractTextDocumentLayout> #include <QShortcut> +#include <QMenu> extern QRect g_rectManagementDialogGeometry; diff --git a/src/modules/theme/ThemeManagementDialog.h b/src/modules/theme/ThemeManagementDialog.h index c68e0f2af..7b3648350 100644 --- a/src/modules/theme/ThemeManagementDialog.h +++ b/src/modules/theme/ThemeManagementDialog.h @@ -27,7 +27,6 @@ #include "KviOptionsWidget.h" #include "KviPointerList.h" #include "KviTheme.h" -#include "QMenu.h" #include "KviTalWizard.h" #include "KviTalListWidget.h" @@ -38,6 +37,7 @@ #include <QListWidget> #include <QItemDelegate> #include <QToolButton> +#include <QMenu> #include "kvi_settings.h" #if defined(COMPILE_WEBKIT_SUPPORT) || defined(Q_MOC_RUN) #include "WebThemeInterfaceDialog.h" diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp index 91e45369c..25d29da17 100644 --- a/src/modules/trayicon/libkvitrayicon.cpp +++ b/src/modules/trayicon/libkvitrayicon.cpp @@ -41,7 +41,6 @@ #include "KviIrcConnectionUserInfo.h" #include "KviOptions.h" #include "KviIrcView.h" -#include "QMenu.h" #include <QPixmap> #include <QPainter> @@ -49,6 +48,7 @@ #include <QEvent> #include <QRegExp> #include <QWidgetAction> +#include <QMenu> #include <stdlib.h> #include <time.h> diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp index 7778e4d72..54b648e12 100644 --- a/src/modules/url/libkviurl.cpp +++ b/src/modules/url/libkviurl.cpp @@ -36,7 +36,6 @@ #include "KviWindowListBase.h" #include "KviPointerList.h" #include "KviKvsEventManager.h" -#include "QMenu.h" #include "KviWindow.h" #include "KviOptions.h" #include "KviQString.h" @@ -50,6 +49,7 @@ #include <QTextStream> #include <QMouseEvent> #include <QPainter> +#include <QMenu> static KviUrlAction * g_pUrlAction = 0; |