summaryrefslogtreecommitdiffstats
path: root/certmanager
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-22 20:22:15 -0600
committerTimothy Pearson <[email protected]>2013-01-22 20:22:15 -0600
commit5fc6f26e12b596addd235f87320c31761bd5a84d (patch)
tree0a1ff964c23fce07fc088017df4ad537d57e62e5 /certmanager
parent12c8a23fe75817cb4bfcd604c1863266dd75e840 (diff)
downloadtdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.tar.gz
tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'certmanager')
-rw-r--r--certmanager/aboutdata.cpp2
-rw-r--r--certmanager/aboutdata.h2
-rw-r--r--certmanager/kwatchgnupg/aboutdata.cpp2
-rw-r--r--certmanager/kwatchgnupg/aboutdata.h2
-rw-r--r--certmanager/lib/tests/test_cryptoconfig.cpp2
-rw-r--r--certmanager/lib/tests/test_gnupgprocessbase.cpp2
-rw-r--r--certmanager/lib/tests/test_jobs.cpp2
-rw-r--r--certmanager/lib/tests/test_keygen.cpp2
-rw-r--r--certmanager/lib/tests/test_keylister.cpp2
-rw-r--r--certmanager/lib/tests/test_keyselectiondialog.cpp2
-rw-r--r--certmanager/lib/tests/test_verify.cpp2
11 files changed, 11 insertions, 11 deletions
diff --git a/certmanager/aboutdata.cpp b/certmanager/aboutdata.cpp
index 672d8a8c8..8941ae00d 100644
--- a/certmanager/aboutdata.cpp
+++ b/certmanager/aboutdata.cpp
@@ -76,7 +76,7 @@ static const about_data credits[] = {
AboutData::AboutData()
- : KAboutData( "kleopatra", I18N_NOOP("Kleopatra"),
+ : TDEAboutData( "kleopatra", I18N_NOOP("Kleopatra"),
kleopatra_version, description, License_GPL,
"(c) 2002 Steffen Hansen, Jesper Pedersen,\n"
"Kalle Dalheimer, Klar\xC3\xA4lvdalens Datakonsult AB\n\n"
diff --git a/certmanager/aboutdata.h b/certmanager/aboutdata.h
index ca96f6847..5161b9c23 100644
--- a/certmanager/aboutdata.h
+++ b/certmanager/aboutdata.h
@@ -35,7 +35,7 @@
#include <kaboutdata.h>
-class AboutData : public KAboutData {
+class AboutData : public TDEAboutData {
public:
AboutData();
};
diff --git a/certmanager/kwatchgnupg/aboutdata.cpp b/certmanager/kwatchgnupg/aboutdata.cpp
index 2759ee31f..5727003f0 100644
--- a/certmanager/kwatchgnupg/aboutdata.cpp
+++ b/certmanager/kwatchgnupg/aboutdata.cpp
@@ -56,7 +56,7 @@ static const about_data credits[] = {
#endif
AboutData::AboutData()
- : KAboutData( "kwatchgnupg", I18N_NOOP("KWatchGnuPG"),
+ : TDEAboutData( "kwatchgnupg", I18N_NOOP("KWatchGnuPG"),
kwatchgnupg_version, description, License_GPL,
"(c) 2004 Klar\xC3\xA4lvdalens Datakonsult AB\n" )
{
diff --git a/certmanager/kwatchgnupg/aboutdata.h b/certmanager/kwatchgnupg/aboutdata.h
index 2a3324107..de8d2be2f 100644
--- a/certmanager/kwatchgnupg/aboutdata.h
+++ b/certmanager/kwatchgnupg/aboutdata.h
@@ -35,7 +35,7 @@
#include <kaboutdata.h>
-class AboutData : public KAboutData {
+class AboutData : public TDEAboutData {
public:
AboutData();
};
diff --git a/certmanager/lib/tests/test_cryptoconfig.cpp b/certmanager/lib/tests/test_cryptoconfig.cpp
index e11ca2ab1..10e750c7f 100644
--- a/certmanager/lib/tests/test_cryptoconfig.cpp
+++ b/certmanager/lib/tests/test_cryptoconfig.cpp
@@ -42,7 +42,7 @@ using namespace std;
int main( int argc, char** argv ) {
- KAboutData aboutData( "test_cryptoconfig", "CryptoConfig Test", "0.1" );
+ TDEAboutData aboutData( "test_cryptoconfig", "CryptoConfig Test", "0.1" );
TDECmdLineArgs::init( argc, argv, &aboutData );
TDEApplication app( false, false );
diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp
index 35a350ad3..dd94b8d6e 100644
--- a/certmanager/lib/tests/test_gnupgprocessbase.cpp
+++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp
@@ -119,7 +119,7 @@ int main( int argc, char** argv ) {
kdDebug() << "Need at least two arguments" << endl;
return 1;
}
- KAboutData aboutData( "test_gnupgprocessbase", "GnuPGProcessBase Test", "0.1" );
+ TDEAboutData aboutData( "test_gnupgprocessbase", "GnuPGProcessBase Test", "0.1" );
TDECmdLineArgs::init( &aboutData );
TDEApplication app;
diff --git a/certmanager/lib/tests/test_jobs.cpp b/certmanager/lib/tests/test_jobs.cpp
index 92aaf9b42..5c2c8606d 100644
--- a/certmanager/lib/tests/test_jobs.cpp
+++ b/certmanager/lib/tests/test_jobs.cpp
@@ -100,7 +100,7 @@ int main( int argc, char** argv ) {
protocol = argv[1];
argc = 1; // hide from KDE
}
- KAboutData aboutData( "test_jobs", "Signing Job Test", "0.1" );
+ TDEAboutData aboutData( "test_jobs", "Signing Job Test", "0.1" );
TDECmdLineArgs::init( argc, argv, &aboutData );
TDEApplication app;
diff --git a/certmanager/lib/tests/test_keygen.cpp b/certmanager/lib/tests/test_keygen.cpp
index 4ec5c29ea..e0406e801 100644
--- a/certmanager/lib/tests/test_keygen.cpp
+++ b/certmanager/lib/tests/test_keygen.cpp
@@ -146,7 +146,7 @@ int main( int argc, char** argv ) {
protocol = argv[1];
argc = 1; // hide from KDE
}
- KAboutData aboutData( "test_keygen", "KeyGenerationJob Test", "0.1" );
+ TDEAboutData aboutData( "test_keygen", "KeyGenerationJob Test", "0.1" );
TDECmdLineArgs::init( argc, argv, &aboutData );
TDEApplication app;
diff --git a/certmanager/lib/tests/test_keylister.cpp b/certmanager/lib/tests/test_keylister.cpp
index 904671fbe..78d09bc20 100644
--- a/certmanager/lib/tests/test_keylister.cpp
+++ b/certmanager/lib/tests/test_keylister.cpp
@@ -130,7 +130,7 @@ void CertListView::slotStart() {
int main( int argc, char** argv ) {
- KAboutData aboutData( "test_keylister", "KeyLister Test", "0.1" );
+ TDEAboutData aboutData( "test_keylister", "KeyLister Test", "0.1" );
TDECmdLineArgs::init( argc, argv, &aboutData );
TDEApplication app;
diff --git a/certmanager/lib/tests/test_keyselectiondialog.cpp b/certmanager/lib/tests/test_keyselectiondialog.cpp
index eacbb5f63..e74c18d84 100644
--- a/certmanager/lib/tests/test_keyselectiondialog.cpp
+++ b/certmanager/lib/tests/test_keyselectiondialog.cpp
@@ -44,7 +44,7 @@
#include <vector>
int main( int argc, char ** argv ) {
- KAboutData aboutData( "test_keyselectiondialog", "KeySelectionDialog Test", "0.1" );
+ TDEAboutData aboutData( "test_keyselectiondialog", "KeySelectionDialog Test", "0.1" );
TDECmdLineArgs::init( argc, argv, &aboutData );
TDEApplication app;
diff --git a/certmanager/lib/tests/test_verify.cpp b/certmanager/lib/tests/test_verify.cpp
index 469d18952..85a1b32f1 100644
--- a/certmanager/lib/tests/test_verify.cpp
+++ b/certmanager/lib/tests/test_verify.cpp
@@ -53,7 +53,7 @@ int main( int argc, char **argv )
setenv("LC_ALL", "C", 1);
setenv("TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-unit-test" ), 1);
- KAboutData aboutData( "test_verify", "verify job test", "0.1" );
+ TDEAboutData aboutData( "test_verify", "verify job test", "0.1" );
TDECmdLineArgs::init( argc, argv, &aboutData );
TDEApplication app( false, false );