summaryrefslogtreecommitdiffstats
path: root/kabc
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:04 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:04 -0600
commitd1e0cc99a202cef3306b90b8839a6726e89f201e (patch)
treea0d01a91644fd94aa6da5d8944e052b67461faad /kabc
parent3e3559f2d4f4c4ffa3caa0374928c8a12be29bf3 (diff)
downloadtdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.tar.gz
tdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kabc')
-rw-r--r--kabc/addresseedialog.h2
-rw-r--r--kabc/addresslineedit.cpp2
-rw-r--r--kabc/ldapconfigwidget.cpp2
-rw-r--r--kabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp2
-rw-r--r--kabc/resourceselectdialog.cpp2
5 files changed, 5 insertions, 5 deletions
diff --git a/kabc/addresseedialog.h b/kabc/addresseedialog.h
index 83166b50b..74470d1b4 100644
--- a/kabc/addresseedialog.h
+++ b/kabc/addresseedialog.h
@@ -25,7 +25,7 @@
#include <kdialogbase.h>
#include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include "addressbook.h"
diff --git a/kabc/addresslineedit.cpp b/kabc/addresslineedit.cpp
index 1affd0997..88703094b 100644
--- a/kabc/addresslineedit.cpp
+++ b/kabc/addresslineedit.cpp
@@ -37,7 +37,7 @@
#include <kcursor.h>
#include <kstandarddirs.h>
#include <kstaticdeleter.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
#include <kurldrag.h>
#include <kabc/stdaddressbook.h>
diff --git a/kabc/ldapconfigwidget.cpp b/kabc/ldapconfigwidget.cpp
index eff79a73a..5996477a0 100644
--- a/kabc/ldapconfigwidget.cpp
+++ b/kabc/ldapconfigwidget.cpp
@@ -30,7 +30,7 @@
#include <tqradiobutton.h>
#include <kmessagebox.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
#include <kdialogbase.h>
#include <klocale.h>
#include <klineedit.h>
diff --git a/kabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp b/kabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
index 15efa5ba6..f53ee7d30 100644
--- a/kabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
+++ b/kabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
@@ -29,7 +29,7 @@
#include <tqhbuttongroup.h>
#include <tqradiobutton.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
#include <kcombobox.h>
#include <kdebug.h>
#include <kdialogbase.h>
diff --git a/kabc/resourceselectdialog.cpp b/kabc/resourceselectdialog.cpp
index e840e027e..3b6e25752 100644
--- a/kabc/resourceselectdialog.cpp
+++ b/kabc/resourceselectdialog.cpp
@@ -20,7 +20,7 @@
#include <klocale.h>
#include <kbuttonbox.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
#include <kstdguiitem.h>
#include <tqgroupbox.h>