diff options
| author | Timothy Pearson <[email protected]> | 2013-01-20 00:23:08 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-20 00:23:08 -0600 |
| commit | d6d75dc9ff326e0bd6fc673adae71d53277fb8e4 (patch) | |
| tree | 56a87e6a48bdf5e310958f1943a834e59eddbba1 /kontact/src | |
| parent | 32b66c9ae78f439199a6d281cc33218e57c5106d (diff) | |
| download | tdepim-d6d75dc9ff326e0bd6fc673adae71d53277fb8e4.tar.gz tdepim-d6d75dc9ff326e0bd6fc673adae71d53277fb8e4.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kontact/src')
| -rw-r--r-- | kontact/src/mainwindow.cpp | 10 | ||||
| -rw-r--r-- | kontact/src/profilemanager.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp index 41e026a69..307f1c4b8 100644 --- a/kontact/src/mainwindow.cpp +++ b/kontact/src/mainwindow.cpp @@ -787,12 +787,12 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin ) return; } - KApplication::setOverrideCursor( TQCursor( TQt::WaitCursor ) ); + TDEApplication::setOverrideCursor( TQCursor( TQt::WaitCursor ) ); KParts::Part *part = plugin->part(); if ( !part ) { - KApplication::restoreOverrideCursor(); + TDEApplication::restoreOverrideCursor(); KMessageBox::error( this, i18n( "Cannot load part for %1." ) .arg( plugin->title() ) + "\n" + lastErrorMessage() ); @@ -894,7 +894,7 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin ) } } - KApplication::restoreOverrideCursor(); + TDEApplication::restoreOverrideCursor(); } void MainWindow::selectPlugin( const TQString &pluginName ) @@ -1027,14 +1027,14 @@ void MainWindow::updateConfig() void MainWindow::showAboutDialog() { - KApplication::setOverrideCursor( TQCursor( TQt::WaitCursor ) ); + TDEApplication::setOverrideCursor( TQCursor( TQt::WaitCursor ) ); if ( !mAboutDialog ) mAboutDialog = new AboutDialog( this ); mAboutDialog->show(); mAboutDialog->raise(); - KApplication::restoreOverrideCursor(); + TDEApplication::restoreOverrideCursor(); } void MainWindow::configureShortcuts() diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp index 67f1bd198..d929bcb3a 100644 --- a/kontact/src/profilemanager.cpp +++ b/kontact/src/profilemanager.cpp @@ -331,7 +331,7 @@ TQString Kontact::ProfileManager::generateNewId() const { while ( true ) { - const TQString newId = KApplication::randomString( 10 ); + const TQString newId = TDEApplication::randomString( 10 ); if ( !m_profiles.contains( newId ) ) return newId; } |