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/kbabeldict | |
parent | 479647c43c62fc50302342c8ac50a2fe024b4426 (diff) | |
download | tdesdk-94c9dc38220d50d037075127ad46add8a264ef26.tar.gz tdesdk-94c9dc38220d50d037075127ad46add8a264ef26.zip |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kbabel/kbabeldict')
-rw-r--r-- | kbabel/kbabeldict/kbabeldictbox.cpp | 2 | ||||
-rw-r--r-- | kbabel/kbabeldict/main.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
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; |