summaryrefslogtreecommitdiffstats
path: root/certmanager
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
parent6cc5f72b33f1d281de3e1bf809b1b5e77d5c96cf (diff)
downloadtdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.tar.gz
tdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'certmanager')
-rw-r--r--certmanager/certmanager.cpp6
-rw-r--r--certmanager/certmanager.h2
-rw-r--r--certmanager/conf/appearanceconfigwidget.cpp4
-rw-r--r--certmanager/customactions.cpp2
-rw-r--r--certmanager/customactions.h2
-rw-r--r--certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp2
-rw-r--r--certmanager/kwatchgnupg/kwatchgnupgmainwin.h2
-rw-r--r--certmanager/lib/ui/backendconfigwidget.cpp4
-rw-r--r--certmanager/lib/ui/cryptoconfigdialog.cpp2
-rw-r--r--certmanager/lib/ui/keylistview.h2
10 files changed, 14 insertions, 14 deletions
diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp
index 170f6426..9e01cc6d 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>
diff --git a/certmanager/certmanager.h b/certmanager/certmanager.h
index 5ed440bd..c61ce7db 100644
--- a/certmanager/certmanager.h
+++ b/certmanager/certmanager.h
@@ -35,7 +35,7 @@
//#include <gpgme.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include <tdepimmacros.h>
#include <kurl.h>
#include <tqcstring.h>
diff --git a/certmanager/conf/appearanceconfigwidget.cpp b/certmanager/conf/appearanceconfigwidget.cpp
index 432f2ce9..19224cf9 100644
--- a/certmanager/conf/appearanceconfigwidget.cpp
+++ b/certmanager/conf/appearanceconfigwidget.cpp
@@ -40,13 +40,13 @@
#include <kleo/cryptobackendfactory.h>
#include <kleo/keyfiltermanager.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <tdeconfig.h>
#include <kdialog.h>
#include <klocale.h>
#include <kdebug.h>
#include <kmessagebox.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
#include <kcolordialog.h>
#include <tqpushbutton.h>
diff --git a/certmanager/customactions.cpp b/certmanager/customactions.cpp
index 268b85ee..e8ea4312 100644
--- a/certmanager/customactions.cpp
+++ b/certmanager/customactions.cpp
@@ -32,7 +32,7 @@
#include "customactions.h"
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
#include <kapplication.h>
#include <tqlineedit.h>
diff --git a/certmanager/customactions.h b/certmanager/customactions.h
index c07157bd..67a429f9 100644
--- a/certmanager/customactions.h
+++ b/certmanager/customactions.h
@@ -33,7 +33,7 @@
#ifndef __CUSTOMACTIONS_H__
#define __CUSTOMACTIONS_H__
-#include <kaction.h>
+#include <tdeaction.h>
#include <tqstringlist.h>
diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
index 72949254..738f01b1 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 9b6b4cd5..7df54051 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;
diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp
index d2312c72..cc9f0c25 100644
--- a/certmanager/lib/ui/backendconfigwidget.cpp
+++ b/certmanager/lib/ui/backendconfigwidget.cpp
@@ -41,7 +41,7 @@
#include "kleo/cryptobackendfactory.h"
#include "ui/keylistview.h" // for lvi_cast<>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kdialog.h>
#include <klocale.h>
#include <kdebug.h>
@@ -108,7 +108,7 @@ private:
};
-// Checklist item under a BackendListViewItem
+// Chectdelist item under a BackendListViewItem
// (e.g. "GpgME supports protocol OpenPGP")
class Kleo::ProtocolCheckListItem : public TQCheckListItem
{
diff --git a/certmanager/lib/ui/cryptoconfigdialog.cpp b/certmanager/lib/ui/cryptoconfigdialog.cpp
index d6dc823e..410f4348 100644
--- a/certmanager/lib/ui/cryptoconfigdialog.cpp
+++ b/certmanager/lib/ui/cryptoconfigdialog.cpp
@@ -32,7 +32,7 @@
#include "cryptoconfigdialog.h"
#include "cryptoconfigmodule.h"
#include <klocale.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *parent, const char* name )
: KDialogBase( Swallow,
diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h
index 2f383cc5..4149cb41 100644
--- a/certmanager/lib/ui/keylistview.h
+++ b/certmanager/lib/ui/keylistview.h
@@ -33,7 +33,7 @@
#ifndef __KLEO_KEYLISTVIEW_H__
#define __KLEO_KEYLISTVIEW_H__
-#include <klistview.h>
+#include <tdelistview.h>
#include <gpgmepp/key.h>
#include <tdepimmacros.h>