summaryrefslogtreecommitdiffstats
path: root/korganizer
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:23:08 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:23:08 -0600
commitd6d75dc9ff326e0bd6fc673adae71d53277fb8e4 (patch)
tree56a87e6a48bdf5e310958f1943a834e59eddbba1 /korganizer
parent32b66c9ae78f439199a6d281cc33218e57c5106d (diff)
downloadtdepim-d6d75dc9ff326e0bd6fc673adae71d53277fb8e4.tar.gz
tdepim-d6d75dc9ff326e0bd6fc673adae71d53277fb8e4.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'korganizer')
-rw-r--r--korganizer/komailclient.cpp2
-rw-r--r--korganizer/korgac/testalarmdlg.cpp2
-rw-r--r--korganizer/korgplugins.cpp2
-rw-r--r--korganizer/timezone.cpp2
-rw-r--r--korganizer/urihandler.cpp4
5 files changed, 6 insertions, 6 deletions
diff --git a/korganizer/komailclient.cpp b/korganizer/komailclient.cpp
index 1081f62a5..a6edc6486 100644
--- a/korganizer/komailclient.cpp
+++ b/korganizer/komailclient.cpp
@@ -243,7 +243,7 @@ bool KOMailClient::send(const TQString &from,const TQString &_to,const TQString
pclose(fd);
} else {
if (!kapp->dcopClient()->isApplicationRegistered("kmail")) {
- if (KApplication::startServiceByDesktopName("kmail")) {
+ if (TDEApplication::startServiceByDesktopName("kmail")) {
KMessageBox::error(0,i18n("No running instance of KMail found."));
return false;
}
diff --git a/korganizer/korgac/testalarmdlg.cpp b/korganizer/korgac/testalarmdlg.cpp
index 73d512d9a..e7be364b7 100644
--- a/korganizer/korgac/testalarmdlg.cpp
+++ b/korganizer/korgac/testalarmdlg.cpp
@@ -39,7 +39,7 @@ int main(int argc,char **argv)
KAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1");
TDECmdLineArgs::init(argc,argv,&aboutData);
- KApplication app;
+ TDEApplication app;
KConfig c( locate( "config", "korganizerrc" ) );
c.setGroup( "Time & Date" );
diff --git a/korganizer/korgplugins.cpp b/korganizer/korgplugins.cpp
index 0763fdbb0..e5fd0358d 100644
--- a/korganizer/korgplugins.cpp
+++ b/korganizer/korgplugins.cpp
@@ -37,7 +37,7 @@ int main(int argc,char **argv)
KAboutData aboutData("korgplugins",I18N_NOOP("KOrgPlugins"),"0.1");
TDECmdLineArgs::init(argc,argv,&aboutData);
- KApplication app;
+ TDEApplication app;
KTrader::OfferList plugins = KOCore::self()->availablePlugins();
KTrader::OfferList::ConstIterator it;
diff --git a/korganizer/timezone.cpp b/korganizer/timezone.cpp
index 66d0f2aea..9d3c42d60 100644
--- a/korganizer/timezone.cpp
+++ b/korganizer/timezone.cpp
@@ -39,7 +39,7 @@ int main(int argc,char **argv)
KAboutData aboutData("timezone",I18N_NOOP("KOrganizer Timezone Test"),"0.1");
TDECmdLineArgs::init(argc,argv,&aboutData);
- KApplication app;
+ TDEApplication app;
kdDebug(5850) << "KOrganizer TimezoneId: " << KOPrefs::instance()->mTimeZoneId
<< endl;
diff --git a/korganizer/urihandler.cpp b/korganizer/urihandler.cpp
index 080ecd8d6..6b454e63b 100644
--- a/korganizer/urihandler.cpp
+++ b/korganizer/urihandler.cpp
@@ -91,13 +91,13 @@ bool UriHandler::process( TQWidget *parent, const TQString &uri )
} else if ( uri.startsWith( "mailto:" ) ) {
- KApplication::kApplication()->invokeMailer( uri.mid(7), TQString() );
+ TDEApplication::kApplication()->invokeMailer( uri.mid(7), TQString() );
return true;
} else if ( uri.startsWith( "uid:" ) ) {
TQString uid = uidFromUri( uri );
- DCOPClient *client = KApplication::kApplication()->dcopClient();
+ DCOPClient *client = TDEApplication::kApplication()->dcopClient();
const TQByteArray noParamData;
const TQByteArray paramData;
TQByteArray replyData;