diff options
author | Timothy Pearson <[email protected]> | 2011-12-15 15:32:11 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2011-12-15 15:32:11 -0600 |
commit | 94844816550ad672ccfcdc25659c625546239998 (patch) | |
tree | e35fc60fd736c645d59f6408af032774ad8023d3 /lib/kofficecore/KoMainWindow.cpp | |
parent | 2a811c38c74c03648ecf857e566c44483cbad706 (diff) | |
download | koffice-94844816550ad672ccfcdc25659c625546239998.tar.gz koffice-94844816550ad672ccfcdc25659c625546239998.zip |
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'lib/kofficecore/KoMainWindow.cpp')
-rw-r--r-- | lib/kofficecore/KoMainWindow.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp index 1219bf09..248d3ed3 100644 --- a/lib/kofficecore/KoMainWindow.cpp +++ b/lib/kofficecore/KoMainWindow.cpp @@ -499,19 +499,19 @@ void KoMainWindow::updateCaption() // Get caption from document info (title(), in about page) if ( rootDocument()->documentInfo() ) { - KoDocumentInfoPage * page = rootDocument()->documentInfo()->page( TQString::tqfromLatin1("about") ); + KoDocumentInfoPage * page = rootDocument()->documentInfo()->page( TQString::fromLatin1("about") ); if (page) caption = static_cast<KoDocumentInfoAbout *>(page)->title(); } const TQString url = rootDocument()->url().prettyURL( 0, KURL::StripFileProtocol ); if ( !caption.isEmpty() && !url.isEmpty() ) - caption = TQString( "%1 - %2" ).tqarg( caption ).tqarg( url ); + caption = TQString( "%1 - %2" ).arg( caption ).arg( url ); else if ( caption.isEmpty() ) caption = url; setCaption( caption, rootDocument()->isModified() ); if ( !rootDocument()->url().fileName(false).isEmpty() ) - d->m_paSave->setToolTip( i18n("Save as %1").tqarg(rootDocument()->url().fileName(false)) ); + d->m_paSave->setToolTip( i18n("Save as %1").arg(rootDocument()->url().fileName(false)) ); else d->m_paSave->setToolTip( i18n("Save") ); } @@ -544,7 +544,7 @@ bool KoMainWindow::openDocument( const KURL & url ) { if ( !KIO::NetAccess::exists(url,true,0) ) { - KMessageBox::error(0L, i18n("The file %1 does not exist.").tqarg(url.url()) ); + KMessageBox::error(0L, i18n("The file %1 does not exist.").arg(url.url()) ); m_recent->removeURL(url); //remove the file from the recent-opened-file-list saveRecentFiles(); return false; @@ -677,7 +677,7 @@ bool KoMainWindow::exportConfirmation( const TQCString &outputFormat ) const bool neverHeardOfIt = ( mime->name() == KMimeType::defaultMimeType() ); TQString comment = neverHeardOfIt ? - i18n( "%1 (unknown file type)" ).tqarg( outputFormat.data() ) + i18n( "%1 (unknown file type)" ).arg( outputFormat.data() ) : mime->comment(); // Warn the user @@ -689,7 +689,7 @@ bool KoMainWindow::exportConfirmation( const TQCString &outputFormat ) this, i18n( "<qt>Saving as a %1 may result in some loss of formatting." "<p>Do you still want to save in this format?</qt>" ) - .tqarg( TQString( "<b>%1</b>" ).tqarg( comment ) ), // in case we want to remove the bold later + .arg( TQString( "<b>%1</b>" ).arg( comment ) ), // in case we want to remove the bold later i18n( "Confirm Save" ), KStdGuiItem::save (), "NonNativeSaveConfirmation", @@ -703,7 +703,7 @@ bool KoMainWindow::exportConfirmation( const TQCString &outputFormat ) this, i18n( "<qt>Exporting as a %1 may result in some loss of formatting." "<p>Do you still want to export to this format?</qt>" ) - .tqarg( TQString( "<b>%1</b>" ).tqarg( comment ) ), // in case we want to remove the bold later + .arg( TQString( "<b>%1</b>" ).arg( comment ) ), // in case we want to remove the bold later i18n( "Confirm Export" ), i18n ("Export"), "NonNativeExportConfirmation", // different to the one used for Save (above) @@ -1039,7 +1039,7 @@ bool KoMainWindow::queryClose() name = i18n( "Untitled" ); int res = KMessageBox::warningYesNoCancel( this, - i18n( "<p>The document <b>'%1'</b> has been modified.</p><p>Do you want to save it?</p>" ).tqarg(name), + i18n( "<p>The document <b>'%1'</b> has been modified.</p><p>Do you want to save it?</p>" ).arg(name), TQString(), KStdGuiItem::save(), KStdGuiItem::discard()); @@ -1212,7 +1212,7 @@ void KoMainWindow::print(bool quick) { if ( title.isEmpty() ) { // #139905 - breaks message freeze though //const TQString programName = instance()->aboutData() ? instance()->aboutData()->programName() : instance()->instanceName(); - //title = i18n("%1 unsaved document (%2)").tqarg(programName).tqarg(KGlobal::locale()->formatDate(TQDate::tqcurrentDate(), true/*short*/)); + //title = i18n("%1 unsaved document (%2)").arg(programName).arg(KGlobal::locale()->formatDate(TQDate::currentDate(), true/*short*/)); } printer.setDocName( title ); printer.setDocFileName( fileName ); @@ -1529,9 +1529,9 @@ void KoMainWindow::slotActivePartChanged( KParts::Part *newPart ) if ( it.current()->inherits("KToolBar") ) { KToolBar * tb = static_cast<KToolBar *>(it.current()); - KToggleAction * act = new KToggleAction( i18n("Show %1 Toolbar").tqarg( tb->text() ), 0, + KToggleAction * act = new KToggleAction( i18n("Show %1 Toolbar").arg( tb->text() ), 0, actionCollection(), tb->name() ); - act->setCheckedState(i18n("Hide %1 Toolbar").tqarg( tb->text() )); + act->setCheckedState(i18n("Hide %1 Toolbar").arg( tb->text() )); connect( act, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(this), TQT_SLOT( slotToolbarToggled( bool ) ) ); act->setChecked ( !tb->isHidden() ); d->m_toolbarList.append( act ); @@ -1618,7 +1618,7 @@ void KoMainWindow::slotEmailFile() else { fileURL = rootDocument()->url().url(); - theSubject = i18n("Document - %1").tqarg(rootDocument()->url().fileName(false)); + theSubject = i18n("Document - %1").arg(rootDocument()->url().fileName(false)); urls.append( fileURL ); } |