From 1ad423d43bfed127171bdfe8685e1d957eecf957 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:14:52 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- kpackage/debDpkgInterface.cpp | 2 +- kpackage/debInterface.cpp | 2 +- kpackage/kissInterface.cpp | 2 +- kpackage/kpackage.cpp | 2 +- kpackage/main.cpp | 2 +- kpackage/packageProperties.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'kpackage') diff --git a/kpackage/debDpkgInterface.cpp b/kpackage/debDpkgInterface.cpp index a1c4504..62f199a 100644 --- a/kpackage/debDpkgInterface.cpp +++ b/kpackage/debDpkgInterface.cpp @@ -50,7 +50,7 @@ #include -extern KApplication *app; +extern TDEApplication *app; extern Opts *params; ////////////////////////////////////////////////////////////////////////////// diff --git a/kpackage/debInterface.cpp b/kpackage/debInterface.cpp index 41146fe..74ef515 100644 --- a/kpackage/debInterface.cpp +++ b/kpackage/debInterface.cpp @@ -49,7 +49,7 @@ #include "cache.h" #include -extern KApplication *app; +extern TDEApplication *app; ////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// diff --git a/kpackage/kissInterface.cpp b/kpackage/kissInterface.cpp index 34b3b4b..e98d385 100644 --- a/kpackage/kissInterface.cpp +++ b/kpackage/kissInterface.cpp @@ -52,7 +52,7 @@ #include -extern KApplication *app; +extern TDEApplication *app; ////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// diff --git a/kpackage/kpackage.cpp b/kpackage/kpackage.cpp index 2c90b9f..75aeabb 100644 --- a/kpackage/kpackage.cpp +++ b/kpackage/kpackage.cpp @@ -401,7 +401,7 @@ void KPACKAGE::fileQuit() // file->quit selected from menu { cleanUp(); - KApplication::exit(0); // exit the application + TDEApplication::exit(0); // exit the application } void KPACKAGE::cleanUp() // file->quit selected from menu diff --git a/kpackage/main.cpp b/kpackage/main.cpp index 52731d2..b5a63ec 100644 --- a/kpackage/main.cpp +++ b/kpackage/main.cpp @@ -87,7 +87,7 @@ int main(int argc, char **argv) TDECmdLineArgs::init( argc, argv, &aboutData ); aboutData.addAuthor( "Toivo Pedaste",0, "toivo@ucs.uwa.edu.au"); TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. - KApplication app; + TDEApplication app; kpkg = 0; int j = 0; diff --git a/kpackage/packageProperties.cpp b/kpackage/packageProperties.cpp index 2e1aca7..490bc50 100644 --- a/kpackage/packageProperties.cpp +++ b/kpackage/packageProperties.cpp @@ -250,7 +250,7 @@ void packagePropertiesWidget::setSource(const TQString &name) { if (s.startsWith("http:") || s.startsWith("ftp:")) { - KApplication::kApplication()->invokeBrowser( s ); + TDEApplication::kApplication()->invokeBrowser( s ); return; } -- cgit v1.2.1