TDE
/
ktorrent
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/ktorrent
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KApplication to TDEApplication to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent c5528d18d7
commit 1c61261489
8 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File

26
acinclude.m4
Unescape View File

@ -2003,20 +2003,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h> #include <kapp.h>
int main() { int main() {
printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n", printf("kde_wallpaperdir=\\"%s\\"\n",
KApplication::kde_wallpaperdir().data()); TDEApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n");

26
aclocal.m4 vendored
Unescape View File

@ -2015,20 +2015,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h> #include <kapp.h>
int main() { int main() {
printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n", printf("kde_wallpaperdir=\\"%s\\"\n",
KApplication::kde_wallpaperdir().data()); TDEApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n");

2
apps/ktorrent/ktorrent.cpp
Unescape View File

@ -582,7 +582,7 @@ void KTorrent::setupActions()
bool KTorrent::queryClose() bool KTorrent::queryClose()
{ {
if (Settings::showSystemTrayIcon() && !KApplication::kApplication()->sessionSaving()) if (Settings::showSystemTrayIcon() && !TDEApplication::kApplication()->sessionSaving())
{ {
hide(); hide();
return false; return false;

2
apps/ktorrent/ktorrentcore.cpp
Unescape View File

@ -741,7 +741,7 @@ void KTorrentCore::makeTorrent(const TQString & file,const TQStringList & tracke
prog->setProgress(ns); prog->setProgress(ns);
ns++; ns++;
if (ns % 10 == 0) if (ns % 10 == 0)
KApplication::kApplication()->processEvents(); TDEApplication::kApplication()->processEvents();
} }
mktor.saveTorrent(output_file); mktor.saveTorrent(output_file);

2
apps/ktupnptest/main.cpp
Unescape View File

@ -53,7 +53,7 @@ int main(int argc,char** argv)
"http://ktorrent.org/"); "http://ktorrent.org/");
TDECmdLineArgs::init(argc, argv,&about); TDECmdLineArgs::init(argc, argv,&about);
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KApplication app; TDEApplication app;
Globals::instance().initLog(kt::DataDir() + "ktupnptest.log"); Globals::instance().initLog(kt::DataDir() + "ktupnptest.log");
UPnPTestApp* mwnd = new UPnPTestApp(); UPnPTestApp* mwnd = new UPnPTestApp();

2
libktorrent/datachecker/multidatachecker.cpp
Unescape View File

@ -94,7 +94,7 @@ namespace bt
if (now - last_update_time > 1000) if (now - last_update_time > 1000)
{ {
Out() << "Checked " << cur_chunk << " chunks" << endl; Out() << "Checked " << cur_chunk << " chunks" << endl;
// KApplication::kApplication()->processEvents(); // TDEApplication::kApplication()->processEvents();
last_update_time = now; last_update_time = now;
} }
} }

6
plugins/ipfilter/convertdialog.cpp
Unescape View File

@ -122,7 +122,7 @@ namespace kt
if(canceled) if(canceled)
return; return;
KApplication::kApplication() ->processEvents(); TDEApplication::kApplication() ->processEvents();
TQString line = stream.readLine(); TQString line = stream.readLine();
i += line.length() * sizeof( char ); //rough estimation of string size i += line.length() * sizeof( char ); //rough estimation of string size
kProgress1->setProgress( i * 100 / source_size ); kProgress1->setProgress( i * 100 / source_size );
@ -184,7 +184,7 @@ namespace kt
if ( i % 10000 == 0 ) if ( i % 10000 == 0 )
Out(SYS_IPF|LOG_DEBUG) << "Block " << i << " written." << endl; Out(SYS_IPF|LOG_DEBUG) << "Block " << i << " written." << endl;
} }
KApplication::kApplication()->processEvents(); TDEApplication::kApplication()->processEvents();
if(canceled) if(canceled)
return; return;
@ -206,7 +206,7 @@ namespace kt
converting = false; converting = false;
} }
KApplication::kApplication()->processEvents(); TDEApplication::kApplication()->processEvents();
//reload level1 filter //reload level1 filter
if ( m_plugin ) if ( m_plugin )
m_plugin->loadAntiP2P(); m_plugin->loadAntiP2P();

2
plugins/rssfeed/rss/testlibrss.cpp
Unescape View File

@ -61,7 +61,7 @@ int main( int argc, char **argv )
KAboutData aboutData( "testlibrss", "testlibrss", "0.1" ); KAboutData aboutData( "testlibrss", "testlibrss", "0.1" );
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KApplication app; TDEApplication app;
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if ( args->count() != 1 ) args->usage(); if ( args->count() != 1 ) args->usage();

Write Preview
Loading…
Cancel
Save