aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/options
diff options
context:
space:
mode:
authorGravatar wodim2012-02-27 01:16:26 +0000
committerGravatar wodim2012-02-27 01:16:26 +0000
commitba052f7b1686e69c2c1da43fe5f53399dda8152c (patch)
treeca310f241c2fdd7ae619f005ca58a2547bdd0387 /src/modules/options
parentDropped the KviTalPopupMenu layer, ported the involved code to QAction. (diff)
downloadKVIrc-ba052f7b1686e69c2c1da43fe5f53399dda8152c.tar.gz
KVIrc-ba052f7b1686e69c2c1da43fe5f53399dda8152c.tar.bz2
KVIrc-ba052f7b1686e69c2c1da43fe5f53399dda8152c.zip
fix compilation, thanks minde for noticing (CtrlAltCa <3)
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6073 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/options')
-rw-r--r--src/modules/options/OptionsDialog.cpp2
-rw-r--r--src/modules/options/OptionsWidget_message.h2
-rw-r--r--src/modules/options/OptionsWidget_proxy.cpp2
-rw-r--r--src/modules/options/OptionsWidget_servers.cpp2
-rw-r--r--src/modules/options/OptionsWidget_textIcons.cpp2
5 files changed, 5 insertions, 5 deletions
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)