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

Rename KApplication to TDEApplication to avoid conflicts with KDE4

Browse Source
master
Timothy Pearson 12 years ago
parent d4ef3460f8
commit 5b1acf0283
8 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File

26
acinclude.m4
Unescape Escape View File

@ -2158,20 +2158,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 Escape View File

@ -1991,20 +1991,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");

14
adept/adept/acqprogress.cpp
Unescape Escape View File

@ -130,7 +130,7 @@ void AcqStatus::Done (pkgAcquire::ItemDesc &Itm)
} }
emit statusChanged( StWaiting ); emit statusChanged( StWaiting );
triggerUpdate(); triggerUpdate();
KApplication::kApplication()->processEvents(); TDEApplication::kApplication()->processEvents();
} }
void AcqStatus::clear() void AcqStatus::clear()
@ -148,7 +148,7 @@ void AcqStatus::Start()
_config -> Set ("APT::Fetcher::Select-Timeout-Usec", 100000); _config -> Set ("APT::Fetcher::Select-Timeout-Usec", 100000);
emit statusChanged( StWaiting ); emit statusChanged( StWaiting );
triggerUpdate(); triggerUpdate();
KApplication::kApplication()->processEvents(); TDEApplication::kApplication()->processEvents();
} }
void AcqStatus::IMSHit(pkgAcquire::ItemDesc &Itm) void AcqStatus::IMSHit(pkgAcquire::ItemDesc &Itm)
@ -161,7 +161,7 @@ void AcqStatus::IMSHit(pkgAcquire::ItemDesc &Itm)
kdDebug() << "imshit called on ID = " << ID - 1 << " i = " << (void *)i << endl; kdDebug() << "imshit called on ID = " << ID - 1 << " i = " << (void *)i << endl;
triggerUpdate(); triggerUpdate();
KApplication::kApplication()->processEvents(); TDEApplication::kApplication()->processEvents();
}; };
void AcqStatus::Fetch(pkgAcquire::ItemDesc &Itm) void AcqStatus::Fetch(pkgAcquire::ItemDesc &Itm)
@ -180,7 +180,7 @@ void AcqStatus::Fetch(pkgAcquire::ItemDesc &Itm)
kdDebug() << "fetch called on ID = " << ID - 1 << " i = " << (void *)i << endl; kdDebug() << "fetch called on ID = " << ID - 1 << " i = " << (void *)i << endl;
emit statusChanged( StDownloading ); emit statusChanged( StDownloading );
triggerUpdate(); triggerUpdate();
KApplication::kApplication()->processEvents(); TDEApplication::kApplication()->processEvents();
}; };
void AcqStatus::Fail(pkgAcquire::ItemDesc &Itm) void AcqStatus::Fail(pkgAcquire::ItemDesc &Itm)
@ -205,7 +205,7 @@ void AcqStatus::Fail(pkgAcquire::ItemDesc &Itm)
} }
triggerUpdate(); triggerUpdate();
KApplication::kApplication()->processEvents(); TDEApplication::kApplication()->processEvents();
}; };
void AcqStatus::Stop() void AcqStatus::Stop()
@ -213,7 +213,7 @@ void AcqStatus::Stop()
pkgAcquireStatus::Stop(); pkgAcquireStatus::Stop();
emit statusChanged( StDone ); emit statusChanged( StDone );
triggerUpdate (); triggerUpdate ();
KApplication::kApplication()->processEvents(); TDEApplication::kApplication()->processEvents();
} }
bool AcqStatus::Pulse(pkgAcquire *Owner) bool AcqStatus::Pulse(pkgAcquire *Owner)
@ -239,7 +239,7 @@ bool AcqStatus::Pulse(pkgAcquire *Owner)
CurrentItems)*100.0)/double(TotalBytes+TotalItems) ) ); CurrentItems)*100.0)/double(TotalBytes+TotalItems) ) );
else else
emit totalProgress (-1); emit totalProgress (-1);
KApplication::kApplication () -> processEvents (); TDEApplication::kApplication () -> processEvents ();
if ( m_continue ) if ( m_continue )
return true; return true;

2
adept/batch/main.cpp
Unescape Escape View File

@ -35,7 +35,7 @@ int main(int argc, char *argv[])
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();
KGlobal::locale()->insertCatalogue(TQString::fromUtf8("libept")); KGlobal::locale()->insertCatalogue(TQString::fromUtf8("libept"));

2
adept/installer/main.cpp
Unescape Escape View File

@ -36,7 +36,7 @@ int main(int argc, char *argv[])
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();

14
adept/libadept/acqprogress.cpp
Unescape Escape View File

@ -130,7 +130,7 @@ void AcqStatus::Done (pkgAcquire::ItemDesc &Itm)
} }
emit statusChanged( StWaiting ); emit statusChanged( StWaiting );
triggerUpdate(); triggerUpdate();
KApplication::kApplication()->processEvents(); TDEApplication::kApplication()->processEvents();
} }
void AcqStatus::clear() void AcqStatus::clear()
@ -148,7 +148,7 @@ void AcqStatus::Start()
_config -> Set ("APT::Fetcher::Select-Timeout-Usec", 100000); _config -> Set ("APT::Fetcher::Select-Timeout-Usec", 100000);
emit statusChanged( StWaiting ); emit statusChanged( StWaiting );
triggerUpdate(); triggerUpdate();
KApplication::kApplication()->processEvents(); TDEApplication::kApplication()->processEvents();
} }
void AcqStatus::IMSHit(pkgAcquire::ItemDesc &Itm) void AcqStatus::IMSHit(pkgAcquire::ItemDesc &Itm)
@ -161,7 +161,7 @@ void AcqStatus::IMSHit(pkgAcquire::ItemDesc &Itm)
kdDebug() << "imshit called on ID = " << ID - 1 << " i = " << (void *)i << endl; kdDebug() << "imshit called on ID = " << ID - 1 << " i = " << (void *)i << endl;
triggerUpdate(); triggerUpdate();
KApplication::kApplication()->processEvents(); TDEApplication::kApplication()->processEvents();
}; };
void AcqStatus::Fetch(pkgAcquire::ItemDesc &Itm) void AcqStatus::Fetch(pkgAcquire::ItemDesc &Itm)
@ -180,7 +180,7 @@ void AcqStatus::Fetch(pkgAcquire::ItemDesc &Itm)
kdDebug() << "fetch called on ID = " << ID - 1 << " i = " << (void *)i << endl; kdDebug() << "fetch called on ID = " << ID - 1 << " i = " << (void *)i << endl;
emit statusChanged( StDownloading ); emit statusChanged( StDownloading );
triggerUpdate(); triggerUpdate();
KApplication::kApplication()->processEvents(); TDEApplication::kApplication()->processEvents();
}; };
void AcqStatus::Fail(pkgAcquire::ItemDesc &Itm) void AcqStatus::Fail(pkgAcquire::ItemDesc &Itm)
@ -205,7 +205,7 @@ void AcqStatus::Fail(pkgAcquire::ItemDesc &Itm)
} }
triggerUpdate(); triggerUpdate();
KApplication::kApplication()->processEvents(); TDEApplication::kApplication()->processEvents();
}; };
void AcqStatus::Stop() void AcqStatus::Stop()
@ -213,7 +213,7 @@ void AcqStatus::Stop()
pkgAcquireStatus::Stop(); pkgAcquireStatus::Stop();
emit statusChanged( StDone ); emit statusChanged( StDone );
triggerUpdate (); triggerUpdate ();
KApplication::kApplication()->processEvents(); TDEApplication::kApplication()->processEvents();
} }
bool AcqStatus::Pulse(pkgAcquire *Owner) bool AcqStatus::Pulse(pkgAcquire *Owner)
@ -239,7 +239,7 @@ bool AcqStatus::Pulse(pkgAcquire *Owner)
CurrentItems)*100.0)/double(TotalBytes+TotalItems) ) ); CurrentItems)*100.0)/double(TotalBytes+TotalItems) ) );
else else
emit totalProgress (-1); emit totalProgress (-1);
KApplication::kApplication () -> processEvents (); TDEApplication::kApplication () -> processEvents ();
if ( m_continue ) if ( m_continue )
return true; return true;

2
adept/manager/main.cpp
Unescape Escape View File

@ -36,7 +36,7 @@ int main(int argc, char *argv[])
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 && args->isSet("xy")) ... // if (args && args->isSet("xy")) ...

2
adept/updater/main.cpp
Unescape Escape View File

@ -36,7 +36,7 @@ int main(int argc, char *argv[])
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 && args->isSet("xy")) ... // if (args && args->isSet("xy")) ...

Write Preview
Loading…
Cancel
Save