summaryrefslogtreecommitdiffstats
path: root/kontact/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:55 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:55 -0600
commitd318087925a540a204c9d3820d5a09fbda58b8b2 (patch)
treeb8dde6aa5d6559b81c6667d8364a4364c27bcba4 /kontact/src
parent6cc5f72b33f1d281de3e1bf809b1b5e77d5c96cf (diff)
downloadtdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.tar.gz
tdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kontact/src')
-rw-r--r--kontact/src/iconsidepane.cpp2
-rw-r--r--kontact/src/iconsidepane.h2
-rw-r--r--kontact/src/kcmkontact.cpp2
-rw-r--r--kontact/src/mainwindow.cpp8
-rw-r--r--kontact/src/profiledialog.cpp2
5 files changed, 8 insertions, 8 deletions
diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp
index de16ee72d..6c490880c 100644
--- a/kontact/src/iconsidepane.cpp
+++ b/kontact/src/iconsidepane.cpp
@@ -36,7 +36,7 @@
#include <tqtimer.h>
#include <tqtooltip.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kapplication.h>
#include <kdialog.h>
#include <klocale.h>
diff --git a/kontact/src/iconsidepane.h b/kontact/src/iconsidepane.h
index f7887b83e..4cfbd5556 100644
--- a/kontact/src/iconsidepane.h
+++ b/kontact/src/iconsidepane.h
@@ -23,7 +23,7 @@
#include <tqtooltip.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
#include "sidepanebase.h"
#include "prefs.h"
diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp
index 2d9daffd9..d2f9d0a23 100644
--- a/kontact/src/kcmkontact.cpp
+++ b/kontact/src/kcmkontact.cpp
@@ -28,7 +28,7 @@
#include <kaboutdata.h>
#include <kdebug.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include <ktrader.h>
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index c7976bd42..8c82fa5f9 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -43,15 +43,15 @@
#include <kiconloader.h>
#include <kkeydialog.h>
#include <klibloader.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <tdeparts/componentfactory.h>
#include <kplugininfo.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <ksettings/dialog.h>
#include <ksettings/dispatcher.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
#include <kstandarddirs.h>
#include <kstatusbar.h>
#include <kstdaction.h>
@@ -67,7 +67,7 @@
#include <krun.h>
#include <kaboutdata.h>
#include <kmenubar.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
#include <kcmultidialog.h>
#include <kipc.h>
diff --git a/kontact/src/profiledialog.cpp b/kontact/src/profiledialog.cpp
index 6d1372deb..328848401 100644
--- a/kontact/src/profiledialog.cpp
+++ b/kontact/src/profiledialog.cpp
@@ -26,7 +26,7 @@
#include "profilemanager.h"
#include <tdefiledialog.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h>