summaryrefslogtreecommitdiffstats
path: root/certmanager/kwatchgnupg
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/kwatchgnupg
parent6cc5f72b33f1d281de3e1bf809b1b5e77d5c96cf (diff)
downloadtdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.tar.gz
tdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'certmanager/kwatchgnupg')
-rw-r--r--certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp2
-rw-r--r--certmanager/kwatchgnupg/kwatchgnupgmainwin.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
index 729492547..738f01b1e 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
@@ -41,7 +41,7 @@
#include <kmessagebox.h>
#include <klocale.h>
#include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kstdaction.h>
#include <kprocio.h>
#include <tdeconfig.h>
diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.h b/certmanager/kwatchgnupg/kwatchgnupgmainwin.h
index 9b6b4cd5f..7df540514 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.h
+++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.h
@@ -33,7 +33,7 @@
#ifndef KWATCHGNUPGMAINWIN_H
#define KWATCHGNUPGMAINWIN_H
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
class KWatchGnuPGTray;
class KWatchGnuPGConfig;