summaryrefslogtreecommitdiffstats
path: root/certmanager/conf
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:38 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:38 -0600
commitcfb328d59024a251690b6e47c9f8d343fd8c241c (patch)
tree7c11070cd07e5e023a26ddcfa41832c208c63732 /certmanager/conf
parent38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff)
downloadtdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz
tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'certmanager/conf')
-rw-r--r--certmanager/conf/appearanceconfigpage.cpp4
-rw-r--r--certmanager/conf/appearanceconfigwidget.cpp4
-rw-r--r--certmanager/conf/configuredialog.cpp2
-rw-r--r--certmanager/conf/dirservconfigpage.cpp6
4 files changed, 8 insertions, 8 deletions
diff --git a/certmanager/conf/appearanceconfigpage.cpp b/certmanager/conf/appearanceconfigpage.cpp
index 53030bbd7..c31fa9007 100644
--- a/certmanager/conf/appearanceconfigpage.cpp
+++ b/certmanager/conf/appearanceconfigpage.cpp
@@ -32,8 +32,8 @@
#include "appearanceconfigpage.h"
#include <tqlayout.h>
#include "appearanceconfigwidget.h"
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdepimmacros.h>
diff --git a/certmanager/conf/appearanceconfigwidget.cpp b/certmanager/conf/appearanceconfigwidget.cpp
index 19224cf9f..54c677cab 100644
--- a/certmanager/conf/appearanceconfigwidget.cpp
+++ b/certmanager/conf/appearanceconfigwidget.cpp
@@ -43,9 +43,9 @@
#include <tdelistview.h>
#include <tdeconfig.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdefontdialog.h>
#include <kcolordialog.h>
diff --git a/certmanager/conf/configuredialog.cpp b/certmanager/conf/configuredialog.cpp
index b1e994137..4d0d1e682 100644
--- a/certmanager/conf/configuredialog.cpp
+++ b/certmanager/conf/configuredialog.cpp
@@ -36,7 +36,7 @@
#include <twin.h>
#include <tdeapplication.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal )
: KCMultiDialog( KDialogBase::IconList, i18n( "Configure" ), parent, name, modal )
diff --git a/certmanager/conf/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp
index 769b95323..7a19d4515 100644
--- a/certmanager/conf/dirservconfigpage.cpp
+++ b/certmanager/conf/dirservconfigpage.cpp
@@ -34,8 +34,8 @@
#include <kleo/cryptobackendfactory.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeconfig.h>
#include <knuminput.h>
@@ -62,7 +62,7 @@ public:
KURL::List readCurrentList() const {
KURL::List lst;
- // stolen from kabc/ldapclient.cpp
+ // stolen from tdeabc/ldapclient.cpp
const uint numHosts = mConfig.readUnsignedNumEntry( "NumSelectedHosts" );
for ( uint j = 0; j < numHosts; j++ ) {
const TQString num = TQString::number( j );