diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:25:07 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:25:07 -0600 |
| commit | f7307c95135a3c1589799c6877d314a02a2260c1 (patch) | |
| tree | 2defa5a196f5d9558af96b30258cbcb7969b1a93 /klinkstatus | |
| parent | ca1ec6eeaaf5744fae891a5b0696591bbaece795 (diff) | |
| download | tdewebdev-f7307c95135a3c1589799c6877d314a02a2260c1.tar.gz tdewebdev-f7307c95135a3c1589799c6877d314a02a2260c1.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'klinkstatus')
| -rw-r--r-- | klinkstatus/src/klinkstatus.cpp | 2 | ||||
| -rw-r--r-- | klinkstatus/src/main.cpp | 2 | ||||
| -rw-r--r-- | klinkstatus/src/ui/sessionwidget.cpp | 8 | ||||
| -rw-r--r-- | klinkstatus/src/utils/xsl.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/klinkstatus/src/klinkstatus.cpp b/klinkstatus/src/klinkstatus.cpp index 8c5da395..ec6c9c37 100644 --- a/klinkstatus/src/klinkstatus.cpp +++ b/klinkstatus/src/klinkstatus.cpp @@ -112,7 +112,7 @@ void KLinkStatus::setupActions() register it with staticKLSConfigDeleter due to the lack of static deleter administration. The easiest solution is to call close() on the mainwindow instead of - KApplication::quit()*/ + TDEApplication::quit()*/ KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); //m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); diff --git a/klinkstatus/src/main.cpp b/klinkstatus/src/main.cpp index e4535188..b46d02ea 100644 --- a/klinkstatus/src/main.cpp +++ b/klinkstatus/src/main.cpp @@ -64,7 +64,7 @@ int main(int argc, char *argv[]) TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; // see if we are starting with session management if (app.isRestored()) diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp index 2303e8bb..43a80aa6 100644 --- a/klinkstatus/src/ui/sessionwidget.cpp +++ b/klinkstatus/src/ui/sessionwidget.cpp @@ -218,7 +218,7 @@ void SessionWidget::slotCheck() if(!validFields()) { ready_ = true; - KApplication::beep(); + TDEApplication::beep(); return; } @@ -430,7 +430,7 @@ void SessionWidget::slotSearchFinished() Q_ASSERT(!paused_); Q_ASSERT(!stopped_); - KApplication::beep (); + TDEApplication::beep (); textlabel_progressbar->setText(i18n( "Ready" )); progressbar_checker->reset(); @@ -458,7 +458,7 @@ void SessionWidget::slotSearchPaused() Q_ASSERT(pendingActions()); Q_ASSERT(in_progress_); - KApplication::beep(); + TDEApplication::beep(); textlabel_progressbar->setText(i18n("Stopped")); @@ -591,7 +591,7 @@ void SessionWidget::slotStartSearch() { start_search_action_->setChecked(true); // do not toggle Q_ASSERT(!stopped_); - KApplication::beep(); + TDEApplication::beep(); return; } diff --git a/klinkstatus/src/utils/xsl.cpp b/klinkstatus/src/utils/xsl.cpp index fd3884a5..2ca1a253 100644 --- a/klinkstatus/src/utils/xsl.cpp +++ b/klinkstatus/src/utils/xsl.cpp @@ -141,7 +141,7 @@ TQString KopeteXSLThread::xsltTransform( const TQString &xmlString, xsltStyleshe { if ( styleSheet ) { - static TQCString appPath( TQString::fromLatin1("\"%1\"").arg( KApplication::kApplication()->dirs()->findDirs("appdata", TQString::fromLatin1("styles/data") ).front() ).utf8() ); + static TQCString appPath( TQString::fromLatin1("\"%1\"").arg( TDEApplication::kApplication()->dirs()->findDirs("appdata", TQString::fromLatin1("styles/data") ).front() ).utf8() ); static const char* params[3] = { "appdata", |