From 7e66d7c3611d907ea28b140281b472bb1c406be6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 12:00:33 -0600 Subject: Remove additional unneeded tq method conversions --- src/generalinfowidget.cpp | 16 ++++++++-------- src/languageselectwidget.cpp | 4 ++-- src/mainwindowshare.cpp | 10 +++++----- src/newui/button.cpp | 10 +++++----- src/newui/ddockwindow.cpp | 8 ++++---- src/newui/dmainwindow.cpp | 2 +- src/newui/dtabwidget.cpp | 4 ++-- src/partcontroller.cpp | 24 ++++++++++++------------ src/plugincontroller.cpp | 6 +++--- src/pluginselectdialogbase.ui | 2 +- src/profileengine/editor/profileeditor.cpp | 4 ++-- src/profileengine/lib/profile.cpp | 6 +++--- src/profileengine/lib/profile.h | 4 ++-- src/profileengine/lib/profileengine.cpp | 10 +++++----- src/profileengine/lib/profileengine.h | 8 ++++---- src/projectmanager.cpp | 16 ++++++++-------- src/projectsession.cpp | 6 +++--- src/settingswidget.ui | 10 +++++----- src/simplemainwindow.cpp | 2 +- src/splashscreen.cpp | 4 ++-- src/statusbar.cpp | 2 +- 21 files changed, 79 insertions(+), 79 deletions(-) (limited to 'src') diff --git a/src/generalinfowidget.cpp b/src/generalinfowidget.cpp index d60619f0..99330c1b 100644 --- a/src/generalinfowidget.cpp +++ b/src/generalinfowidget.cpp @@ -92,7 +92,7 @@ void GeneralInfoWidget::configureinUpdateVersion( TQString configureinpath, TQSt TQFile configurein(configureinpath); if ( !configurein.open( IO_ReadOnly ) ){ - KMessageBox::error(this, i18n("Could not open %1 for reading.").tqarg(configureinpath)); + KMessageBox::error(this, i18n("Could not open %1 for reading.").arg(configureinpath)); return; } @@ -152,7 +152,7 @@ void GeneralInfoWidget::configureinUpdateVersion( TQString configureinpath, TQSt // write our changes.. TQFile configureout(configureinpath); if ( !configureout.open( IO_WriteOnly ) ){ - KMessageBox::error(this, i18n("Could not open %1 for writing.").tqarg(configureinpath)); + KMessageBox::error(this, i18n("Could not open %1 for writing.").arg(configureinpath)); return ; } TQTextStream output( &configureout); @@ -217,13 +217,13 @@ void GeneralInfoWidget::slotProjectDirectoryChanged( const TQString& text ) { else if(isProjectDirectoryAbsolute() && text[0] != '/') { setProjectDirectoryError( - i18n("'%1' is not an absolute path.").tqarg( + i18n("'%1' is not an absolute path.").arg( project_directory_edit->text())); } else if(!isProjectDirectoryAbsolute() && text[0] == '/') { setProjectDirectoryError( - i18n("'%1' is not a relative path.").tqarg( + i18n("'%1' is not a relative path.").arg( project_directory_edit->text())); } else @@ -231,11 +231,11 @@ void GeneralInfoWidget::slotProjectDirectoryChanged( const TQString& text ) { TQFileInfo info(projectDirectory()); if(!info.exists()) setProjectDirectoryError( - i18n("'%1' does not exist.").tqarg( + i18n("'%1' does not exist.").arg( project_directory_edit->text())); else if(!info.isDir()) setProjectDirectoryError( - i18n("'%1' is not a directory.").tqarg( + i18n("'%1' is not a directory.").arg( project_directory_edit->text())); else setProjectDirectorySuccess(); @@ -261,10 +261,10 @@ void GeneralInfoWidget::setProjectDirectorySuccess() { project_directory_diagnostic_icon->setPixmap(SmallIcon("ok")); if(isProjectDirectoryAbsolute()) project_directory_diagnostic_label->setText( - i18n("'%1' is a valid project directory.").tqarg(projectDirectory())); + i18n("'%1' is a valid project directory.").arg(projectDirectory())); else project_directory_diagnostic_label->setText( - i18n("'%1' is a valid project directory.").tqarg(projectDirectory())); + i18n("'%1' is a valid project directory.").arg(projectDirectory())); } TQString makeRelativePath(const TQString& fromPath, const TQString& toPath) diff --git a/src/languageselectwidget.cpp b/src/languageselectwidget.cpp index af093b78..728c7651 100644 --- a/src/languageselectwidget.cpp +++ b/src/languageselectwidget.cpp @@ -108,11 +108,11 @@ void LanguageSelectWidget::readProjectConfig() KTrader::OfferList languageSupportOffers = KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"), TQString::fromLatin1("[X-KDevelop-Version] == %1" - ).tqarg( KDEVELOP_PLUGIN_VERSION )); + ).arg( KDEVELOP_PLUGIN_VERSION )); TQStringList languages = DomUtil::readListEntry(m_projectDom, "/general/secondaryLanguages", "language"); TQString language = DomUtil::readEntry(m_projectDom, "/general/primarylanguage"); - _currentLanguage->setText(i18n("Primary language is '%1'. Please select additional languages the project might contain.").tqarg(language)); + _currentLanguage->setText(i18n("Primary language is '%1'. Please select additional languages the project might contain.").arg(language)); for (KTrader::OfferList::ConstIterator it = languageSupportOffers.begin(); it != languageSupportOffers.end(); ++it) { diff --git a/src/mainwindowshare.cpp b/src/mainwindowshare.cpp index 6eda3c46..922ccd26 100644 --- a/src/mainwindowshare.cpp +++ b/src/mainwindowshare.cpp @@ -127,30 +127,30 @@ void MainWindowShare::createActions() this, TQT_SLOT(slotShowMenuBar()), m_pMainWnd->actionCollection(), "settings_show_menubar" ); action->setToolTip(beautifyToolTip(action->text())); - action->setWhatsThis(TQString("%1

%2").tqarg(beautifyToolTip(action->text())).tqarg(i18n("Lets you switch the menubar on/off."))); + action->setWhatsThis(TQString("%1

%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you switch the menubar on/off."))); action = KStdAction::keyBindings( this, TQT_SLOT(slotKeyBindings()), m_pMainWnd->actionCollection(), "settings_configure_shortcuts" ); action->setToolTip(beautifyToolTip(action->text())); - action->setWhatsThis(TQString("%1

%2").tqarg(beautifyToolTip(action->text())).tqarg(i18n("Lets you configure shortcut keys."))); + action->setWhatsThis(TQString("%1

%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure shortcut keys."))); action = KStdAction::configureToolbars( this, TQT_SLOT(slotConfigureToolbars()), m_pMainWnd->actionCollection(), "settings_configure_toolbars" ); action->setToolTip(beautifyToolTip(action->text())); - action->setWhatsThis(TQString("%1

%2").tqarg(beautifyToolTip(action->text())).tqarg(i18n("Lets you configure toolbars."))); + action->setWhatsThis(TQString("%1

%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure toolbars."))); action = KStdAction::configureNotifications( this, TQT_SLOT(slotConfigureNotifications()), m_pMainWnd->actionCollection(), "settings_configure_notifications" ); action->setToolTip(beautifyToolTip(action->text())); - action->setWhatsThis(TQString("%1

%2").tqarg(beautifyToolTip(action->text())).tqarg(i18n("Lets you configure system notifications."))); + action->setWhatsThis(TQString("%1

%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure system notifications."))); action = KStdAction::preferences(this, TQT_SLOT(slotSettings()), m_pMainWnd->actionCollection(), "settings_configure" ); action->setToolTip( i18n( "Configure KDevelop" ) ); - action->setWhatsThis(TQString("%1

%2").tqarg(i18n( "Configure KDevelop" )).tqarg(i18n("Lets you customize KDevelop."))); + action->setWhatsThis(TQString("%1

%2").arg(i18n( "Configure KDevelop" )).arg(i18n("Lets you customize KDevelop."))); m_toggleStatusbar = KStdAction::showToolbar(this, TQT_SLOT(slotToggleStatusbar()),m_pMainWnd->actionCollection(), "settings_statusbar"); m_toggleStatusbar->setText(i18n("Show &Statusbar")); diff --git a/src/newui/button.cpp b/src/newui/button.cpp index 23406486..0d7cf9aa 100644 --- a/src/newui/button.cpp +++ b/src/newui/button.cpp @@ -62,9 +62,9 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon, KConfig *config = kapp->config(); config->setGroup("UI"); - TQString accel = config->readEntry(TQString("button_%1").tqarg(text), ""); + TQString accel = config->readEntry(TQString("button_%1").arg(text), ""); if (!accel.isEmpty()) - setRealText(TQString("&%1 %2").tqarg(accel).tqarg(m_realText)); + setRealText(TQString("&%1 %2").arg(accel).arg(m_realText)); } Button::~Button() @@ -80,11 +80,11 @@ Button::~Button() TQString text = m_realText; if (text.contains(r2)) text.remove(r2); - config->writeEntry(TQString("button_%1").tqarg(text), r.cap(1)); + config->writeEntry(TQString("button_%1").arg(text), r.cap(1)); } else { - config->writeEntry(TQString("button_%1").tqarg(m_realText), ""); + config->writeEntry(TQString("button_%1").arg(m_realText), ""); } } @@ -319,7 +319,7 @@ void Button::assignAccel() if (ok) { TQString text = realTextWithoutAccel(); - text = TQString("&%1 %2").tqarg(num).tqarg(text); + text = TQString("&%1 %2").arg(num).arg(text); setRealText(text); } } diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp index a4685107..fbe9edb1 100644 --- a/src/newui/ddockwindow.cpp +++ b/src/newui/ddockwindow.cpp @@ -104,7 +104,7 @@ void DDockWindow::setVisible(bool v) { //write dock width to the config file KConfig *config = kapp->config(); - TQString group = TQString("%1").tqarg(m_name); + TQString group = TQString("%1").arg(m_name); config->setGroup(group); if (m_visible) @@ -115,7 +115,7 @@ void DDockWindow::setVisible(bool v) v ? m_widgetStack->show() : m_widgetStack->hide(); m_visible = v; - m_internalLayout->tqinvalidate(); + m_internalLayout->invalidate(); if (!m_visible) { if (m_position == DDockWindow::Bottom) @@ -148,7 +148,7 @@ void DDockWindow::loadSettings() void DDockWindow::saveSettings() { KConfig *config = kapp->config(); - TQString group = TQString("%1").tqarg(m_name); + TQString group = TQString("%1").arg(m_name); int invisibleWidth = 0; config->setGroup(group); if (config->hasKey("ViewWidth")) @@ -200,7 +200,7 @@ void DDockWindow::addWidget(const TQString &title, TQWidget *widget, bool skipAc //if the widget was selected last time the dock is deleted //we need to show it KConfig *config = kapp->config(); - TQString group = TQString("%1").tqarg(m_name); + TQString group = TQString("%1").arg(m_name); config->setGroup(group); if (config->readEntry("ViewLastWidget") == title) { diff --git a/src/newui/dmainwindow.cpp b/src/newui/dmainwindow.cpp index abb4d0ef..45894178 100644 --- a/src/newui/dmainwindow.cpp +++ b/src/newui/dmainwindow.cpp @@ -185,7 +185,7 @@ DTabWidget *DMainWindow::splitVertical() void DMainWindow::invalidateActiveTabWidget() { /* TQWidget *focused = m_central->focusWidget(); - kdDebug(9000) << "tqinvalidate: " << focused << endl; + kdDebug(9000) << "invalidate: " << focused << endl; if (focused == 0) return; if (!m_widgets.contains(focused)) diff --git a/src/newui/dtabwidget.cpp b/src/newui/dtabwidget.cpp index 64b60ee7..c3a0c7d1 100644 --- a/src/newui/dtabwidget.cpp +++ b/src/newui/dtabwidget.cpp @@ -85,7 +85,7 @@ void DTabWidget::insertTab(TQWidget *child, const TQString &label, int index) if (m_closeButton && m_closeButtonShown) m_closeButton->show(); KTabWidget::insertTab(child, label, index); - if (index != -1) tabBar()->tqrepaint(); + if (index != -1) tabBar()->repaint(); } void DTabWidget::insertTab(TQWidget *child, const TQIconSet &iconset, @@ -94,7 +94,7 @@ void DTabWidget::insertTab(TQWidget *child, const TQIconSet &iconset, if (m_closeButton && m_closeButtonShown) m_closeButton->show(); KTabWidget::insertTab(child, iconset, label, index); - if (index != -1) tabBar()->tqrepaint(); + if (index != -1) tabBar()->repaint(); } /*void DTabWidget::updateHistory(TQWidget *w) diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp index 368b4c62..855f1cb2 100644 --- a/src/partcontroller.cpp +++ b/src/partcontroller.cpp @@ -131,7 +131,7 @@ void PartController::setupActions() newAction->setWhatsThis( i18n("Open file

Opens an existing file without adding it to the project.

") ); m_openRecentAction = KStdAction::openRecent( this, TQT_SLOT(slotOpenRecent(const KURL&) ), ac, "file_open_recent" ); - m_openRecentAction->setWhatsThis(TQString("%1

%2").tqarg(beautifyToolTip(m_openRecentAction->text())).tqarg(i18n("Opens recently opened file."))); + m_openRecentAction->setWhatsThis(TQString("%1

%2").arg(beautifyToolTip(m_openRecentAction->text())).arg(i18n("Opens recently opened file."))); m_openRecentAction->loadEntries( kapp->config(), "RecentFiles" ); m_saveAllFilesAction = new KAction(i18n("Save Al&l"), 0, this, TQT_SLOT(slotSaveAllFiles()), ac, "file_save_all"); @@ -146,7 +146,7 @@ void PartController::setupActions() m_closeWindowAction = KStdAction::close(this, TQT_SLOT(slotCloseWindow()), ac, "file_close"); m_closeWindowAction->setToolTip( i18n("Close current file") ); - m_closeWindowAction->setWhatsThis(TQString("%1

%2").tqarg(beautifyToolTip(m_closeWindowAction->text())).tqarg(i18n("Closes current file."))); + m_closeWindowAction->setWhatsThis(TQString("%1

%2").arg(beautifyToolTip(m_closeWindowAction->text())).arg(i18n("Closes current file."))); m_closeWindowAction->setEnabled(false); m_closeAllWindowsAction = new KAction(i18n("Close All"), 0, this, TQT_SLOT(slotCloseAllWindows()), ac, "file_close_all"); @@ -534,8 +534,8 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, else { MimeWarningDialog dlg; - dlg.text2->setText( TQString( "%1" ).tqarg(url.path())); - dlg.text3->setText( dlg.text3->text().tqarg(MimeType->name()) ); + dlg.text2->setText( TQString( "%1" ).arg(url.path())); + dlg.text3->setText( dlg.text3->text().arg(MimeType->name()) ); if ( dlg.exec() == TQDialog::Accepted ) { @@ -593,7 +593,7 @@ void PartController::showDocument(const KURL &url, bool newWin) KParts::Factory *PartController::findPartFactory(const TQString &mimeType, const TQString &partType, const TQString &preferredName) { - KTrader::OfferList offers = KTrader::self()->query(mimeType, TQString("'%1' in ServiceTypes").tqarg(partType)); + KTrader::OfferList offers = KTrader::self()->query(mimeType, TQString("'%1' in ServiceTypes").arg(partType)); if (offers.count() > 0) { @@ -1005,7 +1005,7 @@ void PartController::reloadFile( const KURL & url ) if ( part->isModified() ) { if ( KMessageBox::warningYesNo( TopLevel::getInstance()->main(), - i18n( "The file \"%1\" is modified in memory. Are you sure you want to reload it? (Local changes will be lost.)" ).tqarg( url.path() ), + i18n( "The file \"%1\" is modified in memory. Are you sure you want to reload it? (Local changes will be lost.)" ).arg( url.path() ), i18n( "File is Modified" ), i18n("Reload"), i18n("Do Not Reload") ) == KMessageBox::Yes ) { part->setModified( false ); @@ -1120,7 +1120,7 @@ bool PartController::saveFile( const KURL & url, bool force ) case DirtyAndModified: { int code = KMessageBox::warningYesNoCancel( TopLevel::getInstance()->main(), - i18n("The file \"%1\" is modified on disk.\n\nAre you sure you want to overwrite it? (External changes will be lost.)").tqarg( url.path() ), + i18n("The file \"%1\" is modified on disk.\n\nAre you sure you want to overwrite it? (External changes will be lost.)").arg( url.path() ), i18n("File Externally Modified"), i18n("Overwrite"), i18n("Do Not Overwrite") ); if ( code == KMessageBox::Yes ) { @@ -1481,7 +1481,7 @@ bool PartController::reactToDirty( KURL const & url, unsigned char reason ) { KMessageBox::sorry( TopLevel::getInstance()->main(), i18n("Conflict: The file \"%1\" has changed on disk while being modified in memory.\n\n" - "You should investigate before saving to make sure you are not losing data.").tqarg( url.path() ), + "You should investigate before saving to make sure you are not losing data.").arg( url.path() ), i18n("Conflict") ); return false; } @@ -1490,7 +1490,7 @@ bool PartController::reactToDirty( KURL const & url, unsigned char reason ) { KMessageBox::sorry( TopLevel::getInstance()->main(), i18n("Warning: The file \"%1\" has been deleted on disk.\n\n" - "If this was not your intention, make sure to save this file now.").tqarg( url.path() ), + "If this was not your intention, make sure to save this file now.").arg( url.path() ), i18n("File Deleted") ); return false; } @@ -1498,7 +1498,7 @@ bool PartController::reactToDirty( KURL const & url, unsigned char reason ) if ( dirtyAction == "alert" ) { if ( KMessageBox::warningYesNo( TopLevel::getInstance()->main(), - i18n("The file \"%1\" has changed on disk.\n\nDo you want to reload it?").tqarg( url.path() ), + i18n("The file \"%1\" has changed on disk.\n\nDo you want to reload it?").arg( url.path() ), i18n("File Changed"), i18n("Reload"), i18n("Do Not Reload") ) == KMessageBox::No ) { return false; @@ -1628,7 +1628,7 @@ void PartController::slotBackAboutToShow() TQValueList::ConstIterator it = m_backHistory.begin(); while( i < 10 && it != m_backHistory.end() ) { - popup->insertItem( (*it).url.fileName() + TQString(" (%1)").tqarg( (*it).line +1), (*it).id ); + popup->insertItem( (*it).url.fileName() + TQString(" (%1)").arg( (*it).line +1), (*it).id ); ++i; ++it; } @@ -1645,7 +1645,7 @@ void PartController::slotForwardAboutToShow( ) TQValueList::ConstIterator it = m_forwardHistory.begin(); while( i < 10 && it != m_forwardHistory.end() ) { - popup->insertItem( (*it).url.fileName() + TQString(" (%1)").tqarg( (*it).line +1), (*it).id ); + popup->insertItem( (*it).url.fileName() + TQString(" (%1)").arg( (*it).line +1), (*it).id ); ++i; ++it; } diff --git a/src/plugincontroller.cpp b/src/plugincontroller.cpp index e730778b..6639375b 100644 --- a/src/plugincontroller.cpp +++ b/src/plugincontroller.cpp @@ -49,7 +49,7 @@ namespace template ComponentType *loadDefaultPart( const TQString &serviceType ) { - KTrader::OfferList offers = KTrader::self()->query(serviceType, TQString("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION)); + KTrader::OfferList offers = KTrader::self()->query(serviceType, TQString("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION)); KTrader::OfferList::ConstIterator serviceIt = offers.begin(); for ( ; serviceIt != offers.end(); ++serviceIt ) { KService::Ptr service = *serviceIt; @@ -147,7 +147,7 @@ void PluginController::loadPlugins( KTrader::OfferList offers, const TQStringLis if( m_parts[ name ] != 0 || ignorePlugins.contains( name ) ) continue; - emit loadingPlugin(i18n("Loading: %1").tqarg((*it)->genericName())); + emit loadingPlugin(i18n("Loading: %1").arg((*it)->genericName())); KDevPlugin *plugin = loadPlugin( *it ); if ( plugin ) @@ -218,7 +218,7 @@ KDevPlugin *PluginController::loadPlugin( const KService::Ptr &service ) 0, i18n("Could not load plugin
" "Plugin %1 could not be loaded
" - "Library loader error: %2").tqarg(service->name()). + "Library loader error: %2").arg(service->name()). arg(KLibLoader::self()->lastErrorMessage()), i18n("Could not load plugin")); } diff --git a/src/pluginselectdialogbase.ui b/src/pluginselectdialogbase.ui index 2cab503b..cc1fe69e 100644 --- a/src/pluginselectdialogbase.ui +++ b/src/pluginselectdialogbase.ui @@ -90,7 +90,7 @@ - + WordBreak|AlignVCenter diff --git a/src/profileengine/editor/profileeditor.cpp b/src/profileengine/editor/profileeditor.cpp index 9f383911..0383f332 100644 --- a/src/profileengine/editor/profileeditor.cpp +++ b/src/profileengine/editor/profileeditor.cpp @@ -69,12 +69,12 @@ public: bool isDerived() const { return m_derived; } - virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) + virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) { TQColorGroup cgNew = cg; if (m_derived) cgNew.setColor(TQColorGroup::Text, KGlobalSettings::inactiveTextColor()); - KListViewItem::paintCell(p, cgNew, column, width, tqalignment); + KListViewItem::paintCell(p, cgNew, column, width, alignment); } private: diff --git a/src/profileengine/lib/profile.cpp b/src/profileengine/lib/profile.cpp index ac30ff87..68666f3a 100644 --- a/src/profileengine/lib/profile.cpp +++ b/src/profileengine/lib/profile.cpp @@ -59,18 +59,18 @@ Profile::Profile(Profile *parent, const TQString &name, const TQString &genericN Profile::~Profile() { - for (TQValueList::iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it) + for (TQValueList::iterator it = m_children.begin(); it != m_children.end(); ++it) delete *it; } void Profile::addChildProfile(Profile *profile) { - m_tqchildren.append(profile); + m_children.append(profile); } void Profile::removeChildProfile(Profile *profile) { - m_tqchildren.remove(profile); + m_children.remove(profile); } TQString Profile::dirName() const diff --git a/src/profileengine/lib/profile.h b/src/profileengine/lib/profile.h index 3cbfd6f5..857ddf39 100644 --- a/src/profileengine/lib/profile.h +++ b/src/profileengine/lib/profile.h @@ -49,7 +49,7 @@ public: Profile(Profile *parent, const TQString &name, const TQString &genericName, const TQString &description); ~Profile(); - TQValueList tqchildren() const { return m_tqchildren; } + TQValueList children() const { return m_children; } Profile *parent() const { return m_parent; } void save(); @@ -81,7 +81,7 @@ protected: private: Profile *m_parent; - TQValueList m_tqchildren; + TQValueList m_children; TQString m_name; diff --git a/src/profileengine/lib/profileengine.cpp b/src/profileengine/lib/profileengine.cpp index d6be00f1..48a4e4e2 100644 --- a/src/profileengine/lib/profileengine.cpp +++ b/src/profileengine/lib/profileengine.cpp @@ -78,7 +78,7 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType if (!profile) return KTrader::OfferList(); - TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION); + TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION); switch (offerType) { case Global: constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Global'"); @@ -95,7 +95,7 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType int i = 0; for (Profile::EntryList::const_iterator it = properties.begin(); it != properties.end(); ++it) constraint_add += TQString::fromLatin1(" %1 '%2' in [X-KDevelop-Properties]"). - tqarg((i++)==0?"":"or").tqarg((*it).name); + arg((i++)==0?"":"or").arg((*it).name); if (!constraint_add.isEmpty()) constraint += " and ( " + constraint_add + " ) "; @@ -129,8 +129,8 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType { if (names.contains((*it).name)) continue; - TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION); - constraint += TQString::fromLatin1("and [Name] == '%1'").tqarg((*it).name); + TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION); + constraint += TQString::fromLatin1("and [Name] == '%1'").arg((*it).name); KTrader::OfferList enable = KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"), constraint); list += enable; } @@ -149,7 +149,7 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType KTrader::OfferList ProfileEngine::allOffers(OfferType offerType) { - TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION); + TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION); switch (offerType) { case Global: constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Global'"); diff --git a/src/profileengine/lib/profileengine.h b/src/profileengine/lib/profileengine.h index d34f9e02..6404e48f 100644 --- a/src/profileengine/lib/profileengine.h +++ b/src/profileengine/lib/profileengine.h @@ -177,8 +177,8 @@ public: template void walkProfiles(Operation &op, Profile *root) { - TQValueList tqchildren = root->tqchildren(); - for (TQValueList::iterator it = tqchildren.begin(); it != tqchildren.end(); ++it) + TQValueList children = root->children(); + for (TQValueList::iterator it = children.begin(); it != children.end(); ++it) { op(*it); walkProfiles(op, *it); @@ -244,8 +244,8 @@ public: template void walkProfiles(Operation &op, Result *result, Profile *root) { - TQValueList tqchildren = root->tqchildren(); - for (TQValueList::iterator it = tqchildren.begin(); it != tqchildren.end(); ++it) + TQValueList children = root->children(); + for (TQValueList::iterator it = children.begin(); it != children.end(); ++it) { Result *newResult = op(result, *it); walkProfiles(op, newResult, *it); diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp index 9694ff0d..b0f44d90 100644 --- a/src/projectmanager.cpp +++ b/src/projectmanager.cpp @@ -355,7 +355,7 @@ bool ProjectManager::loadProjectFile() TQString path; if (!KIO::NetAccess::download(m_info->m_projectURL, path, 0)) { KMessageBox::sorry(TopLevel::getInstance()->main(), - i18n("Could not read project file: %1").tqarg(m_info->m_projectURL.prettyURL())); + i18n("Could not read project file: %1").arg(m_info->m_projectURL.prettyURL())); return false; } @@ -363,7 +363,7 @@ bool ProjectManager::loadProjectFile() if (!fin.open(IO_ReadOnly)) { KMessageBox::sorry(TopLevel::getInstance()->main(), - i18n("Could not read project file: %1").tqarg(m_info->m_projectURL.prettyURL())); + i18n("Could not read project file: %1").arg(m_info->m_projectURL.prettyURL())); return false; } @@ -374,7 +374,7 @@ bool ProjectManager::loadProjectFile() KMessageBox::sorry(TopLevel::getInstance()->main(), i18n("This is not a valid project file.\n" "XML error in line %1, column %2:\n%3") - .tqarg(errorLine).tqarg(errorCol).tqarg(errorMsg)); + .arg(errorLine).arg(errorCol).arg(errorMsg)); fin.close(); KIO::NetAccess::removeTempFile(path); return false; @@ -486,7 +486,7 @@ bool ProjectManager::loadProjectPart() if (!projectService) { KMessageBox::sorry(TopLevel::getInstance()->main(), i18n("No project management plugin %1 found.") - .tqarg(m_info->m_projectPlugin)); + .arg(m_info->m_projectPlugin)); return false; } @@ -496,7 +496,7 @@ bool ProjectManager::loadProjectPart() if ( !projectPart ) { KMessageBox::sorry(TopLevel::getInstance()->main(), i18n("Could not create project management plugin %1.") - .tqarg(m_info->m_projectPlugin)); + .arg(m_info->m_projectPlugin)); return false; } @@ -537,12 +537,12 @@ bool ProjectManager::loadLanguageSupport(const TQString& lang) KTrader::OfferList languageSupportOffers = KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"), - TQString::fromLatin1("[X-KDevelop-Language] == '%1' and [X-KDevelop-Version] == %2").tqarg(lang).tqarg(KDEVELOP_PLUGIN_VERSION)); + TQString::fromLatin1("[X-KDevelop-Language] == '%1' and [X-KDevelop-Version] == %2").arg(lang).arg(KDEVELOP_PLUGIN_VERSION)); if (languageSupportOffers.isEmpty()) { KMessageBox::sorry(TopLevel::getInstance()->main(), i18n("No language plugin for %1 found.") - .tqarg(lang)); + .arg(lang)); return false; } @@ -556,7 +556,7 @@ bool ProjectManager::loadLanguageSupport(const TQString& lang) if ( !langSupport ) { KMessageBox::sorry(TopLevel::getInstance()->main(), i18n("Could not create language plugin for %1.") - .tqarg(lang)); + .arg(lang)); return false; } diff --git a/src/projectsession.cpp b/src/projectsession.cpp index f09967ef..ae7377e1 100644 --- a/src/projectsession.cpp +++ b/src/projectsession.cpp @@ -79,7 +79,7 @@ bool ProjectSession::restoreFromFile( const TQString & sessionFileName, const TQ if (!ok) { KMessageBox::sorry(0L, i18n("The file %1 does not contain valid XML.\n" - "The loading of the session failed.").tqarg(sessionFileName)); + "The loading of the session failed.").arg(sessionFileName)); initXMLTree(); // because it was now broken after failed setContent() return false; } @@ -91,8 +91,8 @@ bool ProjectSession::restoreFromFile( const TQString & sessionFileName, const TQ // Check for proper document type. if (domdoc.doctype().name() != "KDevPrjSession") { KMessageBox::sorry(0L, - i18n("The file %1 does not contain a valid KDevelop project session ('KDevPrjSession').\n").tqarg(sessionFileName) - + i18n("The document type seems to be: '%1'.").tqarg(domdoc.doctype().name())); + i18n("The file %1 does not contain a valid KDevelop project session ('KDevPrjSession').\n").arg(sessionFileName) + + i18n("The document type seems to be: '%1'.").arg(domdoc.doctype().name())); return false; } diff --git a/src/settingswidget.ui b/src/settingswidget.ui index 3db79b51..7fa05b06 100644 --- a/src/settingswidget.ui +++ b/src/settingswidget.ui @@ -43,7 +43,7 @@ <qt><h3>Project Settings</h3></qt> - + WordBreak|AlignVCenter @@ -129,7 +129,7 @@ AutoText - + WordBreak|AlignBottom|AlignLeft @@ -319,7 +319,7 @@ <qt><h3>Terminal Emulation</h3></qt> - + AlignTop @@ -364,7 +364,7 @@ <qt><h3>UI Designer Integration</h3>This will only be used when no project is opened. For the project specific setting see Project Options/C++ Specific and open the Qt tab.</qt> - + WordBreak|AlignTop @@ -479,7 +479,7 @@ - + AlignAuto diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp index e71e6b1d..defcf0c1 100644 --- a/src/simplemainwindow.cpp +++ b/src/simplemainwindow.cpp @@ -765,7 +765,7 @@ void SimpleMainWindow::fillWindowMenu() while (itt != list.end()) { - temp = m_windowMenu->insertItem( i < 10 ? TQString("&%1 %2").tqarg(i).tqarg((*itt).fileName()) : (*itt).fileName() ); + temp = m_windowMenu->insertItem( i < 10 ? TQString("&%1 %2").arg(i).arg((*itt).fileName()) : (*itt).fileName() ); m_windowList << tqMakePair(temp, *itt); ++i; ++itt; diff --git a/src/splashscreen.cpp b/src/splashscreen.cpp index ddfb8e62..22ffcf9d 100644 --- a/src/splashscreen.cpp +++ b/src/splashscreen.cpp @@ -29,7 +29,7 @@ KDevSplashScreen::~KDevSplashScreen() void KDevSplashScreen::animate() { state = ((state + 1) % (2*progress_bar_size-1)); - tqrepaint(); + repaint(); } @@ -74,7 +74,7 @@ void KDevSplashScreen::drawContents (TQPainter* painter) // Draw version number TQRect r = rect(); r.setRect(r.x() + 5, r.y() + 5, r.width() - 10, r.height() - 10); - painter->drawText(r, TQt::AlignRight, i18n("Version %1").tqarg( VERSION )); + painter->drawText(r, TQt::AlignRight, i18n("Version %1").arg( VERSION )); // Draw message at given position, limited to 43 chars // If message is too long, string is truncated diff --git a/src/statusbar.cpp b/src/statusbar.cpp index 31ec4f55..ff1502bc 100644 --- a/src/statusbar.cpp +++ b/src/statusbar.cpp @@ -98,7 +98,7 @@ void KDevStatusBar::setStatus(const TQString &str) void KDevStatusBar::setCursorPosition(int line, int col) { - _status->setText(i18n(" Line: %1 Col: %2 ").tqarg(line+1).tqarg(col)); + _status->setText(i18n(" Line: %1 Col: %2 ").arg(line+1).arg(col)); } void KDevStatusBar::addWidget ( TQWidget *widget, int stretch, bool permanent) -- cgit v1.2.3