summaryrefslogtreecommitdiffstats
path: root/certmanager/certmanager.cpp
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 /certmanager/certmanager.cpp
parent6cc5f72b33f1d281de3e1bf809b1b5e77d5c96cf (diff)
downloadtdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.tar.gz
tdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'certmanager/certmanager.cpp')
-rw-r--r--certmanager/certmanager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp
index 170f64268..9e01cc6d0 100644
--- a/certmanager/certmanager.cpp
+++ b/certmanager/certmanager.cpp
@@ -73,12 +73,12 @@
// KDE
#include <tdefiledialog.h>
#include <kprocess.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kapplication.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <dcopclient.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
#include <kstatusbar.h>
#include <kstandarddirs.h>
#include <kdebug.h>
@@ -87,7 +87,7 @@
#include <ktempfile.h>
#include <tdeio/job.h>
#include <tdeio/netaccess.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
// TQt
#include <tqfontmetrics.h>