diff options
Diffstat (limited to 'korganizer/actionmanager.cpp')
-rw-r--r-- | korganizer/actionmanager.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp index 7a27df738..10a791a95 100644 --- a/korganizer/actionmanager.cpp +++ b/korganizer/actionmanager.cpp @@ -723,7 +723,7 @@ void ActionManager::file_open( const KURL &url ) // is that URL already opened somewhere else? Activate that window KOrg::MainWindow *korg=ActionManager::findInstance( url ); if ( ( 0 != korg )&&( korg != mMainWindow ) ) { - KWin::activateWindow( korg->tqtopLevelWidget()->winId() ); + KWin::activateWindow( korg->topLevelWidget()->winId() ); return; } @@ -745,7 +745,7 @@ void ActionManager::file_icalimport() TQString progPath; KTempFile tmpfn; - TQString homeDir = TQDir::homeDirPath() + TQString::tqfromLatin1( "/.calendar" ); + TQString homeDir = TQDir::homeDirPath() + TQString::fromLatin1( "/.calendar" ); if ( !TQFile::exists( homeDir ) ) { KMessageBox::error( dialogParent(), @@ -872,7 +872,7 @@ bool ActionManager::openURL( const KURL &url,bool merge ) mFile = url.path(); if ( !KStandardDirs::exists( mFile ) ) { mMainWindow->showStatusMessage( i18n("New calendar '%1'.") - .tqarg( url.prettyURL() ) ); + .arg( url.prettyURL() ) ); mCalendarView->setModified(); } else { bool success = mCalendarView->openCalendar( mFile, merge ); @@ -906,7 +906,7 @@ bool ActionManager::openURL( const KURL &url,bool merge ) return success; } else { TQString msg; - msg = i18n("Cannot download calendar from '%1'.").tqarg( url.prettyURL() ); + msg = i18n("Cannot download calendar from '%1'.").arg( url.prettyURL() ); KMessageBox::error( dialogParent(), msg ); return false; } @@ -945,7 +945,7 @@ bool ActionManager::addResource( const KURL &mUrl ) resource->setResourceName( name ); manager->add( resource ); mMainWindow->showStatusMessage( i18n( "Added calendar resource for URL '%1'." ) - .tqarg( name ) ); + .arg( name ) ); // we have to call resourceAdded manually, because for in-process changes // the dcop signals are not connected, so the resource's signals would not // be connected otherwise @@ -953,7 +953,7 @@ bool ActionManager::addResource( const KURL &mUrl ) mCalendarResources->resourceAdded( resource ); } else { TQString msg = i18n("Unable to create calendar resource '%1'.") - .tqarg( name ); + .arg( name ); KMessageBox::error( dialogParent(), msg ); } return true; @@ -964,10 +964,10 @@ void ActionManager::showStatusMessageOpen( const KURL &url, bool merge ) { if ( merge ) { mMainWindow->showStatusMessage( i18n("Merged calendar '%1'.") - .tqarg( url.prettyURL() ) ); + .arg( url.prettyURL() ) ); } else { mMainWindow->showStatusMessage( i18n("Opened calendar '%1'.") - .tqarg( url.prettyURL() ) ); + .arg( url.prettyURL() ) ); } } @@ -1018,7 +1018,7 @@ bool ActionManager::saveURL() if ( !mURL.isLocalFile() ) { if ( !KIO::NetAccess::upload( mFile, mURL, view() ) ) { TQString msg = i18n("Cannot upload calendar to '%1'") - .tqarg( mURL.prettyURL() ); + .arg( mURL.prettyURL() ); KMessageBox::error( dialogParent() ,msg ); return false; } @@ -1030,7 +1030,7 @@ bool ActionManager::saveURL() mAutoSaveTimer->start( 1000*60*KOPrefs::instance()->mAutoSaveInterval ); } - mMainWindow->showStatusMessage( i18n("Saved calendar '%1'.").tqarg( mURL.prettyURL() ) ); + mMainWindow->showStatusMessage( i18n("Saved calendar '%1'.").arg( mURL.prettyURL() ) ); return true; } @@ -1043,9 +1043,9 @@ void ActionManager::exportHTML() settings.readConfig(); TQDate qd1; - qd1 = TQDate::tqcurrentDate(); + qd1 = TQDate::currentDate(); TQDate qd2; - qd2 = TQDate::tqcurrentDate(); + qd2 = TQDate::currentDate(); if ( settings.monthView() ) qd2.addMonths( 1 ); else @@ -1061,7 +1061,7 @@ void ActionManager::exportHTML( HTMLExportSettings *settings ) return; kdDebug()<<" settings->outputFile() :"<<settings->outputFile()<<endl; if ( TQFileInfo( settings->outputFile() ).exists() ) { - if(KMessageBox::questionYesNo( dialogParent(), i18n("Do you want to overwrite file \"%1\"").tqarg( settings->outputFile()) ) == KMessageBox::No) + if(KMessageBox::questionYesNo( dialogParent(), i18n("Do you want to overwrite file \"%1\"").arg( settings->outputFile()) ) == KMessageBox::No) return; } settings->setEMail( KOPrefs::instance()->email() ); @@ -1136,7 +1136,7 @@ bool ActionManager::saveAsURL( const KURL &url ) setTitle(); if ( mRecent ) mRecent->addURL( mURL ); } else { - KMessageBox::sorry( dialogParent(), i18n("Unable to save calendar to the file %1.").tqarg( mFile ), i18n("Error") ); + KMessageBox::sorry( dialogParent(), i18n("Unable to save calendar to the file %1.").arg( mFile ), i18n("Error") ); kdDebug(5850) << "ActionManager::saveAsURL() failed" << endl; mURL = URLOrig; mFile = fileOrig; @@ -1702,7 +1702,7 @@ void ActionManager::openEventEditor( const TQString & summary, attData = file; } else { if ( KMessageBox::warningContinueCancel( 0, - i18n("Removing attachments from an email might tqinvalidate its signature."), + i18n("Removing attachments from an email might invalidate its signature."), i18n("Remove Attachments"), KStdGuiItem::cont(), "BodyOnlyInlineAttachment" ) != KMessageBox::Continue ) return; @@ -1892,7 +1892,7 @@ void ActionManager::updateUndoAction( const TQString &text ) } else { mUndoAction->setEnabled( true ); if ( text.isEmpty() ) mUndoAction->setText( i18n("Undo") ); - else mUndoAction->setText( i18n("Undo (%1)").tqarg( text ) ); + else mUndoAction->setText( i18n("Undo (%1)").arg( text ) ); } } @@ -1904,7 +1904,7 @@ void ActionManager::updateRedoAction( const TQString &text ) } else { mRedoAction->setEnabled( true ); if ( text.isEmpty() ) mRedoAction->setText( i18n("Redo") ); - else mRedoAction->setText( i18n( "Redo (%1)" ).tqarg( text ) ); + else mRedoAction->setText( i18n( "Redo (%1)" ).arg( text ) ); } } @@ -1983,7 +1983,7 @@ bool ActionManager::saveResourceCalendar() int result = KMessageBox::warningContinueCancel( view(), i18n( "Saving of '%1' failed. Check that the resource is " "properly configured.\nIgnore problem and continue without " - "saving or cancel save?" ).tqarg( (*it)->resourceName() ), + "saving or cancel save?" ).arg( (*it)->resourceName() ), i18n("Save Error"), KStdGuiItem::dontSave() ); if ( result == KMessageBox::Cancel ) return false; } @@ -2006,12 +2006,12 @@ void ActionManager::importCalendar( const KURL &url ) { if ( !url.isValid() ) { KMessageBox::error( dialogParent(), - i18n("URL '%1' is invalid.").tqarg( url.prettyURL() ) ); + i18n("URL '%1' is invalid.").arg( url.prettyURL() ) ); return; } PreviewDialog *dialog; - dialog = new PreviewDialog( url, mMainWindow->tqtopLevelWidget() ); + dialog = new PreviewDialog( url, mMainWindow->topLevelWidget() ); connect( dialog, TQT_SIGNAL( dialogFinished( PreviewDialog * ) ), TQT_SLOT( slotPreviewDialogFinished( PreviewDialog * ) ) ); connect( dialog, TQT_SIGNAL( openURL( const KURL &, bool ) ), @@ -2104,10 +2104,10 @@ bool ActionManager::handleCommandLine() ret = false; } else if ( args->count() <= 0 ) { // No filenames given => all other args are meaningless, show main Window - mainWindow->tqtopLevelWidget()->show(); + mainWindow->topLevelWidget()->show(); } else if ( !args->isSet( "open" ) ) { // Import, merge, or ask => we need the resource calendar window anyway. - mainWindow->tqtopLevelWidget()->show(); + mainWindow->topLevelWidget()->show(); // Check for import, merge or ask if ( args->isSet( "import" ) ) { @@ -2130,7 +2130,7 @@ bool ActionManager::handleCommandLine() TQWidget *ActionManager::dialogParent() { - return mCalendarView->tqtopLevelWidget(); + return mCalendarView->topLevelWidget(); } #include "actionmanager.moc" |