Fix FTBFS due to conflict with TQt3 include preferences.h

konversation/src/awaymanager.cpp

@@ -15,7 +15,6 @@
 #include "konversationmainwindow.h"
 #include "connectionmanager.h"
 #include "server.h"
-#include "preferences.h"
 
 #include <tqtimer.h>
 

konversation/src/common.cpp

@@ -12,7 +12,6 @@
 
 #include "common.h"
 #include "konversationapplication.h"
-#include "config/preferences.h"
 
 #include <tqcstring.h>
 #include <tqstring.h>

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"

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 <arpa/inet.h>

konversation/src/dcctransfer.cpp

@@ -12,7 +12,7 @@
 */
 
 #include "dcctransfer.h"
-#include "preferences.h"
+#include "config/preferences.h"
 
 #include <tqfileinfo.h>
 #include <tqhostaddress.h>

konversation/src/dcctransfermanager.cpp

@@ -13,7 +13,6 @@
 #include "dcctransferrecv.h"
 #include "dcctransfersend.h"
 #include "konversationapplication.h"
-#include "preferences.h"
 
 #include <kdebug.h>
 

konversation/src/dcctransferpanel.cpp

@@ -18,7 +18,6 @@
 #include "dcctransfermanager.h"
 #include "dcctransferpanelitem.h"
 #include "dcctransfersend.h"
-#include "preferences.h"
 
 #include <tqhbox.h>
 #include <tqheader.h>

konversation/src/dcctransferpanelitem.cpp

@@ -16,7 +16,6 @@
 #include "dcctransferpanelitem.h"
 #include "dcctransferpanel.h"
 #include "konversationapplication.h"
-#include "config/preferences.h"
 
 #include <tqheader.h>
 #include <tqhostaddress.h>

konversation/src/emoticon.cpp

@@ -21,7 +21,6 @@
 #include <tdeversion.h>
 
 #include "konversationapplication.h"
-#include "config/preferences.h"
 
 
 namespace Konversation

konversation/src/highlight_preferences.cpp

@@ -14,7 +14,6 @@
 #include "highlightviewitem.h"
 #include "konversationapplication.h"
 #include "konversationsound.h"
-#include "config/preferences.h"
 
 #include <tqdir.h>
 #include <tqlabel.h>

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 <tdelocale.h>
 #include <tdelistview.h>

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"

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"

konversation/src/nick.cpp

@@ -22,7 +22,6 @@
 #include <tdeabc/phonenumber.h>
 
 #include "konversationapplication.h"
-#include "preferences.h"
 
 Nick::Nick(TDEListView *listView,
 const ChannelNickPtr& channelnick)

konversation/src/osd_preferences.cpp

@@ -14,7 +14,6 @@
 */
 
 #include "osd_preferences.h"
-#include "config/preferences.h"
 #include "osd.h"
 #include "konversationapplication.h"
 

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"

konversation/src/serverlistdialog.cpp

@@ -11,7 +11,6 @@
 */
 
 #include "serverlistdialog.h"
-#include "preferences.h"
 #include "konversationapplication.h"
 #include "servergroupdialog.h"
 #include "connectionsettings.h"

konversation/src/trayicon.cpp

@@ -17,7 +17,6 @@
 #include "channel.h"
 #include "server.h"
 #include "chatwindow.h"
-#include "config/preferences.h"
 
 #include <tqtimer.h>
 #include <tqtooltip.h>

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"

konversation/src/viewtreeitem.cpp

@@ -12,7 +12,6 @@
 #include "viewtreeitem.h"
 #include "konversationapplication.h"
 #include "chatwindow.h"
-#include "preferences.h"
 #include "images.h"
 
 

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"