From c3b301575a98e4c3505ad95534d6192b65539dab Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:36:08 -0600 Subject: Rename old tq methods that no longer need a unique name --- src/generalinfowidgetbase.ui | 8 +++---- src/kdevideextension.cpp | 2 +- src/languageselectwidget.cpp | 10 ++++----- src/mimewarningdialog.ui | 6 +++--- src/newui/button.cpp | 30 +++++++++++++-------------- src/newui/button.h | 4 ++-- src/newui/buttonbar.cpp | 20 +++++++++--------- src/newui/buttonbar.h | 4 ++-- src/newui/ddockwindow.cpp | 10 ++++----- src/newui/dmainwindow.cpp | 2 +- src/newui/docksplitter.cpp | 2 +- src/partcontroller.cpp | 12 +++++------ src/partcontroller.h | 4 ++-- src/plugincontroller.cpp | 4 ++-- src/pluginselectdialogbase.ui | 4 ++-- src/profileengine/editor/profileeditor.cpp | 2 +- src/profileengine/editor/profileeditorbase.ui | 10 ++++----- src/profileengine/lib/profileengine.cpp | 28 ++++++++++++------------- src/projectmanager.cpp | 6 +++--- src/settingswidget.ui | 10 ++++----- src/statusbar.cpp | 10 ++++----- src/statusbar.h | 4 ++-- 22 files changed, 96 insertions(+), 96 deletions(-) (limited to 'src') diff --git a/src/generalinfowidgetbase.ui b/src/generalinfowidgetbase.ui index f253e41a..42502e58 100644 --- a/src/generalinfowidgetbase.ui +++ b/src/generalinfowidgetbase.ui @@ -44,7 +44,7 @@ Expanding - + 408 20 @@ -103,7 +103,7 @@ 0 - + 100 32767 @@ -145,13 +145,13 @@ Placed in the AUTHORS file 0 - + 16 16 - + 16 16 diff --git a/src/kdevideextension.cpp b/src/kdevideextension.cpp index fcf3414c..0f31d40e 100644 --- a/src/kdevideextension.cpp +++ b/src/kdevideextension.cpp @@ -79,7 +79,7 @@ void KDevIDEExtension::createGlobalSettingsPage(KDialogBase *dlg) gsw->embeddedDesignerRadioButton->setChecked( DesignerSetting == "EmbeddedKDevDesigner" ); config->setGroup("TerminalEmulator"); - gsw->terminalEdit->setText( config->readEntry( "TerminalApplication", TQString::tqfromLatin1("konsole") ) ); + gsw->terminalEdit->setText( config->readEntry( "TerminalApplication", TQString::fromLatin1("konsole") ) ); bool useKDESetting = config->readBoolEntry( "UseKDESetting", true ); gsw->useKDETerminal->setChecked( useKDESetting ); gsw->useOtherTerminal->setChecked( !useKDESetting ); diff --git a/src/languageselectwidget.cpp b/src/languageselectwidget.cpp index eb77fc44..af093b78 100644 --- a/src/languageselectwidget.cpp +++ b/src/languageselectwidget.cpp @@ -67,7 +67,7 @@ void LanguageSelectWidget::init() groupBox1->tqlayout()->setSpacing( 6 ); groupBox1->tqlayout()->setMargin( 11 ); TQVBoxLayout * groupBox1Layout = new TQVBoxLayout( groupBox1->tqlayout() ); - groupBox1Layout->tqsetAlignment( TQt::AlignTop ); + groupBox1Layout->setAlignment( TQt::AlignTop ); _currentLanguage = new TQLabel( "", groupBox1 ); @@ -85,10 +85,10 @@ void LanguageSelectWidget::init() groupBox2->tqlayout()->setSpacing( 6 ); groupBox2->tqlayout()->setMargin( 11 ); TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->tqlayout() ); - groupBox2Layout->tqsetAlignment( TQt::AlignTop ); + groupBox2Layout->setAlignment( TQt::AlignTop ); _pluginDescription = new TQLabel( groupBox2 ); - _pluginDescription->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); + _pluginDescription->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); groupBox2Layout->addWidget( _pluginDescription ); @@ -106,8 +106,8 @@ LanguageSelectWidget::~LanguageSelectWidget() void LanguageSelectWidget::readProjectConfig() { KTrader::OfferList languageSupportOffers = - KTrader::self()->query(TQString::tqfromLatin1("KDevelop/LanguageSupport"), - TQString::tqfromLatin1("[X-KDevelop-Version] == %1" + KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"), + TQString::fromLatin1("[X-KDevelop-Version] == %1" ).tqarg( KDEVELOP_PLUGIN_VERSION )); TQStringList languages = DomUtil::readListEntry(m_projectDom, "/general/secondaryLanguages", "language"); diff --git a/src/mimewarningdialog.ui b/src/mimewarningdialog.ui index 87b92349..f5c436f4 100644 --- a/src/mimewarningdialog.ui +++ b/src/mimewarningdialog.ui @@ -140,7 +140,7 @@ Fixed - + 24 20 @@ -168,7 +168,7 @@ Expanding - + 41 20 @@ -197,7 +197,7 @@ Expanding - + 101 20 diff --git a/src/newui/button.cpp b/src/newui/button.cpp index 3b483cd4..23406486 100644 --- a/src/newui/button.cpp +++ b/src/newui/button.cpp @@ -49,8 +49,8 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon, setToggleButton(true); setFocusPolicy(TQ_NoFocus); setDescription(m_description); - tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); - resize(tqsizeHint()); + setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + resize(sizeHint()); fixDimensions(Ideal::Bottom); TQToolTip::add(this, m_realText); @@ -131,11 +131,11 @@ void Button::drawButton(TQPainter *p) pm.fill(eraseColor()); TQPainter p2(&pm); - tqstyle().tqdrawControl(TQStyle::CE_PushButton,&p2,this, TQRect(0,0,pm.width(),pm.height()), tqcolorGroup(),flags); + tqstyle().drawControl(TQStyle::CE_PushButton,&p2,this, TQRect(0,0,pm.width(),pm.height()), colorGroup(),flags); - tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel, &p2, this, + tqstyle().drawControl(TQStyle::CE_PushButtonLabel, &p2, this, TQRect(0,0,pm.width(),pm.height()), - tqcolorGroup(), flags, TQStyleOption()); + colorGroup(), flags, TQStyleOption()); switch (m_place) { @@ -178,7 +178,7 @@ void Button::fixDimensions(Place oldPlace) if ((oldPlace == Ideal::Bottom) || (oldPlace == Ideal::Top)) { setFixedWidth(height()); - setMinimumHeight(tqsizeHint().width()); + setMinimumHeight(sizeHint().width()); setMaximumHeight(32767); } break; @@ -187,19 +187,19 @@ void Button::fixDimensions(Place oldPlace) if ((oldPlace == Ideal::Left) || (oldPlace == Ideal::Right)) { setFixedHeight(width()); - setMinimumWidth(tqsizeHint().height()); + setMinimumWidth(sizeHint().height()); setMaximumWidth(32767); } break; } } -TQSize Button::tqsizeHint() const +TQSize Button::sizeHint() const { - return tqsizeHint(text()); + return sizeHint(text()); } -TQSize Button::tqsizeHint(const TQString &text) const +TQSize Button::sizeHint(const TQString &text) const { constPolish(); int w = 0, h = 0; @@ -211,7 +211,7 @@ TQSize Button::tqsizeHint(const TQString &text) const h = TQMAX( h, ih ); } if ( isMenuButton() ) - w += tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator, this); + w += tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator, this); if ( pixmap() ) { TQPixmap *pm = (TQPixmap *)pixmap(); w += pm->width(); @@ -220,7 +220,7 @@ TQSize Button::tqsizeHint(const TQString &text) const TQString s( text ); bool empty = s.isEmpty(); if ( empty ) - s = TQString::tqfromLatin1("XXXX"); + s = TQString::fromLatin1("XXXX"); TQFontMetrics fm = fontMetrics(); TQSize sz = fm.size( ShowPrefix, s ); if(!empty || !w) @@ -239,12 +239,12 @@ void Button::updateSize() { case Ideal::Left: case Ideal::Right: - setMinimumHeight(tqsizeHint().width()); - resize(tqsizeHint().height(), tqsizeHint().width()); + setMinimumHeight(sizeHint().width()); + resize(sizeHint().height(), sizeHint().width()); break; case Ideal::Top: case Ideal::Bottom: - resize(tqsizeHint().width(), tqsizeHint().height()); + resize(sizeHint().width(), sizeHint().height()); break; } } diff --git a/src/newui/button.h b/src/newui/button.h index 34ce4e3a..96948267 100644 --- a/src/newui/button.h +++ b/src/newui/button.h @@ -54,8 +54,8 @@ public: /**Sets the mode of a button.*/ void setMode(Ideal::ButtonMode mode); - TQSize tqsizeHint() const; - TQSize tqsizeHint(const TQString &text) const; + TQSize sizeHint() const; + TQSize sizeHint(const TQString &text) const; /**Updates size of a widget. Used after squeezing button's text.*/ void updateSize(); diff --git a/src/newui/buttonbar.cpp b/src/newui/buttonbar.cpp index ddd4249b..f64e0695 100644 --- a/src/newui/buttonbar.cpp +++ b/src/newui/buttonbar.cpp @@ -37,9 +37,9 @@ ButtonLayout::ButtonLayout(ButtonBar *parent, Direction d, int margin, int spaci { } -TQSize ButtonLayout::tqminimumSize() const +TQSize ButtonLayout::minimumSize() const { - TQSize size = TQBoxLayout::tqminimumSize(); + TQSize size = TQBoxLayout::minimumSize(); if (!m_buttonBar->autoResize()) return size; @@ -54,7 +54,7 @@ TQSize ButtonLayout::tqminimumSize() const case Ideal::Bottom: return TQSize(0,size.height()); } - return TQBoxLayout::tqminimumSize(); + return TQBoxLayout::minimumSize(); } @@ -128,14 +128,14 @@ void ButtonBar::fixDimensions() { case Ideal::Left: case Ideal::Right: - setFixedWidth(tqsizeHint().width()); - setMinimumHeight(tqsizeHint().height()); + setFixedWidth(sizeHint().width()); + setMinimumHeight(sizeHint().height()); setMaximumHeight(32767); break; case Ideal::Top: case Ideal::Bottom: - setFixedHeight(tqsizeHint().height()); - setMinimumWidth(tqsizeHint().width()); + setFixedHeight(sizeHint().height()); + setMinimumWidth(sizeHint().width()); setMaximumWidth(32767); break; } @@ -156,13 +156,13 @@ void ButtonBar::resizeEvent(TQResizeEvent *ev) { case Ideal::Left: case Ideal::Right: - preferredDimension = l->TQBoxLayout::tqminimumSize().height(); + preferredDimension = l->TQBoxLayout::minimumSize().height(); actualDimension = size().height(); oldDimension = ev->oldSize().height(); break; case Ideal::Top: case Ideal::Bottom: - preferredDimension = l->TQBoxLayout::tqminimumSize().width(); + preferredDimension = l->TQBoxLayout::minimumSize().width(); actualDimension = size().width(); oldDimension = ev->oldSize().width(); break; @@ -285,7 +285,7 @@ int ButtonBar::originalDimension() int size = 0; for (ButtonList::const_iterator it = m_buttons.constBegin(); it != m_buttons.constEnd(); ++it) { - size += (*it)->tqsizeHint((*it)->realText()).width(); + size += (*it)->sizeHint((*it)->realText()).width(); } return size; } diff --git a/src/newui/buttonbar.h b/src/newui/buttonbar.h index ce4ad23b..0da55ecd 100644 --- a/src/newui/buttonbar.h +++ b/src/newui/buttonbar.h @@ -34,12 +34,12 @@ class ButtonBar; /**@short A tqlayout for a ButtonBar class. -Overrides tqminimumSize method to allow shrinking button bar buttons.*/ +Overrides minimumSize method to allow shrinking button bar buttons.*/ class ButtonLayout: public TQBoxLayout{ public: ButtonLayout(ButtonBar *parent, Direction d, int margin = 0, int spacing = -1, const char * name = 0); - virtual TQSize tqminimumSize() const; + virtual TQSize minimumSize() const; private: ButtonBar *m_buttonBar; diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp index 9ce444eb..a4685107 100644 --- a/src/newui/ddockwindow.cpp +++ b/src/newui/ddockwindow.cpp @@ -119,9 +119,9 @@ void DDockWindow::setVisible(bool v) if (!m_visible) { if (m_position == DDockWindow::Bottom) - setFixedExtentHeight(m_internalLayout->tqsizeHint().height()); + setFixedExtentHeight(m_internalLayout->sizeHint().height()); else - setFixedExtentWidth(m_internalLayout->tqsizeHint().width()); + setFixedExtentWidth(m_internalLayout->sizeHint().width()); emit hidden(); } else @@ -130,12 +130,12 @@ void DDockWindow::setVisible(bool v) int size = 0; if (m_position == DDockWindow::Bottom) { - size = config->readNumEntry("ViewWidth", m_internalLayout->tqsizeHint().height()); + size = config->readNumEntry("ViewWidth", m_internalLayout->sizeHint().height()); setFixedExtentHeight(size); } else { - size = config->readNumEntry("ViewWidth", m_internalLayout->tqsizeHint().width()); + size = config->readNumEntry("ViewWidth", m_internalLayout->sizeHint().width()); setFixedExtentWidth(size); } } @@ -338,7 +338,7 @@ bool DDockWindow::isActive() { if (m_toggledButton) { - TQWidget *w = tqApp->tqfocusWidget(); + TQWidget *w = tqApp->focusWidget(); if (!w) return false; TQWidget *toolWidget = m_widgets[m_toggledButton]; diff --git a/src/newui/dmainwindow.cpp b/src/newui/dmainwindow.cpp index 4c787886..abb4d0ef 100644 --- a/src/newui/dmainwindow.cpp +++ b/src/newui/dmainwindow.cpp @@ -184,7 +184,7 @@ DTabWidget *DMainWindow::splitVertical() void DMainWindow::invalidateActiveTabWidget() { -/* TQWidget *focused = m_central->tqfocusWidget(); +/* TQWidget *focused = m_central->focusWidget(); kdDebug(9000) << "tqinvalidate: " << focused << endl; if (focused == 0) return; diff --git a/src/newui/docksplitter.cpp b/src/newui/docksplitter.cpp index 8b382fb7..26fd4a71 100644 --- a/src/newui/docksplitter.cpp +++ b/src/newui/docksplitter.cpp @@ -113,7 +113,7 @@ void DockSplitter::removeDock(uint row, uint col, bool alsoDelete) w->hide(); } - m_splitters[row]->setMinimumSize(m_splitters[row]->tqminimumSizeHint()); + m_splitters[row]->setMinimumSize(m_splitters[row]->minimumSizeHint()); if (isRowEmpty(row)) { diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp index 65257b1f..368b4c62 100644 --- a/src/partcontroller.cpp +++ b/src/partcontroller.cpp @@ -694,7 +694,7 @@ void PartController::integratePart(KParts::Part *part, const KURL &url, // Document object and our HTMLDocumentationPart // connect(part, TQT_SIGNAL(fileNameChanged()), this, TQT_SLOT(slotFileNameChanged())); - // Connect to the document's views newtqStatus() signal in order to keep track of the + // Connect to the document's views newStatus() signal in order to keep track of the // modified-status of the document. if (isTextEditor) @@ -718,8 +718,8 @@ void PartController::integratePart(KParts::Part *part, const KURL &url, connect(designerPart, TQT_SIGNAL(editSource(DesignerType, const TQString& )), API::getInstance()->languageSupport(), TQT_SLOT(openSource(DesignerType, const TQString& ))); - connect(designerPart, TQT_SIGNAL(newtqStatus(const TQString &, int)), - this, TQT_SLOT(slotNewDesignertqStatus(const TQString &, int))); + connect(designerPart, TQT_SIGNAL(newStatus(const TQString &, int)), + this, TQT_SLOT(slotNewDesignerStatus(const TQString &, int))); } } @@ -787,7 +787,7 @@ void PartController::integrateTextEditorPart(KTextEditor::Document* doc) TQPtrListIterator it( list ); while ( it.current() ) { - connect( it, TQT_SIGNAL( newtqStatus() ), this, TQT_SLOT( slotNewtqStatus() ) ); + connect( it, TQT_SIGNAL( newStatus() ), this, TQT_SLOT( slotNewStatus() ) ); ++it; } } @@ -1511,14 +1511,14 @@ bool PartController::reactToDirty( KURL const & url, unsigned char reason ) return true; } -void PartController::slotNewDesignertqStatus(const TQString &formName, int status) +void PartController::slotNewDesignerStatus(const TQString &formName, int status) { kdDebug(9000) << k_funcinfo << endl; kdDebug(9000) << " formName: " << formName << ", status: " << status << endl; emit documentChangedState( KURL::fromPathOrURL(formName), DocumentState(status) ); } -void PartController::slotNewtqStatus( ) +void PartController::slotNewStatus( ) { kdDebug(9000) << k_funcinfo << endl; diff --git a/src/partcontroller.h b/src/partcontroller.h index 9e563914..c811df7a 100644 --- a/src/partcontroller.h +++ b/src/partcontroller.h @@ -141,8 +141,8 @@ private slots: void slotDocumentDirty( Kate::Document * doc, bool isModified, unsigned char reason ); void slotDocumentDirtyStepTwo( void * ); - void slotNewtqStatus(); - void slotNewDesignertqStatus(const TQString &formName, int status); + void slotNewStatus(); + void slotNewDesignerStatus(const TQString &formName, int status); void textChanged(); void gotoLastEditPos(); diff --git a/src/plugincontroller.cpp b/src/plugincontroller.cpp index 5ec5a72c..e730778b 100644 --- a/src/plugincontroller.cpp +++ b/src/plugincontroller.cpp @@ -79,10 +79,10 @@ PluginController *PluginController::getInstance() PluginController::PluginController() : KDevPluginController() { -/* m_defaultProfile = TQString::tqfromLatin1( "FullIDE" ); +/* m_defaultProfile = TQString::fromLatin1( "FullIDE" ); m_defaultProfilePath = kapp->dirs()->localtdedir() + "/" + KStandardDirs::kde_default( "data" ) + - TQString::tqfromLatin1("/tdevelop/profiles/FullIDE");*/ + TQString::fromLatin1("/tdevelop/profiles/FullIDE");*/ KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); if( args->isSet("profile") ){ diff --git a/src/pluginselectdialogbase.ui b/src/pluginselectdialogbase.ui index 1f69a9ca..2cab503b 100644 --- a/src/pluginselectdialogbase.ui +++ b/src/pluginselectdialogbase.ui @@ -81,7 +81,7 @@ plugin_description_label - + 0 40 @@ -122,7 +122,7 @@ Expanding - + 191 21 diff --git a/src/profileengine/editor/profileeditor.cpp b/src/profileengine/editor/profileeditor.cpp index 99921768..9f383911 100644 --- a/src/profileengine/editor/profileeditor.cpp +++ b/src/profileengine/editor/profileeditor.cpp @@ -115,7 +115,7 @@ void ProfileEditor::refresh() void ProfileEditor::refreshPropertyCombo() { - KTrader::OfferList list = KTrader::self()->query(TQString::tqfromLatin1("KDevelop/Plugin")); + KTrader::OfferList list = KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin")); TQStringList props; for (KTrader::OfferList::const_iterator it = list.constBegin(); it != list.constEnd(); ++it) { diff --git a/src/profileengine/editor/profileeditorbase.ui b/src/profileengine/editor/profileeditorbase.ui index d66c4e31..2a420299 100644 --- a/src/profileengine/editor/profileeditorbase.ui +++ b/src/profileengine/editor/profileeditorbase.ui @@ -73,7 +73,7 @@ Expanding - + 20 142 @@ -359,7 +359,7 @@ Expanding - + 20 16 @@ -376,7 +376,7 @@ Expanding - + 20 16 @@ -401,7 +401,7 @@ Expanding - + 20 16 @@ -474,7 +474,7 @@ Expanding - + 20 16 diff --git a/src/profileengine/lib/profileengine.cpp b/src/profileengine/lib/profileengine.cpp index d21a6b58..d6be00f1 100644 --- a/src/profileengine/lib/profileengine.cpp +++ b/src/profileengine/lib/profileengine.cpp @@ -78,23 +78,23 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType if (!profile) return KTrader::OfferList(); - TQString constraint = TQString::tqfromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION); + TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION); switch (offerType) { case Global: - constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Global'"); + constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Global'"); break; case Project: - constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Project'"); + constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Project'"); break; case Core: - constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Core'"); + constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Core'"); break; } TQString constraint_add = ""; Profile::EntryList properties = profile->list(Profile::Properties); int i = 0; for (Profile::EntryList::const_iterator it = properties.begin(); it != properties.end(); ++it) - constraint_add += TQString::tqfromLatin1(" %1 '%2' in [X-KDevelop-Properties]"). + constraint_add += TQString::fromLatin1(" %1 '%2' in [X-KDevelop-Properties]"). tqarg((i++)==0?"":"or").tqarg((*it).name); if (!constraint_add.isEmpty()) constraint += " and ( " + constraint_add + " ) "; @@ -106,7 +106,7 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType << " " << constraint << endl << endl << endl;*/ //END debug - KTrader::OfferList list = KTrader::self()->query(TQString::tqfromLatin1("KDevelop/Plugin"), constraint); + KTrader::OfferList list = KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"), constraint); TQStringList names; /* Wrong, this is not what we want to do. @@ -129,9 +129,9 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType { if (names.contains((*it).name)) continue; - TQString constraint = TQString::tqfromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION); - constraint += TQString::tqfromLatin1("and [Name] == '%1'").tqarg((*it).name); - KTrader::OfferList enable = KTrader::self()->query(TQString::tqfromLatin1("KDevelop/Plugin"), constraint); + TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION); + constraint += TQString::fromLatin1("and [Name] == '%1'").tqarg((*it).name); + KTrader::OfferList enable = KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"), constraint); list += enable; } @@ -149,19 +149,19 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType KTrader::OfferList ProfileEngine::allOffers(OfferType offerType) { - TQString constraint = TQString::tqfromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION); + TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION); switch (offerType) { case Global: - constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Global'"); + constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Global'"); break; case Project: - constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Project'"); + constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Project'"); break; case Core: - constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Core'"); + constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Core'"); break; } - return KTrader::self()->query(TQString::tqfromLatin1("KDevelop/Plugin"), constraint); + return KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"), constraint); } void ProfileEngine::getProfileWithListing(ProfileListing &listing, Profile **profile, diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp index f7478e75..9694ff0d 100644 --- a/src/projectmanager.cpp +++ b/src/projectmanager.cpp @@ -411,7 +411,7 @@ bool ProjectManager::saveProjectFile() API::getInstance()->projectDom()->save(stream, 2); fout.close(); } else { - KTempFile fout(TQString::tqfromLatin1("tdevelop3")); + KTempFile fout(TQString::fromLatin1("tdevelop3")); fout.setAutoDelete(true); if (fout.status() != 0) { KMessageBox::sorry(TopLevel::getInstance()->main(), i18n("Could not write the project file.")); @@ -536,8 +536,8 @@ bool ProjectManager::loadLanguageSupport(const TQString& lang) } KTrader::OfferList languageSupportOffers = - KTrader::self()->query(TQString::tqfromLatin1("KDevelop/LanguageSupport"), - TQString::tqfromLatin1("[X-KDevelop-Language] == '%1' and [X-KDevelop-Version] == %2").tqarg(lang).tqarg(KDEVELOP_PLUGIN_VERSION)); + KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"), + TQString::fromLatin1("[X-KDevelop-Language] == '%1' and [X-KDevelop-Version] == %2").tqarg(lang).tqarg(KDEVELOP_PLUGIN_VERSION)); if (languageSupportOffers.isEmpty()) { KMessageBox::sorry(TopLevel::getInstance()->main(), diff --git a/src/settingswidget.ui b/src/settingswidget.ui index 92d4554e..3db79b51 100644 --- a/src/settingswidget.ui +++ b/src/settingswidget.ui @@ -178,7 +178,7 @@ Fixed - + 20 40 @@ -232,7 +232,7 @@ Fixed - + 16 60 @@ -333,7 +333,7 @@ Fixed - + 20 50 @@ -350,7 +350,7 @@ MinimumExpanding - + 20 16 @@ -459,7 +459,7 @@ Fixed - + 16 150 diff --git a/src/statusbar.cpp b/src/statusbar.cpp index b730d55a..31ec4f55 100644 --- a/src/statusbar.cpp +++ b/src/statusbar.cpp @@ -36,7 +36,7 @@ KDevStatusBar::KDevStatusBar(TQWidget *parent, const char *name) _status = new TQLabel( this ); _status->setMinimumWidth(_status->fontMetrics().width("Line: XXXXX Col: XXX OVR NORM * ")); - _status->tqsetAlignment(TQWidget::AlignCenter); + _status->setAlignment(TQWidget::AlignCenter); addWidget(_status, 0, true); connect(PartController::getInstance(), TQT_SIGNAL(activePartChanged(KParts::Part*)), @@ -61,7 +61,7 @@ void KDevStatusBar::activePartChanged(KParts::Part *part) if ((_viewmsgIface = dynamic_cast(part->widget()))) { connect( part->widget(), TQT_SIGNAL( viewStatusMsg( const TQString & ) ), - this, TQT_SLOT( settqStatus( const TQString & ) ) ); + this, TQT_SLOT( setStatus( const TQString & ) ) ); _status->show(); } @@ -90,7 +90,7 @@ void KDevStatusBar::cursorPositionChanged() } } -void KDevStatusBar::settqStatus(const TQString &str) +void KDevStatusBar::setStatus(const TQString &str) { _status->setText(str); } @@ -105,8 +105,8 @@ void KDevStatusBar::addWidget ( TQWidget *widget, int stretch, bool permanent) { KStatusBar::addWidget(widget,stretch,permanent); - if(widget->tqsizeHint().height() + 4 > height()) - setFixedHeight(widget->tqsizeHint().height() + 4); + if(widget->sizeHint().height() + 4 > height()) + setFixedHeight(widget->sizeHint().height() + 4); } #include "statusbar.moc" diff --git a/src/statusbar.h b/src/statusbar.h index c17392e8..a17ef3a9 100644 --- a/src/statusbar.h +++ b/src/statusbar.h @@ -22,7 +22,7 @@ namespace KTextEditor { class ViewCursorInterface; } namespace KParts { class Part; } /** -tqStatus bar. +Status bar. */ class KDevStatusBar : public KStatusBar { @@ -37,7 +37,7 @@ public: private slots: void cursorPositionChanged(); void activePartChanged(KParts::Part *part); - void settqStatus(const TQString &str); + void setStatus(const TQString &str); void setCursorPosition(int line, int col); private: -- cgit v1.2.3