diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 23:59:48 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 23:59:48 -0600 |
| commit | 1c61261489751a320394ea8068fc877dc3e2fb47 (patch) | |
| tree | c94a83052f518a342534523bebba19aad2b9ad8d /apps | |
| parent | c5528d18d7870d01c4d8f1b8398db31f68bd7b41 (diff) | |
| download | ktorrent-1c61261489751a320394ea8068fc877dc3e2fb47.tar.gz ktorrent-1c61261489751a320394ea8068fc877dc3e2fb47.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/ktorrent/ktorrent.cpp | 2 | ||||
| -rw-r--r-- | apps/ktorrent/ktorrentcore.cpp | 2 | ||||
| -rw-r--r-- | apps/ktupnptest/main.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/apps/ktorrent/ktorrent.cpp b/apps/ktorrent/ktorrent.cpp index 34368e6..c4e29fc 100644 --- a/apps/ktorrent/ktorrent.cpp +++ b/apps/ktorrent/ktorrent.cpp @@ -582,7 +582,7 @@ void KTorrent::setupActions() bool KTorrent::queryClose() { - if (Settings::showSystemTrayIcon() && !KApplication::kApplication()->sessionSaving()) + if (Settings::showSystemTrayIcon() && !TDEApplication::kApplication()->sessionSaving()) { hide(); return false; diff --git a/apps/ktorrent/ktorrentcore.cpp b/apps/ktorrent/ktorrentcore.cpp index de0984a..da8a9f4 100644 --- a/apps/ktorrent/ktorrentcore.cpp +++ b/apps/ktorrent/ktorrentcore.cpp @@ -741,7 +741,7 @@ void KTorrentCore::makeTorrent(const TQString & file,const TQStringList & tracke prog->setProgress(ns); ns++; if (ns % 10 == 0) - KApplication::kApplication()->processEvents(); + TDEApplication::kApplication()->processEvents(); } mktor.saveTorrent(output_file); diff --git a/apps/ktupnptest/main.cpp b/apps/ktupnptest/main.cpp index 65fa4d8..97461ae 100644 --- a/apps/ktupnptest/main.cpp +++ b/apps/ktupnptest/main.cpp @@ -53,7 +53,7 @@ int main(int argc,char** argv) "http://ktorrent.org/"); TDECmdLineArgs::init(argc, argv,&about); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; Globals::instance().initLog(kt::DataDir() + "ktupnptest.log"); UPnPTestApp* mwnd = new UPnPTestApp(); |