summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/winpopup
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-27 01:04:58 -0600
committerTimothy Pearson <[email protected]>2013-01-27 01:04:58 -0600
commitb10a61b1fd2fe561ba61a384d4a344bae2a4aa29 (patch)
tree99dc6b2584265b2df91f7dbc1dcbf7a54efd205e /kopete/protocols/winpopup
parent64c3be47ff36e40035ead93f913aeeb1e4f85e4b (diff)
downloadtdenetwork-b10a61b1fd2fe561ba61a384d4a344bae2a4aa29.tar.gz
tdenetwork-b10a61b1fd2fe561ba61a384d4a344bae2a4aa29.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kopete/protocols/winpopup')
-rw-r--r--kopete/protocols/winpopup/libwinpopup/libwinpopup.h2
-rw-r--r--kopete/protocols/winpopup/wpaccount.cpp2
-rw-r--r--kopete/protocols/winpopup/wpeditaccount.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h
index 1213b3cf..39a098eb 100644
--- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h
+++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h
@@ -27,7 +27,7 @@
// KDE Includes
#include <kprocio.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
const TQString WP_POPUP_DIR = TQString::fromLatin1("/var/lib/winpopup");
diff --git a/kopete/protocols/winpopup/wpaccount.cpp b/kopete/protocols/winpopup/wpaccount.cpp
index d7439628..994735cc 100644
--- a/kopete/protocols/winpopup/wpaccount.cpp
+++ b/kopete/protocols/winpopup/wpaccount.cpp
@@ -25,7 +25,7 @@
#include <kdebug.h>
#include <kpopupmenu.h>
#include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
// Kopete Includes
diff --git a/kopete/protocols/winpopup/wpeditaccount.cpp b/kopete/protocols/winpopup/wpeditaccount.cpp
index 0e0b6f43..414a1af6 100644
--- a/kopete/protocols/winpopup/wpeditaccount.cpp
+++ b/kopete/protocols/winpopup/wpeditaccount.cpp
@@ -32,7 +32,7 @@
#include <knuminput.h>
#include <klineedit.h>
#include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kapplication.h>
#include <kstandarddirs.h>