diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:23:32 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:23:32 -0600 |
commit | 94c9dc38220d50d037075127ad46add8a264ef26 (patch) | |
tree | af6ba5d26197827dac1b1901895dee7a7b62a9d6 /kbabel | |
parent | 479647c43c62fc50302342c8ac50a2fe024b4426 (diff) | |
download | tdesdk-94c9dc38220d50d037075127ad46add8a264ef26.tar.gz tdesdk-94c9dc38220d50d037075127ad46add8a264ef26.zip |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kbabel')
-rw-r--r-- | kbabel/addons/preview/pothumbcreator.cpp | 2 | ||||
-rw-r--r-- | kbabel/catalogmanager/catalogmanagerapp.h | 2 | ||||
-rw-r--r-- | kbabel/catalogmanager/libcvs/cvshandler.cpp | 2 | ||||
-rw-r--r-- | kbabel/catalogmanager/libsvn/svnhandler.cpp | 2 | ||||
-rw-r--r-- | kbabel/catalogmanager/main.cpp | 4 | ||||
-rw-r--r-- | kbabel/kbabel/kbabel.cpp | 2 | ||||
-rw-r--r-- | kbabel/kbabel/main.cpp | 2 | ||||
-rw-r--r-- | kbabel/kbabeldict/kbabeldictbox.cpp | 2 | ||||
-rw-r--r-- | kbabel/kbabeldict/main.cpp | 10 |
9 files changed, 14 insertions, 14 deletions
diff --git a/kbabel/addons/preview/pothumbcreator.cpp b/kbabel/addons/preview/pothumbcreator.cpp index 22f6fb5e..3dbd6611 100644 --- a/kbabel/addons/preview/pothumbcreator.cpp +++ b/kbabel/addons/preview/pothumbcreator.cpp @@ -319,7 +319,7 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage // very very seldom a babelfish lives in po files and even // in this seldom cases they are usually hidden ;-) - if(pix.width() > 40 && KApplication::random()%2000 == 0) + if(pix.width() > 40 && TDEApplication::random()%2000 == 0) { TQPixmap kbabelPix; if(pix.width() < 80) diff --git a/kbabel/catalogmanager/catalogmanagerapp.h b/kbabel/catalogmanager/catalogmanagerapp.h index 3f7c0fa8..99e3e97e 100644 --- a/kbabel/catalogmanager/catalogmanagerapp.h +++ b/kbabel/catalogmanager/catalogmanagerapp.h @@ -53,7 +53,7 @@ public: virtual void updatedFile( TQCString url ); }; -class CatalogManagerApp : public KApplication +class CatalogManagerApp : public TDEApplication { public: CatalogManagerApp(); diff --git a/kbabel/catalogmanager/libcvs/cvshandler.cpp b/kbabel/catalogmanager/libcvs/cvshandler.cpp index b0be0345..1cd78410 100644 --- a/kbabel/catalogmanager/libcvs/cvshandler.cpp +++ b/kbabel/catalogmanager/libcvs/cvshandler.cpp @@ -379,7 +379,7 @@ void CVSHandler::processDiff( TQString output ) tmpFile.close(); TQString error; - if ( KApplication::startServiceByName( "Kompare", tmpFile.name(), &error ) ) + if ( TDEApplication::startServiceByName( "Kompare", tmpFile.name(), &error ) ) KMessageBox::error( 0, error ); } diff --git a/kbabel/catalogmanager/libsvn/svnhandler.cpp b/kbabel/catalogmanager/libsvn/svnhandler.cpp index d00c0858..bff097fd 100644 --- a/kbabel/catalogmanager/libsvn/svnhandler.cpp +++ b/kbabel/catalogmanager/libsvn/svnhandler.cpp @@ -487,7 +487,7 @@ void SVNHandler::processDiff( TQString output ) tmpFile.close(); TQString error; - if ( KApplication::startServiceByName( "Kompare", tmpFile.name(), &error ) ) + if ( TDEApplication::startServiceByName( "Kompare", tmpFile.name(), &error ) ) KMessageBox::error( 0, error ); } diff --git a/kbabel/catalogmanager/main.cpp b/kbabel/catalogmanager/main.cpp index d071ecb6..ef17c176 100644 --- a/kbabel/catalogmanager/main.cpp +++ b/kbabel/catalogmanager/main.cpp @@ -61,7 +61,7 @@ CatalogManager *CatalogManagerApp::_view = 0; CatalogManagerApp::CatalogManagerApp() - : KApplication() + : TDEApplication() { kbInterface = new CatalogManagerInterface; _view = 0; @@ -222,7 +222,7 @@ int main(int argc, char **argv) TDECmdLineArgs::addCmdLineOptions( options ); // Add options from other components - KApplication::addCmdLineOptions(); + TDEApplication::addCmdLineOptions(); CatalogManagerApp app; diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp index 406e8509..91e591fb 100644 --- a/kbabel/kbabel/kbabel.cpp +++ b/kbabel/kbabel/kbabel.cpp @@ -1560,7 +1560,7 @@ void KBabelMW::enableStop(bool flag) void KBabelMW::gettextHelp() { TQString error; - KApplication::startServiceByDesktopName("khelpcenter", + TDEApplication::startServiceByDesktopName("khelpcenter", TQString("info:/gettext"), &error); if(!error.isEmpty()) diff --git a/kbabel/kbabel/main.cpp b/kbabel/kbabel/main.cpp index f52d0e06..1e8ca625 100644 --- a/kbabel/kbabel/main.cpp +++ b/kbabel/kbabel/main.cpp @@ -203,7 +203,7 @@ int KBabelApp::newInstance() } if(showSplash) { - KApplication::restoreOverrideCursor(); + TDEApplication::restoreOverrideCursor(); /* KMessageBox::information(0, "This is a development version of KBabel!\n" diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp index bd88e240..239801d3 100644 --- a/kbabel/kbabeldict/kbabeldictbox.cpp +++ b/kbabel/kbabeldict/kbabeldictbox.cpp @@ -1410,7 +1410,7 @@ void KBabelDictBox::copy() } else { - TQClipboard *cb = KApplication::clipboard(); + TQClipboard *cb = TDEApplication::clipboard(); cb->setText(translation()); } } diff --git a/kbabel/kbabeldict/main.cpp b/kbabel/kbabeldict/main.cpp index e4de092a..fb783fa4 100644 --- a/kbabel/kbabeldict/main.cpp +++ b/kbabel/kbabeldict/main.cpp @@ -47,7 +47,7 @@ #include "kbabelsplash.h" #include <version.h> -class KBabelDictApplication : public KApplication +class KBabelDictApplication : public TDEApplication { public: KBabelDictApplication(); @@ -58,7 +58,7 @@ private: }; KBabelDictApplication::KBabelDictApplication() - : KApplication() + : TDEApplication() , topLevel(0) { TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); @@ -69,7 +69,7 @@ KBabelDictApplication::KBabelDictApplication() if(showSplash) { timer.start(2000,true); - KApplication::setOverrideCursor(KCursor::waitCursor()); + TDEApplication::setOverrideCursor(KCursor::waitCursor()); splash = new KBabelSplash(); splash->show(); } @@ -88,7 +88,7 @@ KBabelDictApplication::KBabelDictApplication() } if(showSplash) { - KApplication::restoreOverrideCursor(); + TDEApplication::restoreOverrideCursor(); } TQObject::connect( topLevel, TQT_SIGNAL( destroyed() ), @@ -128,7 +128,7 @@ int main(int argc, char **argv) TDECmdLineArgs::addCmdLineOptions( options ); // Add options from other components - KApplication::addCmdLineOptions(); + TDEApplication::addCmdLineOptions(); KBabelDictApplication app; |