diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:59:01 -0600 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-03 04:24:39 +0200 |
commit | ad4317e2e02c018dcfb6c49259cfdf580637f5bd (patch) | |
tree | 4ff3110491ed677d979aca9a5711507195a66715 /kontact/src | |
parent | e3649f744289c180537d2d8474dc0e39050e654f (diff) | |
download | tdepim-ad4317e2e02c018dcfb6c49259cfdf580637f5bd.tar.gz tdepim-ad4317e2e02c018dcfb6c49259cfdf580637f5bd.zip |
Remove additional unneeded tq method conversions
(cherry picked from commit 716a5de8870d7c02bb4d0aed72f30291b17b763a)
Diffstat (limited to 'kontact/src')
-rw-r--r-- | kontact/src/aboutdialog.cpp | 6 | ||||
-rw-r--r-- | kontact/src/kcmkontact.cpp | 2 | ||||
-rw-r--r-- | kontact/src/main.cpp | 2 | ||||
-rw-r--r-- | kontact/src/mainwindow.cpp | 70 | ||||
-rw-r--r-- | kontact/src/profiledialog.cpp | 8 |
5 files changed, 44 insertions, 44 deletions
diff --git a/kontact/src/aboutdialog.cpp b/kontact/src/aboutdialog.cpp index 1d52da2f1..8f6be2b04 100644 --- a/kontact/src/aboutdialog.cpp +++ b/kontact/src/aboutdialog.cpp @@ -81,7 +81,7 @@ void AboutDialog::addAboutData( const TQString &title, const TQString &icon, text += "<p><b>" + about->programName() + "</b><br>"; - text += i18n( "Version %1</p>" ).tqarg( about->version() ); + text += i18n( "Version %1</p>" ).arg( about->version() ); if ( !about->shortDescription().isEmpty() ) { text += "<p>" + about->shortDescription() + "<br>" + @@ -163,13 +163,13 @@ void AboutDialog::addLicenseText( const KAboutData *about ) TQPixmap pixmap = KGlobal::iconLoader()->loadIcon( "signature", KIcon::Desktop, 48 ); - TQString title = i18n( "%1 License" ).tqarg( about->programName() ); + TQString title = i18n( "%1 License" ).arg( about->programName() ); TQFrame *topFrame = addPage( title, TQString(), pixmap ); TQBoxLayout *topLayout = new TQVBoxLayout( topFrame ); KTextBrowser *textBrowser = new KTextBrowser( topFrame ); - textBrowser->setText( TQString( "<pre>%1</pre>" ).tqarg( about->license() ) ); + textBrowser->setText( TQString( "<pre>%1</pre>" ).arg( about->license() ) ); topLayout->addWidget( textBrowser ); } diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp index a5c46c317..e63c78cb4 100644 --- a/kontact/src/kcmkontact.cpp +++ b/kontact/src/kcmkontact.cpp @@ -115,7 +115,7 @@ void PluginSelection::readConfig() { const KTrader::OfferList offers = KTrader::self()->query( TQString::fromLatin1( "Kontact/Plugin" ), - TQString( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) ); + TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); int activeComponent = 0; mPluginCombo->clear(); diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp index 6b01b31da..ee098180e 100644 --- a/kontact/src/main.cpp +++ b/kontact/src/main.cpp @@ -77,7 +77,7 @@ static void listPlugins() KInstance instance( "kontact" ); // Can't use KontactApp since it's too late for adding cmdline options KTrader::OfferList offers = KTrader::self()->query( TQString::fromLatin1( "Kontact/Plugin" ), - TQString( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) ); + TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); for ( KService::List::Iterator it = offers.begin(); it != offers.end(); ++it ) { KService::Ptr service = (*it); // skip summary only plugins diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp index cf9618fd6..525a1f0bd 100644 --- a/kontact/src/mainwindow.cpp +++ b/kontact/src/mainwindow.cpp @@ -125,7 +125,7 @@ void MainWindow::initGUI() KTrader::OfferList offers = KTrader::self()->query( TQString::fromLatin1( "Kontact/Plugin" ), - TQString( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) ); + TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); mPluginInfos = KPluginInfo::fromServices( offers, Prefs::self()->config(), "Plugins" ); KPluginInfo::List::Iterator it; @@ -136,7 +136,7 @@ void MainWindow::initGUI() TQT_TQOBJECT(this), TQT_SLOT(slotActionTriggered()), actionCollection(), (*it)->pluginName().latin1() ); action->setName( (*it)->pluginName().latin1() ); - action->setWhatsThis( i18n( "Switch to plugin %1" ).tqarg( (*it)->name() ) ); + action->setWhatsThis( i18n( "Switch to plugin %1" ).arg( (*it)->name() ) ); TQVariant hasPartProp = (*it)->property( "X-KDE-KontactPluginHasPart" ); if ( !hasPartProp.isValid() || hasPartProp.toBool() ) { @@ -267,7 +267,7 @@ void MainWindow::initWidgets() initAboutScreen(); TQString loading = i18n( "<h2 style='text-align:center; margin-top: 0px; margin-bottom: 0px'>%1</h2>" ) - .tqarg( i18n("Loading Kontact...") ); + .arg( i18n("Loading Kontact...") ); paintAboutScreen( loading ); @@ -290,11 +290,11 @@ void MainWindow::paintAboutScreen( const TQString& msg ) { TQString location = locate( "data", "kontact/about/main.html" ); TQString content = KPIM::kFileToString( location ); - content = content.tqarg( locate( "data", "libkdepim/about/kde_infopage.css" ) ); + content = content.arg( locate( "data", "libkdepim/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) - content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libkdepim/about/kde_infopage_rtl.css" ) ); + content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libkdepim/about/kde_infopage_rtl.css" ) ); else - content = content.tqarg( "" ); + content = content.arg( "" ); mIntroPart->begin( KURL( location ) ); @@ -302,8 +302,8 @@ void MainWindow::paintAboutScreen( const TQString& msg ) TQString catchPhrase( i18n( "Get Organized!" ) ); TQString quickDescription( i18n( "The KDE Personal Information Management Suite" ) ); - mIntroPart->write( content.tqarg( TQFont().pointSize() + 2 ).tqarg( appName ) - .tqarg( catchPhrase ).tqarg( quickDescription ).tqarg( msg ) ); + mIntroPart->write( content.arg( TQFont().pointSize() + 2 ).arg( appName ) + .arg( catchPhrase ).arg( quickDescription ).arg( msg ) ); mIntroPart->end(); } @@ -629,7 +629,7 @@ void MainWindow::updateShortcuts() ++it; if ( isPluginLoadedByAction( action ) ) { loadedActions.append( action ); - TQString shortcut = TQString( "CTRL+%1" ).tqarg( i ); + TQString shortcut = TQString( "CTRL+%1" ).arg( i ); action->setShortcut( KShortcut( shortcut ) ); i++; } else { @@ -794,7 +794,7 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin ) if ( !part ) { KApplication::restoreOverrideCursor(); KMessageBox::error( this, i18n( "Cannot load part for %1." ) - .tqarg( plugin->title() ) + .arg( plugin->title() ) + "\n" + lastErrorMessage() ); plugin->setDisabled( true ); mSidePane->updatePlugins(); @@ -848,7 +848,7 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin ) topDock()->moveDockWindow( navigatorToolBar, -1 ); } - setCaption( i18n( "Plugin dependent window title" ,"%1 - Kontact" ).tqarg( plugin->title() ) ); + setCaption( i18n( "Plugin dependent window title" ,"%1 - Kontact" ).arg( plugin->title() ) ); if ( newAction ) { mNewActions->setIcon( newAction->icon() ); @@ -1178,30 +1178,30 @@ TQString MainWindow::introductionString() "<td><a href=\"%1\">%1</a><br><span id=\"subtext\"><nobr>%1</td></tr>" "</table>" "<p style=\"margin-bottom: 0px\"> <a href=\"%1\">Skip this introduction</a></p>" ) - .tqarg( kapp->aboutData()->version() ) - .tqarg( i18n( "Kontact handles your e-mail, addressbook, calendar, to-do list and more." ) ) - .tqarg( "exec:/help?kontact" ) - .tqarg( iconSize ) - .tqarg( iconSize ) - .tqarg( handbook_icon_path ) - .tqarg( "exec:/help?kontact" ) - .tqarg( i18n( "Read Manual" ) ) - .tqarg( i18n( "Learn more about Kontact and its components" ) ) - .tqarg( "http://kontact.org" ) - .tqarg( iconSize ) - .tqarg( iconSize ) - .tqarg( html_icon_path ) - .tqarg( "http://kontact.org" ) - .tqarg( i18n( "Visit Kontact Website" ) ) - .tqarg( i18n( "Access online resources and tutorials" ) ) - .tqarg( "exec:/gwwizard" ) - .tqarg( iconSize ) - .tqarg( iconSize ) - .tqarg( wizard_icon_path ) - .tqarg( "exec:/gwwizard" ) - .tqarg( i18n( "Configure Kontact as Groupware Client" ) ) - .tqarg( i18n( "Prepare Kontact for use in corporate networks" ) ) - .tqarg( "exec:/switch" ); + .arg( kapp->aboutData()->version() ) + .arg( i18n( "Kontact handles your e-mail, addressbook, calendar, to-do list and more." ) ) + .arg( "exec:/help?kontact" ) + .arg( iconSize ) + .arg( iconSize ) + .arg( handbook_icon_path ) + .arg( "exec:/help?kontact" ) + .arg( i18n( "Read Manual" ) ) + .arg( i18n( "Learn more about Kontact and its components" ) ) + .arg( "http://kontact.org" ) + .arg( iconSize ) + .arg( iconSize ) + .arg( html_icon_path ) + .arg( "http://kontact.org" ) + .arg( i18n( "Visit Kontact Website" ) ) + .arg( i18n( "Access online resources and tutorials" ) ) + .arg( "exec:/gwwizard" ) + .arg( iconSize ) + .arg( iconSize ) + .arg( wizard_icon_path ) + .arg( "exec:/gwwizard" ) + .arg( i18n( "Configure Kontact as Groupware Client" ) ) + .arg( i18n( "Prepare Kontact for use in corporate networks" ) ) + .arg( "exec:/switch" ); return info; } diff --git a/kontact/src/profiledialog.cpp b/kontact/src/profiledialog.cpp index c58377806..89e241be9 100644 --- a/kontact/src/profiledialog.cpp +++ b/kontact/src/profiledialog.cpp @@ -140,7 +140,7 @@ void Kontact::ProfileDialog::profileLoaded( const TQString& id ) const Kontact::Profile profile = Kontact::ProfileManager::self()->profileById( id ); if ( profile.isNull() ) return; - KMessageBox::information( this, i18n("The profile \"%1\" was successfully loaded. Some profile settings require a restart to get activated.").tqarg( profile.name() ), i18n("Profile Loaded") ); + KMessageBox::information( this, i18n("The profile \"%1\" was successfully loaded. Some profile settings require a restart to get activated.").arg( profile.name() ), i18n("Profile Loaded") ); } void Kontact::ProfileDialog::saveToSelectedProfile() @@ -148,7 +148,7 @@ void Kontact::ProfileDialog::saveToSelectedProfile() const Kontact::Profile profile = Kontact::ProfileManager::self()->profileById( selectedProfile() ); if ( profile.isNull() ) return; - if ( KMessageBox::Yes != KMessageBox::warningYesNo( this, i18n("The profile \"%1\" will be overwritten with the current settings. Are you sure?").tqarg( profile.name() ), i18n("Save to Profile"), KStdGuiItem::overwrite(), KStdGuiItem::cancel() ) ) + if ( KMessageBox::Yes != KMessageBox::warningYesNo( this, i18n("The profile \"%1\" will be overwritten with the current settings. Are you sure?").arg( profile.name() ), i18n("Save to Profile"), KStdGuiItem::overwrite(), KStdGuiItem::cancel() ) ) return; Kontact::ProfileManager::self()->saveToProfile( profile.id() ); } @@ -158,7 +158,7 @@ void Kontact::ProfileDialog::deleteSelectedProfile() const Kontact::Profile profile = Kontact::ProfileManager::self()->profileById( selectedProfile() ); if ( profile.isNull() ) return; - if ( KMessageBox::Yes != KMessageBox::warningYesNo( this, i18n("Do you really want to delete the profile \"%1\"? All profile settings will be lost!").tqarg( profile.name() ), i18n("Delete Profile"), KStdGuiItem::del(), KStdGuiItem::cancel() ) ) + if ( KMessageBox::Yes != KMessageBox::warningYesNo( this, i18n("Do you really want to delete the profile \"%1\"? All profile settings will be lost!").arg( profile.name() ), i18n("Delete Profile"), KStdGuiItem::del(), KStdGuiItem::cancel() ) ) return; Kontact::ProfileManager::self()->removeProfile( profile ); } @@ -175,7 +175,7 @@ void Kontact::ProfileDialog::exportSelectedProfile() const Kontact::ProfileManager::ExportError error = Kontact::ProfileManager::self()->exportProfileToDirectory( id, path ); if ( error == Kontact::ProfileManager::SuccessfulExport ) { - KMessageBox::information( this, i18n("The profile \"%1\" was successfully exported.").tqarg( profile.name() ), i18n("Profile Exported") ); + KMessageBox::information( this, i18n("The profile \"%1\" was successfully exported.").arg( profile.name() ), i18n("Profile Exported") ); } else { |