diff options
Diffstat (limited to 'superkaramba')
-rw-r--r-- | superkaramba/src/karamba.cpp | 12 | ||||
-rw-r--r-- | superkaramba/src/karambasessionmanaged.cpp | 2 | ||||
-rw-r--r-- | superkaramba/src/sknewstuff.cpp | 2 | ||||
-rw-r--r-- | superkaramba/src/themefile.cpp | 6 | ||||
-rw-r--r-- | superkaramba/src/themesdlg.cpp | 16 |
5 files changed, 19 insertions, 19 deletions
diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp index d828411..eab94db 100644 --- a/superkaramba/src/karamba.cpp +++ b/superkaramba/src/karamba.cpp @@ -144,7 +144,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, connect( kWinModule,TQ_SIGNAL(currentDesktopChanged(int)), this, TQ_SLOT(currentDesktopChanged(int)) ); - connect( kapp, TQ_SIGNAL(backgroundChanged(int)), this, + connect( tdeApp, TQ_SIGNAL(backgroundChanged(int)), this, TQ_SLOT(currentWallpaperChanged(int))); // Setup of the Task Manager Callbacks @@ -249,7 +249,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, menuList = new TQObjectList(); menuList->setAutoDelete( true ); - client = kapp->dcopClient(); + client = tdeApp->dcopClient(); if (!client->isAttached()) client->attach(); appId = client->registerAs(tqApp->name()); @@ -1268,9 +1268,9 @@ void karamba::setIncomingData(TQString theme, TQString obj) //dataStream << theme; //dataStream << txt; - //kapp->dcopClient()->send( app->dcopClient()->appId(), "KarambaIface", "themeNotify(TQString,TQString)", data ); + //tdeApp->dcopClient()->send( app->dcopClient()->appId(), "KarambaIface", "themeNotify(TQString,TQString)", data ); - DCOPClient *c = kapp->dcopClient(); + DCOPClient *c = tdeApp->dcopClient(); if (!c->isAttached()) c->attach(); @@ -1288,9 +1288,9 @@ void karamba::callTheme(TQString theme, TQString txt) //dataStream << theme; //dataStream << txt; - //kapp->dcopClient()->send( app->dcopClient()->appId(), "KarambaIface", "themeNotify(TQString,TQString)", data ); + //tdeApp->dcopClient()->send( app->dcopClient()->appId(), "KarambaIface", "themeNotify(TQString,TQString)", data ); - DCOPClient *c = kapp->dcopClient(); + DCOPClient *c = tdeApp->dcopClient(); if (!c->isAttached()) c->attach(); diff --git a/superkaramba/src/karambasessionmanaged.cpp b/superkaramba/src/karambasessionmanaged.cpp index 6d3c46c..fed4bb9 100644 --- a/superkaramba/src/karambasessionmanaged.cpp +++ b/superkaramba/src/karambasessionmanaged.cpp @@ -28,7 +28,7 @@ bool KarambaSessionManaged::saveState(TQSessionManager&) { - TDEConfig* config = kapp->sessionConfig(); + TDEConfig* config = tdeApp->sessionConfig(); config->setGroup("General Options"); diff --git a/superkaramba/src/sknewstuff.cpp b/superkaramba/src/sknewstuff.cpp index 327b4cb..e4563da 100644 --- a/superkaramba/src/sknewstuff.cpp +++ b/superkaramba/src/sknewstuff.cpp @@ -53,7 +53,7 @@ bool SKNewStuff::install( const TQString &fileName ) TDEStandardDirs myStdDir; TQFileInfo fi(fileName); TQString base = fi.baseName(); - TQString baseDestDir =myStdDir.saveLocation("data", kapp->instanceName() + "/themes/", true); + TQString baseDestDir =myStdDir.saveLocation("data", tdeApp->instanceName() + "/themes/", true); const TQString destDir = baseDestDir + base + "/"; TDEStandardDirs::makeDir( destDir ); diff --git a/superkaramba/src/themefile.cpp b/superkaramba/src/themefile.cpp index 84e1590..98f3134 100644 --- a/superkaramba/src/themefile.cpp +++ b/superkaramba/src/themefile.cpp @@ -209,7 +209,7 @@ bool ThemeFile::set(const KURL &url) { if(!url.isLocalFile() && !url.protocol().isEmpty()) { - if(KMessageBox::warningContinueCancel(kapp->activeWindow(), + if(KMessageBox::warningContinueCancel(tdeApp->activeWindow(), i18n("You are about to install and run %1 SuperKaramba theme. Since " "themes can contain executable code you should only install themes " "from sources that you trust. Continue?"), i18n("Executable Code Warning"), i18n("Install") @@ -224,7 +224,7 @@ bool ThemeFile::set(const KURL &url) if(localFile.exists()) { - if(KMessageBox::warningContinueCancel(kapp->activeWindow(), + if(KMessageBox::warningContinueCancel(tdeApp->activeWindow(), i18n("%1 already exists. Do you want to overwrite it?") .arg(localFile.filePath()),i18n("File Exists"),i18n("Overwrite")) == KMessageBox::Cancel) @@ -233,7 +233,7 @@ bool ThemeFile::set(const KURL &url) } } if(!TDEIO::NetAccess::file_copy(url, localFile.filePath(), -1, true, - false, kapp->mainWidget())) + false, tdeApp->mainWidget())) { return false; } diff --git a/superkaramba/src/themesdlg.cpp b/superkaramba/src/themesdlg.cpp index 4d79048..4ed7afb 100644 --- a/superkaramba/src/themesdlg.cpp +++ b/superkaramba/src/themesdlg.cpp @@ -76,7 +76,7 @@ void ThemesDlg::saveUserAddedThemes() { TDEStandardDirs ksd; TQStringList t = themes(); - TQStringList dirs = ksd.findDirs("data", TQString(kapp->name()) + "/themes"); + TQStringList dirs = ksd.findDirs("data", TQString(tdeApp->name()) + "/themes"); TQStringList::Iterator it = t.begin(); bool remove; @@ -152,7 +152,7 @@ void ThemesDlg::populateListbox() this, TQ_SLOT(openLocalTheme())); tableThemes->insertItem(item); - dirs = ksd.findDirs("data", TQString(kapp->name()) + "/themes"); + dirs = ksd.findDirs("data", TQString(tdeApp->name()) + "/themes"); // Get custom dirs from config here? TQStringList::Iterator itend( dirs.end() ); for(TQStringList::Iterator it = dirs.begin(); it != itend; ++it ) @@ -485,12 +485,12 @@ void ThemesDlg::uninstall() { kdDebug() << "removing " << tempPath << " under TDENewStuffNames from superkarambarc" << endl; - kapp->config()->deleteEntry(tempPath); + tdeApp->config()->deleteEntry(tempPath); config->setGroup("TDENewStuffStatus"); kdDebug() << "removing " << name << " under TDENewStuffStatus from superkarambarc" << endl; - kapp->config()->deleteEntry(name); - kapp->config()->sync(); + tdeApp->config()->deleteEntry(name); + tdeApp->config()->sync(); } #endif @@ -514,11 +514,11 @@ void ThemesDlg::uninstall() if(!name.isEmpty()) { kdDebug() << "removing " << theme.path() << " from superkarambarc" << endl; - kapp->config()->deleteEntry(theme.path()); + tdeApp->config()->deleteEntry(theme.path()); config->setGroup("TDENewStuffStatus"); kdDebug() << "removing " << name << " from superkarambarc" << endl; - kapp->config()->deleteEntry(name); - kapp->config()->sync(); + tdeApp->config()->deleteEntry(name); + tdeApp->config()->sync(); } #endif } |