From c672ecbdfc228621dcf46767ba1c13a4b5a14064 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 2 Jan 2014 15:31:19 +0100 Subject: [PATCH] Fix FTBFS due to conflict with TQt3 include preferences.h --- konversation/src/awaymanager.cpp | 1 - konversation/src/common.cpp | 1 - konversation/src/connectionmanager.cpp | 1 - konversation/src/dcccommon.cpp | 2 +- konversation/src/dcctransfer.cpp | 2 +- konversation/src/dcctransfermanager.cpp | 1 - konversation/src/dcctransferpanel.cpp | 1 - konversation/src/dcctransferpanelitem.cpp | 1 - konversation/src/emoticon.cpp | 1 - konversation/src/highlight_preferences.cpp | 1 - konversation/src/ignore_preferences.cpp | 2 +- konversation/src/konversationapplication.h | 2 +- konversation/src/konversationmainwindow.h | 2 +- konversation/src/nick.cpp | 1 - konversation/src/osd_preferences.cpp | 1 - konversation/src/servergroupdialog.cpp | 1 - konversation/src/serverlistdialog.cpp | 1 - konversation/src/trayicon.cpp | 1 - konversation/src/viewtree.cpp | 2 +- konversation/src/viewtreeitem.cpp | 1 - konversation/src/watchednicknames_preferences.cpp | 1 - 21 files changed, 6 insertions(+), 21 deletions(-) diff --git a/konversation/src/awaymanager.cpp b/konversation/src/awaymanager.cpp index 7ecb53c..d84368b 100644 --- a/konversation/src/awaymanager.cpp +++ b/konversation/src/awaymanager.cpp @@ -15,7 +15,6 @@ #include "konversationmainwindow.h" #include "connectionmanager.h" #include "server.h" -#include "preferences.h" #include diff --git a/konversation/src/common.cpp b/konversation/src/common.cpp index 1916ed3..dc5a4eb 100644 --- a/konversation/src/common.cpp +++ b/konversation/src/common.cpp @@ -12,7 +12,6 @@ #include "common.h" #include "konversationapplication.h" -#include "config/preferences.h" #include #include diff --git a/konversation/src/connectionmanager.cpp b/konversation/src/connectionmanager.cpp index 52f3336..b40bf3d 100644 --- a/konversation/src/connectionmanager.cpp +++ b/konversation/src/connectionmanager.cpp @@ -13,7 +13,6 @@ #include "connectionsettings.h" #include "serversettings.h" #include "servergroupsettings.h" -#include "config/preferences.h" #include "konversationapplication.h" #include "konversationmainwindow.h" #include "statuspanel.h" diff --git a/konversation/src/dcccommon.cpp b/konversation/src/dcccommon.cpp index 0c6d071..e8c08d5 100644 --- a/konversation/src/dcccommon.cpp +++ b/konversation/src/dcccommon.cpp @@ -11,7 +11,7 @@ #include "dcccommon.h" #include "channel.h" -#include "preferences.h" +#include "config/preferences.h" #include "server.h" #include diff --git a/konversation/src/dcctransfer.cpp b/konversation/src/dcctransfer.cpp index 4873b79..a5fc08f 100644 --- a/konversation/src/dcctransfer.cpp +++ b/konversation/src/dcctransfer.cpp @@ -12,7 +12,7 @@ */ #include "dcctransfer.h" -#include "preferences.h" +#include "config/preferences.h" #include #include diff --git a/konversation/src/dcctransfermanager.cpp b/konversation/src/dcctransfermanager.cpp index ec36840..cc22a35 100644 --- a/konversation/src/dcctransfermanager.cpp +++ b/konversation/src/dcctransfermanager.cpp @@ -13,7 +13,6 @@ #include "dcctransferrecv.h" #include "dcctransfersend.h" #include "konversationapplication.h" -#include "preferences.h" #include diff --git a/konversation/src/dcctransferpanel.cpp b/konversation/src/dcctransferpanel.cpp index 09ae0f3..1b1421b 100644 --- a/konversation/src/dcctransferpanel.cpp +++ b/konversation/src/dcctransferpanel.cpp @@ -18,7 +18,6 @@ #include "dcctransfermanager.h" #include "dcctransferpanelitem.h" #include "dcctransfersend.h" -#include "preferences.h" #include #include diff --git a/konversation/src/dcctransferpanelitem.cpp b/konversation/src/dcctransferpanelitem.cpp index 85b532c..481084f 100644 --- a/konversation/src/dcctransferpanelitem.cpp +++ b/konversation/src/dcctransferpanelitem.cpp @@ -16,7 +16,6 @@ #include "dcctransferpanelitem.h" #include "dcctransferpanel.h" #include "konversationapplication.h" -#include "config/preferences.h" #include #include diff --git a/konversation/src/emoticon.cpp b/konversation/src/emoticon.cpp index dfb8e8d..bbfbbc8 100644 --- a/konversation/src/emoticon.cpp +++ b/konversation/src/emoticon.cpp @@ -21,7 +21,6 @@ #include #include "konversationapplication.h" -#include "config/preferences.h" namespace Konversation diff --git a/konversation/src/highlight_preferences.cpp b/konversation/src/highlight_preferences.cpp index d9cb9c1..1b26199 100644 --- a/konversation/src/highlight_preferences.cpp +++ b/konversation/src/highlight_preferences.cpp @@ -14,7 +14,6 @@ #include "highlightviewitem.h" #include "konversationapplication.h" #include "konversationsound.h" -#include "config/preferences.h" #include #include diff --git a/konversation/src/ignore_preferences.cpp b/konversation/src/ignore_preferences.cpp index 4a2c4e5..5891bc7 100644 --- a/konversation/src/ignore_preferences.cpp +++ b/konversation/src/ignore_preferences.cpp @@ -13,7 +13,7 @@ #include "ignore_preferences.h" #include "ignorelistviewitem.h" #include "ignore.h" -#include "preferences.h" +#include "config/preferences.h" #include #include diff --git a/konversation/src/konversationapplication.h b/konversation/src/konversationapplication.h index d94d47e..acdd557 100644 --- a/konversation/src/konversationapplication.h +++ b/konversation/src/konversationapplication.h @@ -16,7 +16,7 @@ #ifndef KONVERSATIONAPPLICATION_H #define KONVERSATIONAPPLICATION_H -#include "preferences.h" +#include "config/preferences.h" #include "osd.h" #include "konvdcop.h" #include "identity.h" diff --git a/konversation/src/konversationmainwindow.h b/konversation/src/konversationmainwindow.h index bddac8d..7d37f5d 100644 --- a/konversation/src/konversationmainwindow.h +++ b/konversation/src/konversationmainwindow.h @@ -17,7 +17,7 @@ #define _KONVERSATIONMAINWINDOW_H_ #include "channel.h" -#include "preferences.h" +#include "config/preferences.h" #include "ssllabel.h" #include "nickinfo.h" #include "server.h" diff --git a/konversation/src/nick.cpp b/konversation/src/nick.cpp index 87ba180..dbb98f1 100644 --- a/konversation/src/nick.cpp +++ b/konversation/src/nick.cpp @@ -22,7 +22,6 @@ #include #include "konversationapplication.h" -#include "preferences.h" Nick::Nick(TDEListView *listView, const ChannelNickPtr& channelnick) diff --git a/konversation/src/osd_preferences.cpp b/konversation/src/osd_preferences.cpp index 7bf5532..3d9dab4 100644 --- a/konversation/src/osd_preferences.cpp +++ b/konversation/src/osd_preferences.cpp @@ -14,7 +14,6 @@ */ #include "osd_preferences.h" -#include "config/preferences.h" #include "osd.h" #include "konversationapplication.h" diff --git a/konversation/src/servergroupdialog.cpp b/konversation/src/servergroupdialog.cpp index ac7d6ea..da32f4a 100644 --- a/konversation/src/servergroupdialog.cpp +++ b/konversation/src/servergroupdialog.cpp @@ -14,7 +14,6 @@ #include "identity.h" #include "konversationapplication.h" #include "viewcontainer.h" -#include "preferences.h" #include "serversettings.h" #include "serverdialog.h" #include "channeldialog.h" diff --git a/konversation/src/serverlistdialog.cpp b/konversation/src/serverlistdialog.cpp index f722899..3539f34 100644 --- a/konversation/src/serverlistdialog.cpp +++ b/konversation/src/serverlistdialog.cpp @@ -11,7 +11,6 @@ */ #include "serverlistdialog.h" -#include "preferences.h" #include "konversationapplication.h" #include "servergroupdialog.h" #include "connectionsettings.h" diff --git a/konversation/src/trayicon.cpp b/konversation/src/trayicon.cpp index d444d3f..5ec86e4 100644 --- a/konversation/src/trayicon.cpp +++ b/konversation/src/trayicon.cpp @@ -17,7 +17,6 @@ #include "channel.h" #include "server.h" #include "chatwindow.h" -#include "config/preferences.h" #include #include diff --git a/konversation/src/viewtree.cpp b/konversation/src/viewtree.cpp index a1a30c1..3351a90 100644 --- a/konversation/src/viewtree.cpp +++ b/konversation/src/viewtree.cpp @@ -11,7 +11,7 @@ #include "viewtree.h" #include "viewtreeitem.h" -#include "preferences.h" +#include "config/preferences.h" #include "chatwindow.h" #include "server.h" #include "channel.h" diff --git a/konversation/src/viewtreeitem.cpp b/konversation/src/viewtreeitem.cpp index bec9205..43744b8 100644 --- a/konversation/src/viewtreeitem.cpp +++ b/konversation/src/viewtreeitem.cpp @@ -12,7 +12,6 @@ #include "viewtreeitem.h" #include "konversationapplication.h" #include "chatwindow.h" -#include "preferences.h" #include "images.h" diff --git a/konversation/src/watchednicknames_preferences.cpp b/konversation/src/watchednicknames_preferences.cpp index 3b30cfb..2b78db2 100644 --- a/konversation/src/watchednicknames_preferences.cpp +++ b/konversation/src/watchednicknames_preferences.cpp @@ -11,7 +11,6 @@ #include "watchednicknames_preferences.h" #include "watchednicknames_preferencesui.h" -#include "config/preferences.h" #include "konversationapplication.h" #include "konversationmainwindow.h" #include "valuelistviewitem.h"