Rename KApplication to TDEApplication to avoid conflicts with KDE4

r14.0.x
Timothy Pearson 12 years ago
parent 31844f5e73
commit 562dad317f

@ -4095,7 +4095,7 @@
* Fixed a memory leak and crash when starting with either '--help'
or '--dump-actions'. There is still a leak with '--help' but that
remains due to the fact, that exit() is called within the constructor
and there is no way to obtain a pointer to the KApplication object
and there is no way to obtain a pointer to the TDEApplication object
* Fixed crash when selecting a different transaction and having the
option 'keep changes when selecting different transaction' selected

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

@ -4263,7 +4263,7 @@ void KMyMoney2App::slotKDELanguageSettings(void)
TQString error;
int pid;
KApplication::tdeinitExec("kcmshell", args, &error, &pid);
TDEApplication::tdeinitExec("kcmshell", args, &error, &pid);
}
void KMyMoney2App::slotNewFeature(void)

@ -118,11 +118,11 @@ int main(int testargc, char** testargv)
KCmdLineLastOption // End of options.
};
// we seem to need a KApplication object to use KGlobal::locale()
// we seem to need a TDEApplication object to use KGlobal::locale()
TDECmdLineArgs::init(testargc, testargv, testargv[0], "UNIT TESTS", "", "0.1");
TDECmdLineArgs::addCmdLineOptions( options );
KApplication::disableAutoDcopRegistration();
KApplication app(false, false);
TDEApplication::disableAutoDcopRegistration();
TDEApplication app(false, false);
#ifdef _CHECK_MEMORY
_CheckMemory_Init(0);

@ -130,7 +130,7 @@ int main(int argc, char *argv[])
KMyMoneyUtils::checkConstants();
KApplication* a = new KApplication();
TDEApplication* a = new TDEApplication();
if(KGlobal::locale()->monetaryDecimalSymbol().isEmpty()) {
KMessageBox::error(0, i18n("The monetary decimal symbol is not correctly set in the TDE Control Center's Country/Region & Language settings. Please set it to a reasonable value and start KMyMoney again."), i18n("Invalid settings"));

@ -1116,11 +1116,11 @@ void KHomeView::slotOpenURL(const KURL &url, const KParts::URLArgs& /* args */)
if ( protocol == "http" )
{
KApplication::kApplication()->invokeBrowser(url.prettyURL());
TDEApplication::kApplication()->invokeBrowser(url.prettyURL());
}
else if ( protocol == "mailto" )
{
KApplication::kApplication()->invokeMailer(url);
TDEApplication::kApplication()->invokeMailer(url);
}
else
{

Loading…
Cancel
Save