diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 23:58:55 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 23:58:55 -0600 |
| commit | 4774c021a45e818d31d522b8c235ca28b993d889 (patch) | |
| tree | 3c8b1a641068b22184ad87bb6624177e6adf3ec7 /conduits | |
| parent | a200f22dde6af85d7888d619dd7c1196609f2144 (diff) | |
| download | kpilot-4774c021a45e818d31d522b8c235ca28b993d889.tar.gz kpilot-4774c021a45e818d31d522b8c235ca28b993d889.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'conduits')
| -rw-r--r-- | conduits/docconduit/kpalmdoc.cpp | 4 | ||||
| -rw-r--r-- | conduits/knotes/knotes-action.cc | 2 | ||||
| -rw-r--r-- | conduits/popmail/popmail-conduit.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/conduits/docconduit/kpalmdoc.cpp b/conduits/docconduit/kpalmdoc.cpp index e2924a4..f686aa4 100644 --- a/conduits/docconduit/kpalmdoc.cpp +++ b/conduits/docconduit/kpalmdoc.cpp @@ -48,9 +48,9 @@ int main(int argc, char *argv[]) "groot@kde.org", "http://www.kpilot.org/"); TDECmdLineArgs::init(argc, argv, &about); - KApplication::addCmdLineOptions(); + TDEApplication::addCmdLineOptions(); - KApplication app; + TDEApplication app; ConverterDlg *dlg=new ConverterDlg(0L, i18n("PalmDOC Converter")); dlg->show(); return app.exec(); diff --git a/conduits/knotes/knotes-action.cc b/conduits/knotes/knotes-action.cc index ca32913..c99d143 100644 --- a/conduits/knotes/knotes-action.cc +++ b/conduits/knotes/knotes-action.cc @@ -192,7 +192,7 @@ KNotesAction::KNotesAction(KPilotLink *o, FUNCTIONSETUP; /* - if (fP) fP->fDCOP = KApplication::kApplication()->dcopClient(); + if (fP) fP->fDCOP = TDEApplication::kApplication()->dcopClient(); if (fP && !fP->fDCOP) { diff --git a/conduits/popmail/popmail-conduit.cc b/conduits/popmail/popmail-conduit.cc index 8f51545..1fbaf71 100644 --- a/conduits/popmail/popmail-conduit.cc +++ b/conduits/popmail/popmail-conduit.cc @@ -186,7 +186,7 @@ int PopMailConduit::sendViaKMail() int count=0; TQString kmailOutboxName = getKMailOutbox(); - DCOPClient *dcopptr = KApplication::kApplication()->dcopClient(); + DCOPClient *dcopptr = TDEApplication::kApplication()->dcopClient(); if (!dcopptr) { WARNINGKPILOT << "Cannot get DCOP client." |