diff options
Diffstat (limited to 'src')
58 files changed, 622 insertions, 600 deletions
diff --git a/src/core.cpp b/src/core.cpp index c189fcf8..6dc493bf 100644 --- a/src/core.cpp +++ b/src/core.cpp @@ -46,7 +46,7 @@ void Core::setupShourtcutTips(KXMLGUIClient * client) if (tooltip.isEmpty()) tooltip = action->text().remove('&'); else { - int i = tooltip.findRev('('); + int i = tooltip.tqfindRev('('); if (i > 0) tooltip = tooltip.left(i).stripWhiteSpace(); } @@ -109,8 +109,8 @@ namespace MainWindowUtils{ TQString beautifyToolTip(const TQString& text) { TQString temp = text; - temp.replace(TQRegExp("&"), ""); - temp.replace(TQRegExp("\\.\\.\\."), ""); + temp.tqreplace(TQRegExp("&"), ""); + temp.tqreplace(TQRegExp("\\.\\.\\."), ""); return temp; } } @@ -20,6 +20,7 @@ Core implementation. class Core : public KDevCore { Q_OBJECT + TQ_OBJECT public: @@ -27,7 +28,7 @@ public: /** * Setup shourtcut tips. For every KAction with a shortcut, - * appends the shortcut string, in parenthesis, to the + * appends the shortcut string, in tqparenthesis, to the * actions's tooltip. If tooltip already has any text in * parens, it's removed and shortcut is added instead. * diff --git a/src/documentationpart.h b/src/documentationpart.h index b992bbf0..0603715f 100644 --- a/src/documentationpart.h +++ b/src/documentationpart.h @@ -11,6 +11,7 @@ Implements shell-dependent "duplicate" and "open in new window" actions of KDevH class HTMLDocumentationPart : public KDevHTMLPart { Q_OBJECT + TQ_OBJECT public: diff --git a/src/editorproxy.cpp b/src/editorproxy.cpp index a0c42da3..0cf0e3f1 100644 --- a/src/editorproxy.cpp +++ b/src/editorproxy.cpp @@ -82,7 +82,7 @@ void EditorProxy::setLineNumber(KParts::Part *part, int lineNum, int col) { #if KDE_IS_VERSION(3,5,5) #else - if (!part->widget()->hasFocus()) //workaround for QXIMInputContext crashes. Keep for KDE <=3.5.4! + if (!part->widget()->hasFocus()) //workaround for TQXIMInputContext crashes. Keep for KDE <=3.5.4! { m_delayedPart = part; m_delayedLine = lineNum; @@ -163,9 +163,9 @@ void EditorProxy::popupAboutToShow() for (int index=popup->count()-1; index >= 0; --index) { int id = popup->idAt(index); - if (m_popupIds.contains(id) == 0) + if (m_popupIds.tqcontains(id) == 0) { - TQMenuItem *item = popup->findItem(id); + TQMenuItem *item = popup->tqfindItem(id); if ( item && item->popup() ) delete item->popup(); else @@ -182,7 +182,7 @@ void EditorProxy::popupAboutToShow() TQString wordstr; TQString selection = KDevEditorUtil::currentSelection( doc ); - if ( !selection.isEmpty() && selection.contains('\n') != 0 ) + if ( !selection.isEmpty() && selection.tqcontains('\n') != 0 ) { wordstr = selection; } @@ -201,7 +201,7 @@ void EditorProxy::popupAboutToShow() for( uint i = 0; i < popup->count(); ) { int id = popup->idAt( i ); - if( lastWasSeparator && popup->findItem( id )->isSeparator() ) + if( lastWasSeparator && popup->tqfindItem( id )->isSeparator() ) { popup->removeItem( id ); // Since we removed an item, don't increment i diff --git a/src/editorproxy.h b/src/editorproxy.h index b505656f..37cbefc8 100644 --- a/src/editorproxy.h +++ b/src/editorproxy.h @@ -15,9 +15,10 @@ class TQTimer; #include <kdeversion.h> # include <ktexteditor/markinterfaceextension.h> -class EditorProxy : public QObject +class EditorProxy : public TQObject { Q_OBJECT + TQ_OBJECT public: diff --git a/src/generalinfowidget.cpp b/src/generalinfowidget.cpp index fdc53eff..e1257537 100644 --- a/src/generalinfowidget.cpp +++ b/src/generalinfowidget.cpp @@ -29,8 +29,8 @@ TQString makeRelativePath(const TQString& fromPath, const TQString& toPath); -GeneralInfoWidget::GeneralInfoWidget(TQDomDocument &projectDom, TQWidget *parent, const char *name) - : GeneralInfoWidgetBase(parent, name), m_projectDom(projectDom) { +GeneralInfoWidget::GeneralInfoWidget(TQDomDocument &projectDom, TQWidget *tqparent, const char *name) + : GeneralInfoWidgetBase(tqparent, name), m_projectDom(projectDom) { connect(project_directory_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotProjectDirectoryChanged(const TQString&))); @@ -65,8 +65,8 @@ void GeneralInfoWidget::readConfig() { } encoding_combo->setCurrentItem( 0 ); -// const TQString DefaultEncoding = KGlobal::charsets()->encodingForName( DomUtil::readEntry( m_projectDom, "/general/defaultencoding", TQString::null ) ); - const TQString DefaultEncoding = DomUtil::readEntry( m_projectDom, "/general/defaultencoding", TQString::null ); +// const TQString DefaultEncoding = KGlobal::charsets()->encodingForName( DomUtil::readEntry( m_projectDom, "/general/defaultencoding", TQString() ) ); + const TQString DefaultEncoding = DomUtil::readEntry( m_projectDom, "/general/defaultencoding", TQString() ); for ( int i = 0; i < encoding_combo->count(); i++ ) { if ( KGlobal::charsets()->encodingForName( encoding_combo->text( i ) ) == DefaultEncoding ) @@ -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.").arg(configureinpath)); + KMessageBox::error(this, i18n("Could not open %1 for reading.").tqarg(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.").arg(configureinpath)); + KMessageBox::error(this, i18n("Could not open %1 for writing.").tqarg(configureinpath)); return ; } TQTextStream output( &configureout); @@ -189,7 +189,7 @@ void GeneralInfoWidget::writeConfig() { DomUtil::writeEntry(m_projectDom,"/general/version",version_edit->text()); DomUtil::writeEntry(m_projectDom,"/general/description",description_edit->text()); - TQString DefaultEncoding = TQString::null; + TQString DefaultEncoding = TQString(); if ( encoding_combo->currentItem() > 0 ) { DefaultEncoding = KGlobal::charsets()->encodingForName( encoding_combo->currentText() ); @@ -217,13 +217,13 @@ void GeneralInfoWidget::slotProjectDirectoryChanged( const TQString& text ) { else if(isProjectDirectoryAbsolute() && text[0] != '/') { setProjectDirectoryError( - i18n("'%1' is not an absolute path.").arg( + i18n("'%1' is not an absolute path.").tqarg( project_directory_edit->text())); } else if(!isProjectDirectoryAbsolute() && text[0] == '/') { setProjectDirectoryError( - i18n("'%1' is not a relative path.").arg( + i18n("'%1' is not a relative path.").tqarg( 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.").arg( + i18n("'%1' does not exist.").tqarg( project_directory_edit->text())); else if(!info.isDir()) setProjectDirectoryError( - i18n("'%1' is not a directory.").arg( + i18n("'%1' is not a directory.").tqarg( 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.").arg(projectDirectory())); + i18n("'%1' is a valid project directory.").tqarg(projectDirectory())); else project_directory_diagnostic_label->setText( - i18n("'%1' is a valid project directory.").arg(projectDirectory())); + i18n("'%1' is a valid project directory.").tqarg(projectDirectory())); } TQString makeRelativePath(const TQString& fromPath, const TQString& toPath) diff --git a/src/generalinfowidget.h b/src/generalinfowidget.h index bb59bc5c..85f926e5 100644 --- a/src/generalinfowidget.h +++ b/src/generalinfowidget.h @@ -23,10 +23,11 @@ General project information widget. */ class GeneralInfoWidget : public GeneralInfoWidgetBase { Q_OBJECT + TQ_OBJECT public: - GeneralInfoWidget(TQDomDocument &projectDom, TQWidget *parent=0, const char *name=0); + GeneralInfoWidget(TQDomDocument &projectDom, TQWidget *tqparent=0, const char *name=0); ~GeneralInfoWidget(); public slots: diff --git a/src/generalinfowidgetbase.ui b/src/generalinfowidgetbase.ui index 370c42e4..9d515c0e 100644 --- a/src/generalinfowidgetbase.ui +++ b/src/generalinfowidgetbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>GeneralInfoWidgetBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>general_info_widget</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="0" column="4"> + <widget class="TQComboBox" row="0" column="4"> <item> <property name="text"> <string>Absolute Path</string> @@ -44,14 +44,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>408</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="5" column="0" rowspan="1" colspan="5"> + <widget class="TQLabel" row="5" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>description_label</cstring> </property> @@ -59,7 +59,7 @@ <string>Description:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>project_directory_label</cstring> </property> @@ -67,7 +67,7 @@ <string>Project directory:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>author_label</cstring> </property> @@ -75,7 +75,7 @@ <string>Author:</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>email_label</cstring> </property> @@ -83,7 +83,7 @@ <string>Email:</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>version_label</cstring> </property> @@ -103,7 +103,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>100</width> <height>32767</height> @@ -133,7 +133,7 @@ Placed in the AUTHORS file</string> Placed in the AUTHORS file</string> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>project_directory_diagnostic_icon</cstring> </property> @@ -145,13 +145,13 @@ Placed in the AUTHORS file</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>16</width> <height>16</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>16</width> <height>16</height> @@ -189,7 +189,7 @@ Placed in the AUTHORS file</string> <string>Please select a project directory</string> </property> </widget> - <widget class="QLabel" row="7" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="7" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -197,7 +197,7 @@ Placed in the AUTHORS file</string> <string>Default encoding:</string> </property> </widget> - <widget class="QComboBox" row="7" column="2" rowspan="1" colspan="2"> + <widget class="TQComboBox" row="7" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>encoding_combo</cstring> </property> @@ -205,7 +205,7 @@ Placed in the AUTHORS file</string> <string>Default encoding used when opening text files</string> </property> </widget> - <widget class="QTextEdit" row="6" column="0" rowspan="1" colspan="5"> + <widget class="TQTextEdit" row="6" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>description_edit</cstring> </property> @@ -233,8 +233,8 @@ Placed in the AUTHORS file</string> <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in declaration">ksqueezedtextlabel.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/src/kdevideextension.cpp b/src/kdevideextension.cpp index 0c35de83..432ab2df 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::fromLatin1("konsole") ) ); + gsw->terminalEdit->setText( config->readEntry( "TerminalApplication", TQString::tqfromLatin1("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 6c6bd357..e2af092e 100644 --- a/src/languageselectwidget.cpp +++ b/src/languageselectwidget.cpp @@ -32,13 +32,13 @@ #include "languageselectwidget.h" #include "plugincontroller.h" -class LangPluginItem : public QCheckListItem +class LangPluginItem : public TQCheckListItem { public: // name - "Name", label - "GenericName", info - "Comment" - LangPluginItem( TQListView * parent, TQString const & name, TQString const & label, + LangPluginItem( TQListView * tqparent, TQString const & name, TQString const & label, TQString const & info ) - : TQCheckListItem( parent, label, TQCheckListItem::CheckBox), + : TQCheckListItem( tqparent, label, TQCheckListItem::CheckBox), _name( name ), _info( info ) {} @@ -52,22 +52,22 @@ private: LanguageSelectWidget::LanguageSelectWidget(TQDomDocument &projectDom, - TQWidget *parent, const char *name) - : TQWidget(parent, name), m_projectDom(projectDom) + TQWidget *tqparent, const char *name) + : TQWidget(tqparent, name), m_projectDom(projectDom) { init(); } void LanguageSelectWidget::init() { - TQVBoxLayout *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); TQGroupBox * groupBox1 = new TQGroupBox( i18n("Additional Language Support"), this ); groupBox1->setColumnLayout(0, Qt::Vertical ); - groupBox1->layout()->setSpacing( 6 ); - groupBox1->layout()->setMargin( 11 ); - TQVBoxLayout * groupBox1Layout = new TQVBoxLayout( groupBox1->layout() ); - groupBox1Layout->setAlignment( Qt::AlignTop ); + groupBox1->tqlayout()->setSpacing( 6 ); + groupBox1->tqlayout()->setMargin( 11 ); + TQVBoxLayout * groupBox1Layout = new TQVBoxLayout( groupBox1->tqlayout() ); + groupBox1Layout->tqsetAlignment( TQt::AlignTop ); _currentLanguage = new TQLabel( "", groupBox1 ); @@ -78,21 +78,21 @@ void LanguageSelectWidget::init() groupBox1Layout->addWidget(_currentLanguage); groupBox1Layout->addWidget( _pluginList ); - layout->addWidget( groupBox1 ); + tqlayout->addWidget( groupBox1 ); TQGroupBox * groupBox2 = new TQGroupBox( i18n("Description"), this ); groupBox2->setColumnLayout(0, Qt::Vertical ); - groupBox2->layout()->setSpacing( 6 ); - groupBox2->layout()->setMargin( 11 ); - TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->layout() ); - groupBox2Layout->setAlignment( Qt::AlignTop ); + groupBox2->tqlayout()->setSpacing( 6 ); + groupBox2->tqlayout()->setMargin( 11 ); + TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->tqlayout() ); + groupBox2Layout->tqsetAlignment( TQt::AlignTop ); _pluginDescription = new TQLabel( groupBox2 ); - _pluginDescription->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); + _pluginDescription->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); groupBox2Layout->addWidget( _pluginDescription ); - layout->addWidget( groupBox2 ); + tqlayout->addWidget( groupBox2 ); connect( _pluginList, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this, TQT_SLOT( itemSelected( TQListViewItem * ) ) ); @@ -106,13 +106,13 @@ LanguageSelectWidget::~LanguageSelectWidget() void LanguageSelectWidget::readProjectConfig() { KTrader::OfferList languageSupportOffers = - KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"), - TQString::fromLatin1("[X-KDevelop-Version] == %1" - ).arg( KDEVELOP_PLUGIN_VERSION )); + KTrader::self()->query(TQString::tqfromLatin1("KDevelop/LanguageSupport"), + TQString::tqfromLatin1("[X-KDevelop-Version] == %1" + ).tqarg( 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.").arg(language)); + _currentLanguage->setText(i18n("Primary language is '%1'. Please select additional languages the project might contain.").tqarg(language)); for (KTrader::OfferList::ConstIterator it = languageSupportOffers.begin(); it != languageSupportOffers.end(); ++it) { @@ -120,7 +120,7 @@ void LanguageSelectWidget::readProjectConfig() if (la == language) continue; LangPluginItem *item = new LangPluginItem( _pluginList, (*it)->property("X-KDevelop-Language").toString(), (*it)->genericName(), (*it)->comment() ); - item->setOn(languages.contains(la)); + item->setOn(languages.tqcontains(la)); } TQListViewItem * first = _pluginList->firstChild(); diff --git a/src/languageselectwidget.h b/src/languageselectwidget.h index 95c349f7..9e7e31de 100644 --- a/src/languageselectwidget.h +++ b/src/languageselectwidget.h @@ -18,13 +18,14 @@ class TQListView; -class LanguageSelectWidget : public QWidget +class LanguageSelectWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: /* for selection of project parts */ - LanguageSelectWidget( TQDomDocument &projectDom, TQWidget *parent=0, const char *name=0 ); + LanguageSelectWidget( TQDomDocument &projectDom, TQWidget *tqparent=0, const char *name=0 ); ~LanguageSelectWidget(); public slots: diff --git a/src/main.cpp b/src/main.cpp index 467724d1..d47d7257 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -47,13 +47,13 @@ int main(int argc, char *argv[]) aboutData.addAuthor("Matthias Hoelzer-Kluepfel", I18N_NOOP("Several components, htdig indexing"), "hoelzer@kde.org"); aboutData.addAuthor("Victor Roeder", I18N_NOOP("Help with Automake manager and persistent class store"), "victor_roeder@gmx.de"); aboutData.addAuthor("Megan Webb", I18N_NOOP("Automake manager patches, Astyle plugin update, plugin patches and improvements"),"kdeveloper.megan@gmail.com"); - aboutData.addAuthor("Harald Fernengel", I18N_NOOP("Ported to Qt 3, patches, valgrind, diff and perforce support"), "harry@kdevelop.org"); - aboutData.addAuthor("Roberto Raggi", I18N_NOOP("QEditor component, code completion, Abbrev component, C++ support, Java support"), "roberto@kdevelop.org"); + aboutData.addAuthor("Harald Fernengel", I18N_NOOP("Ported to TQt 3, patches, valgrind, diff and perforce support"), "harry@kdevelop.org"); + aboutData.addAuthor("Roberto Raggi", I18N_NOOP("TQEditor component, code completion, Abbrev component, C++ support, Java support"), "roberto@kdevelop.org"); aboutData.addAuthor("Simon Hausmann", I18N_NOOP("Help with KParts infrastructure"), "hausmann@kde.org"); aboutData.addAuthor("Oliver Kellogg", I18N_NOOP("Ada support"), "okellogg@users.sourceforge.net"); - aboutData.addAuthor("Andreas Pakulat", I18N_NOOP("QMake projectmanager, Qt4 Support"), "apaku@gmx.de"); - aboutData.addAuthor("Jakob Simon-Gaarde", I18N_NOOP("QMake projectmanager"), "jsgaarde@tdcspace.dk"); - aboutData.addAuthor("F@lk Brettschneider", I18N_NOOP("MDI modes, QEditor, bugfixes"), "falkbr@kdevelop.org"); + aboutData.addAuthor("Andreas Pakulat", I18N_NOOP("TQMake projectmanager, TQt4 Support"), "apaku@gmx.de"); + aboutData.addAuthor("Jakob Simon-Gaarde", I18N_NOOP("TQMake projectmanager"), "jsgaarde@tdcspace.dk"); + aboutData.addAuthor("F@lk Brettschneider", I18N_NOOP("MDI modes, TQEditor, bugfixes"), "falkbr@kdevelop.org"); aboutData.addAuthor("Mario Scalas", I18N_NOOP("PartExplorer, redesign of CvsPart, patches, bugs(fixes)"), "mario.scalas@libero.it"); aboutData.addAuthor("Jens Dagerbo", I18N_NOOP("Replace, Bookmarks, FileList and CTags2 plugins. Overall improvements and patches"), "jens.dagerbo@swipnet.se"); aboutData.addAuthor("Julian Rockey", I18N_NOOP("Filecreate part and other bits and patches"), "linux@jrockey.com"); @@ -75,7 +75,7 @@ int main(int argc, char *argv[]) aboutData.addCredit("Marcel Turino", I18N_NOOP("Documentation index view"), "M.Turino@gmx.de"); aboutData.addCredit("Yann Hodique", I18N_NOOP("Patches"), "Yann.Hodique@lifl.fr"); aboutData.addCredit("Tobias Gl\303\244\303\237er" , I18N_NOOP("Documentation Finder, qmake projectmanager patches, usability improvements, bugfixes ... "), "tobi.web@gmx.de"); - aboutData.addCredit("Andreas Koepfle" , I18N_NOOP("QMake project manager patches"), "koepfle@ti.uni-mannheim.de"); + aboutData.addCredit("Andreas Koepfle" , I18N_NOOP("TQMake project manager patches"), "koepfle@ti.uni-mannheim.de"); aboutData.addCredit("Sascha Cunz" , I18N_NOOP("Cleanup and bugfixes for qEditor, AutoMake and much other stuff"), "sascha@kdevelop.org"); aboutData.addCredit("Robert Gruber" , I18N_NOOP("SnippetPart, debugger and usability patches"), "rgruber@users.sourceforge.net"); aboutData.addCredit("Zoran Karavla", I18N_NOOP("Artwork for the Ruby language"), "webmaster@the-error.net", "http://the-error.net"); diff --git a/src/main_assistant.cpp b/src/main_assistant.cpp index d851447f..f9d87b84 100644 --- a/src/main_assistant.cpp +++ b/src/main_assistant.cpp @@ -44,12 +44,12 @@ int main(int argc, char *argv[]) aboutData.addAuthor("Ian Reinhart Geiser", I18N_NOOP("Dist part, bash support, application templates"), "geiseri@yahoo.com"); aboutData.addAuthor("Matthias Hoelzer-Kluepfel", I18N_NOOP("Several components, htdig indexing"), "hoelzer@kde.org"); aboutData.addAuthor("Victor Roeder", I18N_NOOP("Help with Automake manager and persistent class store"), "victor_roeder@gmx.de"); - aboutData.addAuthor("Harald Fernengel", I18N_NOOP("Ported to Qt 3, patches, valgrind, diff and perforce support"), "harry@kdevelop.org"); - aboutData.addAuthor("Roberto Raggi", I18N_NOOP("QEditor component, code completion, Abbrev component, C++ support, Java support"), "roberto@kdevelop.org"); + aboutData.addAuthor("Harald Fernengel", I18N_NOOP("Ported to TQt 3, patches, valgrind, diff and perforce support"), "harry@kdevelop.org"); + aboutData.addAuthor("Roberto Raggi", I18N_NOOP("TQEditor component, code completion, Abbrev component, C++ support, Java support"), "roberto@kdevelop.org"); aboutData.addAuthor("Simon Hausmann", I18N_NOOP("Help with KParts infrastructure"), "hausmann@kde.org"); aboutData.addAuthor("Oliver Kellogg", I18N_NOOP("Ada support"), "okellogg@users.sourceforge.net"); - aboutData.addAuthor("Jakob Simon-Gaarde", I18N_NOOP("QMake projectmanager"), "jsgaarde@tdcspace.dk"); - aboutData.addAuthor("F@lk Brettschneider", I18N_NOOP("MDI modes, QEditor, bugfixes"), "falkbr@kdevelop.org"); + aboutData.addAuthor("Jakob Simon-Gaarde", I18N_NOOP("TQMake projectmanager"), "jsgaarde@tdcspace.dk"); + aboutData.addAuthor("F@lk Brettschneider", I18N_NOOP("MDI modes, TQEditor, bugfixes"), "falkbr@kdevelop.org"); aboutData.addAuthor("Mario Scalas", I18N_NOOP("PartExplorer, redesign of CvsPart, patches, bugs(fixes)"), "mario.scalas@libero.it"); aboutData.addAuthor("Jens Dagerbo", I18N_NOOP("Replace, Bookmarks, FileList and CTags2 plugins. Overall improvements and patches"), "jens.dagerbo@swipnet.se"); aboutData.addAuthor("Julian Rockey", I18N_NOOP("Filecreate part and other bits and patches"), "linux@jrockey.com"); @@ -71,7 +71,7 @@ int main(int argc, char *argv[]) aboutData.addCredit("Marcel Turino", I18N_NOOP("Documentation index view"), "M.Turino@gmx.de"); aboutData.addCredit("Yann Hodique", I18N_NOOP("Patches"), "Yann.Hodique@lifl.fr"); aboutData.addCredit("Tobias Gl\303\244\303\237er" , I18N_NOOP("Documentation Finder, qmake projectmanager patches, usability improvements, bugfixes ... "), "tobi.web@gmx.de"); - aboutData.addCredit("Andreas Koepfle" , I18N_NOOP("QMake project manager patches"), "koepfle@ti.uni-mannheim.de"); + aboutData.addCredit("Andreas Koepfle" , I18N_NOOP("TQMake project manager patches"), "koepfle@ti.uni-mannheim.de"); aboutData.addCredit("Sascha Cunz" , I18N_NOOP("Cleanup and bugfixes for qEditor, AutoMake and much other stuff"), "mail@sacu.de"); KCmdLineArgs::init(argc, argv, &aboutData); diff --git a/src/mainwindowshare.cpp b/src/mainwindowshare.cpp index b725db23..8e39a63d 100644 --- a/src/mainwindowshare.cpp +++ b/src/mainwindowshare.cpp @@ -105,7 +105,7 @@ void MainWindowShare::createActions() { ProjectManager::getInstance()->createActions( m_pMainWnd->actionCollection() ); - KStdAction::quit(this->parent(), TQT_SLOT(close()), m_pMainWnd->actionCollection()); + KStdAction::quit(this->tqparent(), TQT_SLOT(close()), m_pMainWnd->actionCollection()); KAction* action; @@ -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("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you switch the menubar on/off."))); + action->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(beautifyToolTip(action->text())).tqarg(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("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure shortcut keys."))); + action->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(beautifyToolTip(action->text())).tqarg(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("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure toolbars."))); + action->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(beautifyToolTip(action->text())).tqarg(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("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure system notifications."))); + action->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(beautifyToolTip(action->text())).tqarg(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("<b>%1</b><p>%2").arg(i18n( "Configure KDevelop" )).arg(i18n("Lets you customize KDevelop."))); + action->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(i18n( "Configure KDevelop" )).tqarg(i18n("Lets you customize KDevelop."))); m_toggleStatusbar = KStdAction::showToolbar(this, TQT_SLOT(slotToggleStatusbar()),m_pMainWnd->actionCollection(), "settings_statusbar"); m_toggleStatusbar->setText(i18n("Show &Statusbar")); @@ -439,7 +439,7 @@ void MainWindowShare::contextMenu(TQPopupMenu* popup, const Context *) return; int id = popup->insertItem( i18n("Show &Menubar"), m_pMainWnd->menuBar(), TQT_SLOT(show()) ); - popup->setWhatsThis(id, i18n("<b>Show menubar</b><p>Lets you switch the menubar on/off.")); + popup->TQMenuData::setWhatsThis(id, i18n("<b>Show menubar</b><p>Lets you switch the menubar on/off.")); } void MainWindowShare::slotActivePartChanged( KParts::Part * part ) diff --git a/src/mainwindowshare.h b/src/mainwindowshare.h index 72a4b5ea..f56d0201 100644 --- a/src/mainwindowshare.h +++ b/src/mainwindowshare.h @@ -27,9 +27,10 @@ namespace KParts { /** Shared main window functionality. */ -class MainWindowShare : public QObject +class MainWindowShare : public TQObject { Q_OBJECT + TQ_OBJECT public: MainWindowShare(TQObject* pParent = 0L, const char* name = 0L); ~MainWindowShare() {} diff --git a/src/mimewarningdialog.ui b/src/mimewarningdialog.ui index 21fdbee4..2c44566c 100644 --- a/src/mimewarningdialog.ui +++ b/src/mimewarningdialog.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>MimeWarningDialog</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>MimeWarningDialog</cstring> </property> @@ -27,7 +27,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>text1</cstring> </property> @@ -59,7 +59,7 @@ <string>Some URL</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>text3</cstring> </property> @@ -75,7 +75,7 @@ <string><qt>No suitable viewer was found for the <b>%1</b> mimetype.</qt></string> </property> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -103,7 +103,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>open_with_kde</cstring> </property> @@ -114,7 +114,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>open_as_text</cstring> </property> @@ -122,9 +122,9 @@ <string>Open it in KDevelop as plain text</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -140,14 +140,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>24</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>always_open_as_text</cstring> </property> @@ -168,7 +168,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>20</height> @@ -179,9 +179,9 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -197,14 +197,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>101</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pushButton1</cstring> </property> @@ -212,7 +212,7 @@ <string>&OK</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pushButton2</cstring> </property> @@ -250,5 +250,5 @@ <slot>accept()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/src/multibuffer.cpp b/src/multibuffer.cpp index bd5942fc..4960d870 100644 --- a/src/multibuffer.cpp +++ b/src/multibuffer.cpp @@ -45,8 +45,8 @@ #include <ktexteditor/document.h> #include <ktexteditor/viewcursorinterface.h> -MultiBuffer::MultiBuffer( TQWidget *parent ) - : TQSplitter( parent, "MultiBuffer" ), +MultiBuffer::MultiBuffer( TQWidget *tqparent ) + : TQSplitter( tqparent, "MultiBuffer" ), m_editorFactory( 0 ), m_delayActivate( false ), m_activated( false ), @@ -84,7 +84,7 @@ KParts::Part *MultiBuffer::activeBuffer( ) const bool MultiBuffer::hasURL( const KURL &url ) const { - return m_buffers.contains( url ); + return m_buffers.tqcontains( url ); } int MultiBuffer::numberOfBuffers() const @@ -124,7 +124,7 @@ KParts::Part* MultiBuffer::openURL( const KURL &url ) bool MultiBuffer::closeURL( const KURL &url ) { - if ( !m_buffers.contains( url ) ) + if ( !m_buffers.tqcontains( url ) ) return false; bool result = false; @@ -147,7 +147,7 @@ void MultiBuffer::registerURL( const KURL &url, KParts::Part *part ) void MultiBuffer::registerDelayedActivation( KParts::Part *part, int line, int col ) { - m_delayedActivation[ part ] = qMakePair( line, col ); + m_delayedActivation[ part ] = tqMakePair( line, col ); } KParts::Part* MultiBuffer::createPart( const TQString &mimeType, @@ -219,7 +219,7 @@ void MultiBuffer::show() KTextEditor::View *view = document->createView( this ); document->setWidget( view ); - // We're managing the view deletion by being its parent, + // We're managing the view deletion by being its tqparent, // don't let the part self-destruct disconnect( view, TQT_SIGNAL( destroyed() ), document, TQT_SLOT( slotWidgetDestroyed() ) ); @@ -256,7 +256,7 @@ void MultiBuffer::setOrientation( Qt::Orientation orientation ) void MultiBuffer::activePartChanged( const KURL &url ) { - if ( !m_buffers.contains( url ) ) + if ( !m_buffers.tqcontains( url ) ) return ; m_activeBuffer = m_buffers[ url ]; @@ -300,4 +300,4 @@ void MultiBuffer::updateUrlForPart(KParts::Part *part, KURL url) #include "multibuffer.moc" -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on diff --git a/src/multibuffer.h b/src/multibuffer.h index a481574f..f6f40ea6 100644 --- a/src/multibuffer.h +++ b/src/multibuffer.h @@ -35,13 +35,14 @@ class ReadOnlyPart; class KURL; typedef TQMap< KURL, KParts::Part* > BufferMap; -typedef TQMap< KParts::Part*, QPair<int, int> > ActivationMap; +typedef TQMap< KParts::Part*, TQPair<int, int> > ActivationMap; -class MultiBuffer : public QSplitter +class MultiBuffer : public TQSplitter { Q_OBJECT + TQ_OBJECT public: - MultiBuffer( TQWidget * parent = 0 ); + MultiBuffer( TQWidget * tqparent = 0 ); virtual ~MultiBuffer(); KParts::Part *activeBuffer() const; @@ -54,7 +55,7 @@ public: KParts::Part* createPart( const TQString &mimeType, const TQString &partType, const TQString &className, - const TQString &preferredName = TQString::null ); + const TQString &preferredName = TQString() ); KParts::Part* openURL( const KURL &url ); bool closeURL( const KURL &url ); @@ -86,4 +87,4 @@ private: #endif -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on diff --git a/src/newui/button.cpp b/src/newui/button.cpp index 0631510e..1795b18a 100644 --- a/src/newui/button.cpp +++ b/src/newui/button.cpp @@ -39,32 +39,32 @@ namespace Ideal { -Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon, +Button::Button(ButtonBar *tqparent, const TQString text, const TQIconSet &icon, const TQString &description) - :TQPushButton(icon, text, parent), m_buttonBar(parent), m_description(description), - m_place(parent->place()), m_realText(text), m_realIconSet(icon) + :TQPushButton(icon, text, tqparent), m_buttonBar(tqparent), m_description(description), + m_place(tqparent->place()), m_realText(text), m_realIconSet(icon) { hide(); setFlat(true); setToggleButton(true); - setFocusPolicy(NoFocus); + setFocusPolicy(TQ_NoFocus); setDescription(m_description); - setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); - resize(sizeHint()); + tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + resize(tqsizeHint()); fixDimensions(Ideal::Bottom); TQToolTip::add(this, m_realText); m_assignAccelAction = new KAction(i18n("Assign Accelerator..."), 0, - this, TQT_SLOT(assignAccel()), this); + TQT_TQOBJECT(this), TQT_SLOT(assignAccel()), TQT_TQOBJECT(this)); m_clearAccelAction = new KAction(i18n("Clear Accelerator"), 0, - this, TQT_SLOT(clearAccel()), this); + TQT_TQOBJECT(this), TQT_SLOT(clearAccel()), TQT_TQOBJECT(this)); KConfig *config = kapp->config(); config->setGroup("UI"); - TQString accel = config->readEntry(TQString("button_%1").arg(text), ""); + TQString accel = config->readEntry(TQString("button_%1").tqarg(text), ""); if (!accel.isEmpty()) - setRealText(TQString("&%1 %2").arg(accel).arg(m_realText)); + setRealText(TQString("&%1 %2").tqarg(accel).tqarg(m_realText)); } Button::~Button() @@ -78,13 +78,13 @@ Button::~Button() if (r.search(m_realText) > -1) { TQString text = m_realText; - if (text.contains(r2)) + if (text.tqcontains(r2)) text.remove(r2); - config->writeEntry(TQString("button_%1").arg(text), r.cap(1)); + config->writeEntry(TQString("button_%1").tqarg(text), r.cap(1)); } else { - config->writeEntry(TQString("button_%1").arg(m_realText), ""); + config->writeEntry(TQString("button_%1").tqarg(m_realText), ""); } } @@ -131,11 +131,11 @@ void Button::drawButton(TQPainter *p) pm.fill(eraseColor()); TQPainter p2(&pm); - style().drawControl(TQStyle::CE_PushButton,&p2,this, TQRect(0,0,pm.width(),pm.height()), colorGroup(),flags); + tqstyle().tqdrawControl(TQStyle::CE_PushButton,&p2,this, TQRect(0,0,pm.width(),pm.height()), tqcolorGroup(),flags); - style().drawControl(TQStyle::CE_PushButtonLabel, &p2, this, + tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel, &p2, this, TQRect(0,0,pm.width(),pm.height()), - colorGroup(), flags, TQStyleOption()); + tqcolorGroup(), flags, TQStyleOption()); switch (m_place) { @@ -178,7 +178,7 @@ void Button::fixDimensions(Place oldPlace) if ((oldPlace == Ideal::Bottom) || (oldPlace == Ideal::Top)) { setFixedWidth(height()); - setMinimumHeight(sizeHint().width()); + setMinimumHeight(tqsizeHint().width()); setMaximumHeight(32767); } break; @@ -187,19 +187,19 @@ void Button::fixDimensions(Place oldPlace) if ((oldPlace == Ideal::Left) || (oldPlace == Ideal::Right)) { setFixedHeight(width()); - setMinimumWidth(sizeHint().height()); + setMinimumWidth(tqsizeHint().height()); setMaximumWidth(32767); } break; } } -TQSize Button::sizeHint() const +TQSize Button::tqsizeHint() const { - return sizeHint(text()); + return tqsizeHint(text()); } -TQSize Button::sizeHint(const TQString &text) const +TQSize Button::tqsizeHint(const TQString &text) const { constPolish(); int w = 0, h = 0; @@ -208,10 +208,10 @@ TQSize Button::sizeHint(const TQString &text) const int iw = iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4; int ih = iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).height(); w += iw; - h = QMAX( h, ih ); + h = TQMAX( h, ih ); } if ( isMenuButton() ) - w += style().pixelMetric(TQStyle::PM_MenuButtonIndicator, this); + w += tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator, this); if ( pixmap() ) { TQPixmap *pm = (TQPixmap *)pixmap(); w += pm->width(); @@ -220,16 +220,16 @@ TQSize Button::sizeHint(const TQString &text) const TQString s( text ); bool empty = s.isEmpty(); if ( empty ) - s = TQString::fromLatin1("XXXX"); + s = TQString::tqfromLatin1("XXXX"); TQFontMetrics fm = fontMetrics(); TQSize sz = fm.size( ShowPrefix, s ); if(!empty || !w) w += sz.width(); if(!empty || !h) - h = QMAX(h, sz.height()); + h = TQMAX(h, sz.height()); } - return (style().sizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). + return (tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). expandedTo(TQApplication::globalStrut())); } @@ -239,12 +239,12 @@ void Button::updateSize() { case Ideal::Left: case Ideal::Right: - setMinimumHeight(sizeHint().width()); - resize(sizeHint().height(), sizeHint().width()); + setMinimumHeight(tqsizeHint().width()); + resize(tqsizeHint().height(), tqsizeHint().width()); break; case Ideal::Top: case Ideal::Bottom: - resize(sizeHint().width(), sizeHint().height()); + resize(tqsizeHint().width(), tqsizeHint().height()); break; } } @@ -304,7 +304,7 @@ void Button::contextMenuEvent(TQContextMenuEvent *e) TQPopupMenu menu; m_assignAccelAction->plug(&menu); - if (m_realText.contains(TQRegExp("^&[0-9]\\s"))) + if (m_realText.tqcontains(TQRegExp("^&[0-9]\\s"))) m_clearAccelAction->plug(&menu); emit contextMenu( &menu ); @@ -319,7 +319,7 @@ void Button::assignAccel() if (ok) { TQString text = realTextWithoutAccel(); - text = TQString("&%1 %2").arg(num).arg(text); + text = TQString("&%1 %2").tqarg(num).tqarg(text); setRealText(text); } } @@ -340,7 +340,7 @@ TQString Button::realTextWithoutAccel() const { TQString text = m_realText; TQRegExp r("^&[0-9]\\s"); - if (text.contains(r)) + if (text.tqcontains(r)) text.remove(r); return text; } diff --git a/src/newui/button.h b/src/newui/button.h index 86e7dbed..3dbc63ca 100644 --- a/src/newui/button.h +++ b/src/newui/button.h @@ -39,9 +39,10 @@ A TQPushButton derivative with a size of a TQToolBar. Button can be rotated */ class Button : public TQPushButton { Q_OBJECT + TQ_OBJECT public: - Button(ButtonBar *parent, const TQString text, const TQIconSet &icon = TQIconSet(), - const TQString &description = TQString::null); + Button(ButtonBar *tqparent, const TQString text, const TQIconSet &icon = TQIconSet(), + const TQString &description = TQString()); /**Sets the description used as a tooltip.*/ void setDescription(const TQString &description); @@ -53,8 +54,8 @@ public: /**Sets the mode of a button.*/ void setMode(Ideal::ButtonMode mode); - TQSize sizeHint() const; - TQSize sizeHint(const TQString &text) const; + TQSize tqsizeHint() const; + TQSize tqsizeHint(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 b2a3b47c..342e3491 100644 --- a/src/newui/buttonbar.cpp +++ b/src/newui/buttonbar.cpp @@ -32,14 +32,14 @@ namespace Ideal { //ButtonLayout class -ButtonLayout::ButtonLayout(ButtonBar *parent, Direction d, int margin, int spacing, const char *name) - :TQBoxLayout(parent, d, margin, spacing, name), m_buttonBar(parent) +ButtonLayout::ButtonLayout(ButtonBar *tqparent, Direction d, int margin, int spacing, const char *name) + :TQBoxLayout(tqparent, d, margin, spacing, name), m_buttonBar(tqparent) { } -TQSize ButtonLayout::minimumSize() const +TQSize ButtonLayout::tqminimumSize() const { - TQSize size = TQBoxLayout::minimumSize(); + TQSize size = TQBoxLayout::tqminimumSize(); if (!m_buttonBar->autoResize()) return size; @@ -54,7 +54,7 @@ TQSize ButtonLayout::minimumSize() const case Ideal::Bottom: return TQSize(0,size.height()); } - return TQBoxLayout::minimumSize(); + return TQBoxLayout::tqminimumSize(); } @@ -62,8 +62,8 @@ TQSize ButtonLayout::minimumSize() const //ButtonBar class -ButtonBar::ButtonBar(Place place, ButtonMode mode, TQWidget *parent, const char *name) - :TQWidget(parent, name), m_place(place), l(0), m_shrinked(false), m_autoResize(true) +ButtonBar::ButtonBar(Place place, ButtonMode mode, TQWidget *tqparent, const char *name) + :TQWidget(tqparent, name), m_place(place), l(0), m_shrinked(false), m_autoResize(true) { switch (m_place) { @@ -128,14 +128,14 @@ void ButtonBar::fixDimensions() { case Ideal::Left: case Ideal::Right: - setFixedWidth(sizeHint().width()); - setMinimumHeight(sizeHint().height()); + setFixedWidth(tqsizeHint().width()); + setMinimumHeight(tqsizeHint().height()); setMaximumHeight(32767); break; case Ideal::Top: case Ideal::Bottom: - setFixedHeight(sizeHint().height()); - setMinimumWidth(sizeHint().width()); + setFixedHeight(tqsizeHint().height()); + setMinimumWidth(tqsizeHint().width()); setMaximumWidth(32767); break; } @@ -156,13 +156,13 @@ void ButtonBar::resizeEvent(TQResizeEvent *ev) { case Ideal::Left: case Ideal::Right: - preferredDimension = l->TQBoxLayout::minimumSize().height(); + preferredDimension = l->TQBoxLayout::tqminimumSize().height(); actualDimension = size().height(); oldDimension = ev->oldSize().height(); break; case Ideal::Top: case Ideal::Bottom: - preferredDimension = l->TQBoxLayout::minimumSize().width(); + preferredDimension = l->TQBoxLayout::tqminimumSize().width(); actualDimension = size().width(); oldDimension = ev->oldSize().width(); break; @@ -249,7 +249,7 @@ void ButtonBar::deshrink(int preferredDimension, int actualDimension) int i = 0; for (TQValueList<uint>::iterator it = texts.begin(); it != texts.end(); ++it, i++) { - if (m_buttons[i]->text().contains("...")) + if (m_buttons[i]->text().tqcontains("...")) (*it)++; newTextLength += *it; } @@ -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)->sizeHint((*it)->realText()).width(); + size += (*it)->tqsizeHint((*it)->realText()).width(); } return size; } @@ -309,7 +309,7 @@ Button *ButtonBar::firstButton() Button *ButtonBar::nextTo(Button *button) { - ButtonList::iterator it = m_buttons.find(button); + ButtonList::iterator it = m_buttons.tqfind(button); Button *next = 0; if ((*it) == m_buttons.last()) next = m_buttons.first(); @@ -326,7 +326,7 @@ Button *ButtonBar::nextTo(Button *button) Button *ButtonBar::prevTo(Button *button) { - ButtonList::iterator it = m_buttons.find(button); + ButtonList::iterator it = m_buttons.tqfind(button); Button *prev = 0; if (it == m_buttons.begin()) prev = m_buttons.last(); diff --git a/src/newui/buttonbar.h b/src/newui/buttonbar.h index ad1cf5b6..f8f13868 100644 --- a/src/newui/buttonbar.h +++ b/src/newui/buttonbar.h @@ -32,14 +32,14 @@ namespace Ideal { class Button; class ButtonBar; -/**@short A layout for a ButtonBar class. +/**@short A tqlayout for a ButtonBar class. -Overrides minimumSize method to allow shrinking button bar buttons.*/ -class ButtonLayout: public QBoxLayout{ +Overrides tqminimumSize 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); + ButtonLayout(ButtonBar *tqparent, Direction d, int margin = 0, int spacing = -1, const char * name = 0); - virtual TQSize minimumSize() const; + virtual TQSize tqminimumSize() const; private: ButtonBar *m_buttonBar; @@ -53,9 +53,10 @@ placing on the left(right, bottom, top) corners of a window as a bar with slider */ class ButtonBar : public TQWidget { Q_OBJECT + TQ_OBJECT public: ButtonBar(Place place, ButtonMode mode = IconsAndText, - TQWidget *parent = 0, const char *name = 0); + TQWidget *tqparent = 0, const char *name = 0); virtual ~ButtonBar(); /**Adds a button to the bar.*/ diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp index 5f11425d..95b36eab 100644 --- a/src/newui/ddockwindow.cpp +++ b/src/newui/ddockwindow.cpp @@ -39,9 +39,9 @@ #include "button.h" #include "dmainwindow.h" -DDockWindow::DDockWindow(DMainWindow *parent, Position position) - :TQDockWindow(TQDockWindow::InDock, parent), m_position(position), m_visible(false), - m_mainWindow(parent), m_doNotCloseActiveWidget(false), m_toggledButton(0), m_lastContextMenuButton(0) +DDockWindow::DDockWindow(DMainWindow *tqparent, Position position) + :TQDockWindow(TQDockWindow::InDock, tqparent), m_position(position), m_visible(false), + m_mainWindow(tqparent), m_doNotCloseActiveWidget(false), m_toggledButton(0), m_lastContextMenuButton(0) { setMovingEnabled(false); setResizeEnabled(true); @@ -85,9 +85,9 @@ DDockWindow::DDockWindow(DMainWindow *parent, Position position) m_widgetStack = new TQWidgetStack(this); m_internalLayout->addWidget(m_widgetStack); - m_moveToDockLeft = new KAction( i18n("Move to left dock"), 0, this, TQT_SLOT(moveToDockLeft()), this ); - m_moveToDockRight = new KAction( i18n("Move to right dock"), 0, this, TQT_SLOT(moveToDockRight()), this ); - m_moveToDockBottom = new KAction( i18n("Move to bottom dock"), 0, this, TQT_SLOT(moveToDockBottom()), this ); + m_moveToDockLeft = new KAction( i18n("Move to left dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockLeft()), TQT_TQOBJECT(this) ); + m_moveToDockRight = new KAction( i18n("Move to right dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockRight()), TQT_TQOBJECT(this) ); + m_moveToDockBottom = new KAction( i18n("Move to bottom dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockBottom()), TQT_TQOBJECT(this) ); setVisible(m_visible); @@ -104,7 +104,7 @@ void DDockWindow::setVisible(bool v) { //write dock width to the config file KConfig *config = kapp->config(); - TQString group = TQString("%1").arg(m_name); + TQString group = TQString("%1").tqarg(m_name); config->setGroup(group); if (m_visible) @@ -115,13 +115,13 @@ void DDockWindow::setVisible(bool v) v ? m_widgetStack->show() : m_widgetStack->hide(); m_visible = v; - m_internalLayout->invalidate(); + m_internalLayout->tqinvalidate(); if (!m_visible) { if (m_position == DDockWindow::Bottom) - setFixedExtentHeight(m_internalLayout->sizeHint().height()); + setFixedExtentHeight(m_internalLayout->tqsizeHint().height()); else - setFixedExtentWidth(m_internalLayout->sizeHint().width()); + setFixedExtentWidth(m_internalLayout->tqsizeHint().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->sizeHint().height()); + size = config->readNumEntry("ViewWidth", m_internalLayout->tqsizeHint().height()); setFixedExtentHeight(size); } else { - size = config->readNumEntry("ViewWidth", m_internalLayout->sizeHint().width()); + size = config->readNumEntry("ViewWidth", m_internalLayout->tqsizeHint().width()); setFixedExtentWidth(size); } } @@ -148,7 +148,7 @@ void DDockWindow::loadSettings() void DDockWindow::saveSettings() { KConfig *config = kapp->config(); - TQString group = TQString("%1").arg(m_name); + TQString group = TQString("%1").tqarg(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").arg(m_name); + TQString group = TQString("%1").tqarg(m_name); config->setGroup(group); if (config->readEntry("ViewLastWidget") == title) { @@ -338,7 +338,7 @@ bool DDockWindow::isActive() { if (m_toggledButton) { - TQWidget *w = qApp->focusWidget(); + TQWidget *w = tqApp->tqfocusWidget(); if (!w) return false; TQWidget *toolWidget = m_widgets[m_toggledButton]; @@ -347,7 +347,7 @@ bool DDockWindow::isActive() else { do { - w = (TQWidget*)w->parent(); + w = (TQWidget*)w->tqparent(); if (w && (w == toolWidget)) return true; } while (w); } @@ -375,7 +375,7 @@ void DDockWindow::selectPrevWidget() void DDockWindow::contextMenu(TQPopupMenu * menu) { - m_lastContextMenuButton = static_cast<Ideal::Button*>( const_cast<TQObject*>( sender() ) ); + m_lastContextMenuButton = static_cast<Ideal::Button*>( TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME*>( sender() )) ); menu->insertSeparator(); @@ -404,7 +404,7 @@ void DDockWindow::moveToDockBottom() void DDockWindow::moveToDock(DDockWindow::Position position ) { - if ( m_widgets.contains( m_lastContextMenuButton ) ) + if ( m_widgets.tqcontains( m_lastContextMenuButton ) ) { mainWindow()->moveWidget( position, m_widgets[ m_lastContextMenuButton ], m_lastContextMenuButton->realTextWithoutAccel() ); } diff --git a/src/newui/ddockwindow.h b/src/newui/ddockwindow.h index 7653bff9..e9850d2f 100644 --- a/src/newui/ddockwindow.h +++ b/src/newui/ddockwindow.h @@ -40,10 +40,11 @@ namespace Ideal { class DDockWindow : public TQDockWindow { Q_OBJECT + TQ_OBJECT public: enum Position { Bottom, Left, Right }; - DDockWindow(DMainWindow *parent, Position position); + DDockWindow(DMainWindow *tqparent, Position position); virtual ~DDockWindow(); virtual void setVisible(bool v); diff --git a/src/newui/dmainwindow.cpp b/src/newui/dmainwindow.cpp index 6e6a63d4..fb7dd14a 100644 --- a/src/newui/dmainwindow.cpp +++ b/src/newui/dmainwindow.cpp @@ -29,8 +29,8 @@ #include "dtabwidget.h" #include "docksplitter.h" -DMainWindow::DMainWindow(TQWidget *parent, const char *name) - :KParts::MainWindow(parent, name), m_firstRemoved(false), m_currentWidget(0) +DMainWindow::DMainWindow(TQWidget *tqparent, const char *name) + :KParts::MainWindow(tqparent, name), m_firstRemoved(false), m_currentWidget(0) { loadSettings(); createToolWindows(); @@ -74,16 +74,16 @@ DDockWindow *DMainWindow::toolWindow(DDockWindow::Position position) const void DMainWindow::createToolWindows() { m_bottomDock = new DDockWindow(this, DDockWindow::Bottom); - moveDockWindow(m_bottomDock, Qt::DockBottom); + moveDockWindow(m_bottomDock, TQt::DockBottom); m_leftDock = new DDockWindow(this, DDockWindow::Left); - moveDockWindow(m_leftDock, Qt::DockLeft); + moveDockWindow(m_leftDock, TQt::DockLeft); m_rightDock = new DDockWindow(this, DDockWindow::Right); - moveDockWindow(m_rightDock, Qt::DockRight); + moveDockWindow(m_rightDock, TQt::DockRight); } void DMainWindow::addWidget(TQWidget *widget, const TQString &title) { -// invalidateActiveTabWidget(); +// tqinvalidateActiveTabWidget(); if (m_firstRemoved && m_activeTabWidget == m_tabs.first()) { m_central->addDock(0, 0, m_activeTabWidget); @@ -116,10 +116,10 @@ void DMainWindow::addWidget(DTabWidget *tab, TQWidget *widget, const TQString &t void DMainWindow::removeWidget(TQWidget *widget) { - if (!m_widgets.contains(widget)) + if (!m_widgets.tqcontains(widget)) return; //not a widget in main window - if (m_widgetTabs.contains(widget)) + if (m_widgetTabs.tqcontains(widget)) { DTabWidget *tab = m_widgetTabs[widget]; if (tab->indexOf(widget) >= 0) @@ -133,7 +133,7 @@ void DMainWindow::removeWidget(TQWidget *widget) //remove and delete tabwidget if it is not the first one if (tab != m_tabs.first()) { - QPair<uint, uint> idx = m_central->indexOf(tab); + TQPair<uint, uint> idx = m_central->indexOf(tab); m_tabs.remove(tab); m_activeTabWidget = m_tabs.first(); m_central->removeDock(idx.first, idx.second, true); @@ -175,25 +175,25 @@ DTabWidget *DMainWindow::splitHorizontal() DTabWidget *DMainWindow::splitVertical() { -// invalidateActiveTabWidget(); +// tqinvalidateActiveTabWidget(); int row = m_central->indexOf(m_activeTabWidget).first; m_activeTabWidget = createTab(); m_central->addDock(row, m_central->numCols(row), m_activeTabWidget); return m_activeTabWidget; } -void DMainWindow::invalidateActiveTabWidget() +void DMainWindow::tqinvalidateActiveTabWidget() { -/* TQWidget *focused = m_central->focusWidget(); - kdDebug(9000) << "invalidate: " << focused << endl; +/* TQWidget *focused = m_central->tqfocusWidget(); + kdDebug(9000) << "tqinvalidate: " << focused << endl; if (focused == 0) return; - if (!m_widgets.contains(focused)) + if (!m_widgets.tqcontains(focused)) { kdDebug(9000) << " focused is not in m_widgets" << endl; return; } - if (m_widgetTabs.contains(focused)) + if (m_widgetTabs.tqcontains(focused)) { kdDebug(9000) << " focused is in m_widgets and m_widgetTabs" << endl; DTabWidget *tab = m_widgetTabs[focused]; @@ -218,7 +218,7 @@ DTabWidget *DMainWindow::createTab() bool DMainWindow::eventFilter(TQObject *obj, TQEvent *ev) { TQWidget *w = (TQWidget*)obj; - if (!m_widgets.contains(w)) + if (!m_widgets.tqcontains(w)) return KParts::MainWindow::eventFilter(obj, ev); if ((m_currentWidget != w) && (ev->type() == TQEvent::FocusIn)) @@ -228,7 +228,7 @@ bool DMainWindow::eventFilter(TQObject *obj, TQEvent *ev) } else if (ev->type() == TQEvent::IconChange) { - if (m_widgetTabs.contains(w)) + if (m_widgetTabs.tqcontains(w)) { DTabWidget *tab = m_widgetTabs[w]; tab->setTabIconSet(w, w->icon() ? (*(w->icon())) : TQPixmap()); @@ -261,7 +261,7 @@ void DMainWindow::closeTab(TQWidget *) void DMainWindow::moveWidget(DDockWindow::Position position, TQWidget * view, const TQString & title) { - if (m_docks.contains(view)) + if (m_docks.tqcontains(view)) { toolWindow(m_docks[view])->removeWidget(view); @@ -285,7 +285,7 @@ void DMainWindow::removeDockWidget(TQWidget *view) bool DMainWindow::hasDockWidget(TQWidget *view) { - return m_docks.contains(view); + return m_docks.tqcontains(view); } DDockWindow::Position DMainWindow::dockWidgetPosition(TQWidget *view) @@ -295,9 +295,9 @@ DDockWindow::Position DMainWindow::dockWidgetPosition(TQWidget *view) void DMainWindow::widgetDestroyed() { - TQWidget *w = static_cast<TQWidget*>(const_cast<TQObject*>(sender())); + TQWidget *w = TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); - if (m_docks.contains(w)) + if (m_docks.tqcontains(w)) { kdError() << "Widget destroyed before being removed from UI!" << endl; m_docks.remove(w); @@ -306,4 +306,4 @@ void DMainWindow::widgetDestroyed() #include "dmainwindow.moc" -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on diff --git a/src/newui/dmainwindow.h b/src/newui/dmainwindow.h index ae757678..dc7b1c42 100644 --- a/src/newui/dmainwindow.h +++ b/src/newui/dmainwindow.h @@ -33,8 +33,9 @@ namespace Ideal { /**Main window which provides simplified IDEA mode.*/ class DMainWindow: public KParts::MainWindow { Q_OBJECT + TQ_OBJECT public: - DMainWindow(TQWidget *parent = 0, const char *name = 0); + DMainWindow(TQWidget *tqparent = 0, const char *name = 0); virtual ~DMainWindow(); /**@return The tool window in given @p position.*/ @@ -106,7 +107,7 @@ protected: TQWidget *m_currentWidget; private slots: - void invalidateActiveTabWidget(); + void tqinvalidateActiveTabWidget(); }; diff --git a/src/newui/docksplitter.cpp b/src/newui/docksplitter.cpp index 0dc55453..c22f2723 100644 --- a/src/newui/docksplitter.cpp +++ b/src/newui/docksplitter.cpp @@ -23,16 +23,16 @@ namespace Ideal { -DockSplitter::DockSplitter(Orientation orientation, TQWidget *parent, const char *name) - :TQSplitter(parent, name), m_orientation(orientation) +DockSplitter::DockSplitter(Qt::Orientation orientation, TQWidget *tqparent, const char *name) + :TQSplitter(tqparent, name), m_orientation(orientation) { switch (m_orientation) { - case Horizontal: - setOrientation(Vertical); + case Qt::Horizontal: + setOrientation(Qt::Vertical); break; - case Vertical: - setOrientation(Horizontal); + case Qt::Vertical: + setOrientation(Qt::Horizontal); break; } setOpaqueResize(true); @@ -73,11 +73,11 @@ void DockSplitter::appendSplitter() { switch (m_orientation) { - case Horizontal: - m_splitters.append(new TQSplitter(Horizontal, this)); + case Qt::Horizontal: + m_splitters.append(new TQSplitter(Qt::Horizontal, this)); break; - case Vertical: - m_splitters.append(new TQSplitter(Vertical, this)); + case Qt::Vertical: + m_splitters.append(new TQSplitter(Qt::Vertical, this)); break; } m_splitters[m_splitters.size()-1]->setOpaqueResize(true); @@ -113,7 +113,7 @@ void DockSplitter::removeDock(uint row, uint col, bool alsoDelete) w->hide(); } - m_splitters[row]->setMinimumSize(m_splitters[row]->minimumSizeHint()); + m_splitters[row]->setMinimumSize(m_splitters[row]->tqminimumSizeHint()); if (isRowEmpty(row)) { @@ -161,13 +161,13 @@ int DockSplitter::numCols(int row) const return 0; } -QPair<uint, uint> DockSplitter::indexOf(TQWidget *dock) +TQPair<uint, uint> DockSplitter::indexOf(TQWidget *dock) { for (uint i = 0; i < m_docks.count(); ++i) for (uint j = 0; j < m_docks[i].count(); ++j) if (dock == m_docks[i][j]) - return qMakePair(i, j); - return qMakePair(0u, 0u); + return tqMakePair(i, j); + return tqMakePair(0u, 0u); } } diff --git a/src/newui/docksplitter.h b/src/newui/docksplitter.h index c25dd495..c5450b1a 100644 --- a/src/newui/docksplitter.h +++ b/src/newui/docksplitter.h @@ -32,14 +32,15 @@ class DockWidget; */ class DockSplitter: public TQSplitter { Q_OBJECT + TQ_OBJECT public: - DockSplitter(Orientation orientation, TQWidget *parent = 0, const char *name = 0); + DockSplitter(Qt::Orientation orientation, TQWidget *tqparent = 0, const char *name = 0); ~DockSplitter(); void addDock(uint row, uint col, TQWidget *dock); void removeDock(uint row, uint col, bool alsoDelete = false); - QPair<uint, uint> indexOf(TQWidget *dock); + TQPair<uint, uint> indexOf(TQWidget *dock); int numRows() const; int numCols(int row) const; @@ -52,7 +53,7 @@ protected: bool isRowEmpty(int row); private: - Orientation m_orientation; + Qt::Orientation m_orientation; TQValueList<TQSplitter*> m_splitters; TQValueList<TQValueList<TQWidget*> > m_docks; }; diff --git a/src/newui/dtabwidget.cpp b/src/newui/dtabwidget.cpp index db2e4c4e..7ee27915 100644 --- a/src/newui/dtabwidget.cpp +++ b/src/newui/dtabwidget.cpp @@ -26,10 +26,10 @@ #include <kiconloader.h> #include <kapplication.h> -DTabWidget::DTabWidget(TQWidget *parent, const char *name) - :KTabWidget(parent, name), m_closeButton(0) +DTabWidget::DTabWidget(TQWidget *tqparent, const char *name) + :KTabWidget(tqparent, name), m_closeButton(0) { - setFocusPolicy(NoFocus); + setFocusPolicy(TQ_NoFocus); setMargin(0); loadSettings(); @@ -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()->repaint(); + if (index != -1) tabBar()->tqrepaint(); } 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()->repaint(); + if (index != -1) tabBar()->tqrepaint(); } /*void DTabWidget::updateHistory(TQWidget *w) diff --git a/src/newui/dtabwidget.h b/src/newui/dtabwidget.h index beb0a466..fd480c73 100644 --- a/src/newui/dtabwidget.h +++ b/src/newui/dtabwidget.h @@ -26,8 +26,9 @@ class TQToolButton; class DTabWidget: public KTabWidget { Q_OBJECT + TQ_OBJECT public: - DTabWidget(TQWidget *parent=0, const char *name=0); + DTabWidget(TQWidget *tqparent=0, const char *name=0); /**@return The close button at the top right corner. May be 0 if the configuration do not allow close buttons or the tabbar.*/ diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp index 379f79dc..a14417eb 100644 --- a/src/partcontroller.cpp +++ b/src/partcontroller.cpp @@ -89,8 +89,8 @@ struct ModificationData }; -PartController::PartController(TQWidget *parent) - : KDevPartController(parent), _editorFactory(0L), m_currentActivePart(0), m_removingActivePart(false) +PartController::PartController(TQWidget *tqparent) + : KDevPartController(tqparent), _editorFactory(0L), m_currentActivePart(0), m_removingActivePart(false) { connect(this, TQT_SIGNAL(partRemoved(KParts::Part*)), this, TQT_SLOT(slotPartRemoved(KParts::Part* )) ); connect(this, TQT_SIGNAL(partAdded(KParts::Part*)), this, TQT_SLOT(slotPartAdded(KParts::Part* )) ); @@ -109,10 +109,10 @@ PartController::~PartController() } -void PartController::createInstance(TQWidget *parent) +void PartController::createInstance(TQWidget *tqparent) { if (!s_instance) - s_instance = new PartController(parent); + s_instance = new PartController(tqparent); } @@ -131,7 +131,7 @@ void PartController::setupActions() newAction->setWhatsThis( i18n("<b>Open file</b><p>Opens an existing file without adding it to the project.</p>") ); m_openRecentAction = KStdAction::openRecent( this, TQT_SLOT(slotOpenRecent(const KURL&) ), ac, "file_open_recent" ); - m_openRecentAction->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(m_openRecentAction->text())).arg(i18n("Opens recently opened file."))); + m_openRecentAction->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(beautifyToolTip(m_openRecentAction->text())).tqarg(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("<b>%1</b><p>%2").arg(beautifyToolTip(m_closeWindowAction->text())).arg(i18n("Closes current file."))); + m_closeWindowAction->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(beautifyToolTip(m_closeWindowAction->text())).tqarg(i18n("Closes current file."))); m_closeWindowAction->setEnabled(false); m_closeAllWindowsAction = new KAction(i18n("Close All"), 0, this, TQT_SLOT(slotCloseAllWindows()), ac, "file_close_all"); @@ -210,7 +210,7 @@ KURL PartController::findURLInProject(const KURL& url) { TQStringList fileList = API::getInstance()->project()->allFiles(); - bool filenameOnly = (url.url().find('/') == -1); + bool filenameOnly = (url.url().tqfind('/') == -1); TQString filename = filenameOnly ? "/" : ""; filename += url.url(); @@ -267,7 +267,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, { ei->setEncoding( m_presetEncoding ); } - m_presetEncoding = TQString::null; + m_presetEncoding = TQString(); } addHistoryEntry(); @@ -395,7 +395,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, if ( dom != 0 ) { // The global option specifies a fallback if the project - // has no setting or no project is open. However for Qt4 + // has no setting or no project is open. However for TQt4 // projects we want to use ExternalDesigner in any case. if ( DomUtil::readIntEntry( *dom, "/kdevcppsupport/qt/version", 3 ) == 4 ) { @@ -434,7 +434,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, if( designerPluginPaths.isEmpty() ) KRun::runCommand( designerExec+" "+url.pathOrURL() ); else - KRun::runCommand( "QT_PLUGIN_PATH=\""+designerPluginPaths.join(":")+"\" "+designerExec+" "+url.pathOrURL() ); + KRun::runCommand( "TQT_PLUGIN_PATH=\""+designerPluginPaths.join(":")+"\" "+designerExec+" "+url.pathOrURL() ); return; } @@ -442,7 +442,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, config->setGroup("General"); TQStringList texttypeslist = config->readListEntry( "TextTypes" ); - if ( texttypeslist.contains( MimeType->name() ) ) + if ( texttypeslist.tqcontains( MimeType->name() ) ) { m_openNextAsText = true; } @@ -461,7 +461,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, if ( m_presetEncoding.isNull() && API::getInstance()->projectDom() ) { TQDomDocument * projectDom = API::getInstance()->projectDom(); - m_presetEncoding = DomUtil::readEntry( *projectDom, "/general/defaultencoding", TQString::null ); + m_presetEncoding = DomUtil::readEntry( *projectDom, "/general/defaultencoding", TQString() ); } if ( !m_presetEncoding.isNull() ) @@ -470,7 +470,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, { ei->setEncoding( m_presetEncoding ); } - m_presetEncoding = TQString::null; + m_presetEncoding = TQString(); } addHistoryEntry(); @@ -534,8 +534,8 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, else { MimeWarningDialog dlg; - dlg.text2->setText( TQString( "<qt><b>%1</b></qt>" ).arg(url.path())); - dlg.text3->setText( dlg.text3->text().arg(MimeType->name()) ); + dlg.text2->setText( TQString( "<qt><b>%1</b></qt>" ).tqarg(url.path())); + dlg.text3->setText( dlg.text3->text().tqarg(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").arg(partType)); + KTrader::OfferList offers = KTrader::self()->query(mimeType, TQString("'%1' in ServiceTypes").tqarg(partType)); if (offers.count() > 0) { @@ -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 newStatus() signal in order to keep track of the + // Connect to the document's views newtqStatus() 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(newStatus(const TQString &, int)), - this, TQT_SLOT(slotNewDesignerStatus(const TQString &, int))); + connect(designerPart, TQT_SIGNAL(newtqStatus(const TQString &, int)), + this, TQT_SLOT(slotNewDesignertqStatus(const TQString &, int))); } } @@ -787,7 +787,7 @@ void PartController::integrateTextEditorPart(KTextEditor::Document* doc) TQPtrListIterator<KTextEditor::View> it( list ); while ( it.current() ) { - connect( it, TQT_SIGNAL( newStatus() ), this, TQT_SLOT( slotNewStatus() ) ); + connect( it, TQT_SIGNAL( newtqStatus() ), this, TQT_SLOT( slotNewtqStatus() ) ); ++it; } } @@ -830,7 +830,7 @@ void PartController::updatePartURL( KParts::ReadOnlyPart * ro_part ) bool PartController::partURLHasChanged( KParts::ReadOnlyPart * ro_part ) { - if ( _partURLMap.contains( ro_part ) && !ro_part->url().isEmpty() ) + if ( _partURLMap.tqcontains( ro_part ) && !ro_part->url().isEmpty() ) { if ( _partURLMap[ ro_part ] != ro_part->url() ) { @@ -842,7 +842,7 @@ bool PartController::partURLHasChanged( KParts::ReadOnlyPart * ro_part ) KURL PartController::storedURLForPart( KParts::ReadOnlyPart * ro_part ) { - if ( _partURLMap.contains( ro_part ) ) + if ( _partURLMap.tqcontains( ro_part ) ) { return _partURLMap[ ro_part ]; } @@ -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.)" ).arg( url.path() ), + 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( "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.)").arg( url.path() ), + 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("File Externally Modified"), i18n("Overwrite"), i18n("Do Not Overwrite") ); if ( code == KMessageBox::Yes ) { @@ -1216,7 +1216,7 @@ bool PartController::closeFilesDialog( KURL::List const & ignoreList ) while ( KParts::Part* part = it.current() ) { KParts::ReadOnlyPart * ro_part = dynamic_cast<KParts::ReadOnlyPart*>( part ); - if ( ro_part && !ignoreList.contains( ro_part->url() ) || !ro_part ) + if ( ro_part && !ignoreList.tqcontains( ro_part->url() ) || !ro_part ) { closePart( part ); } @@ -1276,7 +1276,7 @@ void PartController::slotOpenFile() TQString DefaultEncoding; if ( TQDomDocument * projectDom = API::getInstance()->projectDom() ) { - DefaultEncoding = DomUtil::readEntry( *projectDom, "/general/defaultencoding", TQString::null ); + DefaultEncoding = DomUtil::readEntry( *projectDom, "/general/defaultencoding", TQString() ); } if ( DefaultEncoding.isEmpty() ) @@ -1284,11 +1284,11 @@ void PartController::slotOpenFile() // have a peek at katepart's settings: KConfig * config = kapp->config(); config->setGroup("Kate Document Defaults"); - DefaultEncoding = config->readEntry("Encoding", TQString::null ); + DefaultEncoding = config->readEntry("Encoding", TQString() ); } - KEncodingFileDialog::Result result = KEncodingFileDialog::getOpenURLsAndEncoding( DefaultEncoding, TQString::null, - TQString::null, TopLevel::getInstance()->main(), TQString::null ); + KEncodingFileDialog::Result result = KEncodingFileDialog::getOpenURLsAndEncoding( DefaultEncoding, TQString(), + TQString(), TopLevel::getInstance()->main(), TQString() ); for ( KURL::List::Iterator it = result.URLs.begin(); it != result.URLs.end(); ++it ) { @@ -1426,7 +1426,7 @@ void PartController::slotDocumentDirtyStepTwo( void * payload ) if ( reason > 0 ) { - if ( !_dirtyDocuments.contains( doc ) ) + if ( !_dirtyDocuments.tqcontains( doc ) ) { _dirtyDocuments.append( doc ); } @@ -1455,7 +1455,7 @@ void PartController::slotDocumentDirtyStepTwo( void * payload ) bool PartController::isDirty( KURL const & url ) { - return _dirtyDocuments.contains( static_cast<KTextEditor::Document*>( partForURL( url ) ) ); + return _dirtyDocuments.tqcontains( static_cast<KTextEditor::Document*>( partForURL( url ) ) ); } bool PartController::reactToDirty( KURL const & url, unsigned char reason ) @@ -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.").arg( url.path() ), + "You should investigate before saving to make sure you are not losing data.").tqarg( 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.").arg( url.path() ), + "If this was not your intention, make sure to save this file now.").tqarg( 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?").arg( url.path() ), + i18n("The file \"%1\" has changed on disk.\n\nDo you want to reload it?").tqarg( url.path() ), i18n("File Changed"), i18n("Reload"), i18n("Do Not Reload") ) == KMessageBox::No ) { return false; @@ -1511,18 +1511,18 @@ bool PartController::reactToDirty( KURL const & url, unsigned char reason ) return true; } -void PartController::slotNewDesignerStatus(const TQString &formName, int status) +void PartController::slotNewDesignertqStatus(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::slotNewStatus( ) +void PartController::slotNewtqStatus( ) { kdDebug(9000) << k_funcinfo << endl; - TQObject * senderobj = const_cast<TQObject*>( sender() ); + TQObject * senderobj = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>( sender() )); KTextEditor::View * view = dynamic_cast<KTextEditor::View*>( senderobj ); if ( view ) { @@ -1628,7 +1628,7 @@ void PartController::slotBackAboutToShow() TQValueList<HistoryEntry>::ConstIterator it = m_backHistory.begin(); while( i < 10 && it != m_backHistory.end() ) { - popup->insertItem( (*it).url.fileName() + TQString(" (%1)").arg( (*it).line +1), (*it).id ); + popup->insertItem( (*it).url.fileName() + TQString(" (%1)").tqarg( (*it).line +1), (*it).id ); ++i; ++it; } @@ -1645,7 +1645,7 @@ void PartController::slotForwardAboutToShow( ) TQValueList<HistoryEntry>::ConstIterator it = m_forwardHistory.begin(); while( i < 10 && it != m_forwardHistory.end() ) { - popup->insertItem( (*it).url.fileName() + TQString(" (%1)").arg( (*it).line +1), (*it).id ); + popup->insertItem( (*it).url.fileName() + TQString(" (%1)").tqarg( (*it).line +1), (*it).id ); ++i; ++it; } @@ -1789,7 +1789,7 @@ KParts::ReadOnlyPart *PartController::qtDesignerPart() for ( ; it.current(); ++it) { KInterfaceDesigner::Designer *des = dynamic_cast<KInterfaceDesigner::Designer*>(it.current()); - if (des && des->designerType() == KInterfaceDesigner::QtDesigner) + if (des && des->designerType() == KInterfaceDesigner::TQtDesigner) return des; } return 0; @@ -1812,7 +1812,7 @@ KTextEditor::Editor *PartController::openTextDocument( bool activate ) args.serviceType = TQString( "text/plain;" ) + m_presetEncoding; extension->setURLArgs(args); } - m_presetEncoding = TQString::null; + m_presetEncoding = TQString(); } TQWidget * widget = @@ -1848,7 +1848,7 @@ void PartController::gotoLastEditPos() void PartController::slotDocumentUrlChanged() { - TQObject *obj = const_cast<TQObject*>(sender()); + TQObject *obj = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); KTextEditor::Document *doc = dynamic_cast<KTextEditor::Document*>( obj ); if (!doc) return; diff --git a/src/partcontroller.h b/src/partcontroller.h index 1c6a764d..dbb6a632 100644 --- a/src/partcontroller.h +++ b/src/partcontroller.h @@ -43,11 +43,12 @@ Part controler implementation. class PartController : public KDevPartController { Q_OBJECT + TQ_OBJECT public: PartController(TQWidget *toplevel); - static void createInstance(TQWidget *parent); + static void createInstance(TQWidget *tqparent); static PartController *getInstance(); ///// KDevPartController interface @@ -97,7 +98,7 @@ public: KTextEditor::Editor *openTextDocument( bool activate = true ); KParts::Factory *findPartFactory(const TQString &mimeType, const TQString &partType, - const TQString &preferredName = TQString::null ); + const TQString &preferredName = TQString() ); public slots: @@ -140,8 +141,8 @@ private slots: void slotDocumentDirty( Kate::Document * doc, bool isModified, unsigned char reason ); void slotDocumentDirtyStepTwo( void * ); - void slotNewStatus(); - void slotNewDesignerStatus(const TQString &formName, int status); + void slotNewtqStatus(); + void slotNewDesignertqStatus(const TQString &formName, int status); void textChanged(); void gotoLastEditPos(); @@ -216,7 +217,7 @@ private: struct LastEditPos { KURL url; - QPair<unsigned int,unsigned int> pos; + TQPair<unsigned int,unsigned int> pos; LastEditPos() : pos( -1, -1) {} }; diff --git a/src/plugincontroller.cpp b/src/plugincontroller.cpp index 7b7ffac1..85d0b068 100644 --- a/src/plugincontroller.cpp +++ b/src/plugincontroller.cpp @@ -49,7 +49,7 @@ namespace template <class ComponentType> ComponentType *loadDefaultPart( const TQString &serviceType ) { - KTrader::OfferList offers = KTrader::self()->query(serviceType, TQString("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION)); + KTrader::OfferList offers = KTrader::self()->query(serviceType, TQString("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION)); KTrader::OfferList::ConstIterator serviceIt = offers.begin(); for ( ; serviceIt != offers.end(); ++serviceIt ) { KService::Ptr service = *serviceIt; @@ -79,10 +79,10 @@ PluginController *PluginController::getInstance() PluginController::PluginController() : KDevPluginController() { -/* m_defaultProfile = TQString::fromLatin1( "FullIDE" ); +/* m_defaultProfile = TQString::tqfromLatin1( "FullIDE" ); m_defaultProfilePath = kapp->dirs()->localkdedir() + "/" + KStandardDirs::kde_default( "data" ) + - TQString::fromLatin1("/kdevelop/profiles/FullIDE");*/ + TQString::tqfromLatin1("/kdevelop/profiles/FullIDE");*/ KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); if( args->isSet("profile") ){ @@ -144,10 +144,10 @@ void PluginController::loadPlugins( KTrader::OfferList offers, const TQStringLis TQString name = (*it)->desktopEntryName(); // Check if it is already loaded or shouldn't be - if( m_parts[ name ] != 0 || ignorePlugins.contains( name ) ) + if( m_parts[ name ] != 0 || ignorePlugins.tqcontains( name ) ) continue; - emit loadingPlugin(i18n("Loading: %1").arg((*it)->genericName())); + emit loadingPlugin(i18n("Loading: %1").tqarg((*it)->genericName())); KDevPlugin *plugin = loadPlugin( *it ); if ( plugin ) @@ -218,7 +218,7 @@ KDevPlugin *PluginController::loadPlugin( const KService::Ptr &service ) 0, i18n("<b>Could not load plugin</b><br>" "Plugin %1 could not be loaded<br>" - "Library loader error: %2").arg(service->name()). + "Library loader error: %2").tqarg(service->name()). arg(KLibLoader::self()->lastErrorMessage()), i18n("Could not load plugin")); } diff --git a/src/plugincontroller.h b/src/plugincontroller.h index 7eae5bda..79d77511 100644 --- a/src/plugincontroller.h +++ b/src/plugincontroller.h @@ -23,6 +23,7 @@ Loads and unloads plugins. class PluginController : public KDevPluginController { Q_OBJECT + TQ_OBJECT public: diff --git a/src/pluginselectdialog.cpp b/src/pluginselectdialog.cpp index 0863791c..18eef37d 100644 --- a/src/pluginselectdialog.cpp +++ b/src/pluginselectdialog.cpp @@ -23,13 +23,13 @@ #include "plugincontroller.h" #include "pluginselectdialog.h" -class PluginItem : public QCheckListItem +class PluginItem : public TQCheckListItem { public: // name - "Name", label - "GenericName", info - "Comment" - PluginItem( TQListView * parent, TQString const & name, TQString const & label, - TQString const & info, TQString const url = TQString::null ) - : TQCheckListItem( parent, label, TQCheckListItem::CheckBox), + PluginItem( TQListView * tqparent, TQString const & name, TQString const & label, + TQString const & info, TQString const url = TQString() ) + : TQCheckListItem( tqparent, label, TQCheckListItem::CheckBox), _name( name ), _info( info ), _url( url ) {} @@ -44,8 +44,8 @@ private: }; -PluginSelectDialog::PluginSelectDialog(TQWidget* parent, const char* name, bool modal, WFlags fl ) - : PluginSelectDialogBase( parent,name, modal,fl ) +PluginSelectDialog::PluginSelectDialog(TQWidget* tqparent, const char* name, bool modal, WFlags fl ) + : PluginSelectDialogBase( tqparent,name, modal,fl ) { plugin_list->setResizeMode( TQListView::LastColumn ); plugin_list->addColumn(""); @@ -137,7 +137,7 @@ void PluginSelectDialog::init( ) TQString Comment = (*it)->comment(); TQRegExp re("\\bhttp://[\\S]*"); re.search( Comment ); - Comment.replace( re, "" ); + Comment.tqreplace( re, "" ); TQString url; if ( re.pos() > -1 ) @@ -146,9 +146,9 @@ void PluginSelectDialog::init( ) } PluginItem *item = new PluginItem( plugin_list, (*it)->desktopEntryName(), (*it)->genericName(), Comment, url ); - item->setOn( loadedPluginDesktopNames.contains( (*it)->desktopEntryName() ) ); + item->setOn( loadedPluginDesktopNames.tqcontains( (*it)->desktopEntryName() ) ); - kdDebug(9000) << (*it)->desktopEntryName() << " : " << (loadedPluginDesktopNames.contains( (*it)->desktopEntryName() ) ? "YES" : "NO" ) << endl; + kdDebug(9000) << (*it)->desktopEntryName() << " : " << (loadedPluginDesktopNames.tqcontains( (*it)->desktopEntryName() ) ? "YES" : "NO" ) << endl; } TQListViewItem * first = plugin_list->firstChild(); diff --git a/src/pluginselectdialog.h b/src/pluginselectdialog.h index e0289eb6..47316ef5 100644 --- a/src/pluginselectdialog.h +++ b/src/pluginselectdialog.h @@ -20,9 +20,10 @@ class PluginController; class PluginSelectDialog : public PluginSelectDialogBase { Q_OBJECT + TQ_OBJECT public: - PluginSelectDialog( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + PluginSelectDialog( TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~PluginSelectDialog(); TQStringList unselectedPluginNames(); diff --git a/src/pluginselectdialogbase.ui b/src/pluginselectdialogbase.ui index e976899a..acad67b1 100644 --- a/src/pluginselectdialogbase.ui +++ b/src/pluginselectdialogbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>PluginSelectDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>PluginSelectDialogBase</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -30,20 +30,20 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView"> + <widget class="TQListView"> <property name="name"> <cstring>plugin_list</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -51,7 +51,7 @@ <string>Make this the default for this profile:</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>saveAsDefault_button</cstring> </property> @@ -66,7 +66,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -77,11 +77,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>plugin_description_label</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>40</height> @@ -90,7 +90,7 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -104,9 +104,9 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -122,14 +122,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>191</width> <height>21</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>ok_button</cstring> </property> @@ -137,7 +137,7 @@ <string>O&K</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancel_button</cstring> </property> @@ -169,10 +169,10 @@ <slot>saveAsDefault()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot access="protected">saveAsDefault()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurllabel.h</includehint> </includehints> diff --git a/src/profileengine/editor/addprofilewidget.ui b/src/profileengine/editor/addprofilewidget.ui index 56a46f1d..dccb234e 100644 --- a/src/profileengine/editor/addprofilewidget.ui +++ b/src/profileengine/editor/addprofilewidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>AddProfileWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>AddProfileWidget</cstring> </property> @@ -19,9 +19,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <vbox> <property name="name"> @@ -33,7 +33,7 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -51,9 +51,9 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <vbox> <property name="name"> @@ -65,7 +65,7 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -83,9 +83,9 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <vbox> <property name="name"> @@ -97,7 +97,7 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -108,7 +108,7 @@ <cstring>descriptionEdit</cstring> </property> </widget> - <widget class="QTextEdit"> + <widget class="TQTextEdit"> <property name="name"> <cstring>descriptionEdit</cstring> </property> @@ -117,5 +117,5 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/src/profileengine/editor/profileeditor.cpp b/src/profileengine/editor/profileeditor.cpp index 903403de..0e3fb5d4 100644 --- a/src/profileengine/editor/profileeditor.cpp +++ b/src/profileengine/editor/profileeditor.cpp @@ -40,15 +40,15 @@ class ProfileItem: public KListViewItem { public: - ProfileItem(KListView *parent, Profile *profile) - :KListViewItem(parent), m_profile(profile) + ProfileItem(KListView *tqparent, Profile *profile) + :KListViewItem(tqparent), m_profile(profile) { setText(0, profile->genericName()); setText(1, profile->description()); } - ProfileItem(KListViewItem *parent, Profile *profile) - : KListViewItem(parent), m_profile(profile) + ProfileItem(KListViewItem *tqparent, Profile *profile) + : KListViewItem(tqparent), m_profile(profile) { setText(0, profile->genericName()); setText(1, profile->description()); @@ -62,19 +62,19 @@ private: class EDListItem: public KListViewItem{ public: - EDListItem(KListView *parent, const TQString &text, bool derived) - : KListViewItem(parent, text), m_derived(derived) + EDListItem(KListView *tqparent, const TQString &text, bool derived) + : KListViewItem(tqparent, text), m_derived(derived) { } bool isDerived() const { return m_derived; } - virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) + virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) { TQColorGroup cgNew = cg; if (m_derived) cgNew.setColor(TQColorGroup::Text, KGlobalSettings::inactiveTextColor()); - KListViewItem::paintCell(p, cgNew, column, width, alignment); + KListViewItem::paintCell(p, cgNew, column, width, tqalignment); } private: @@ -84,16 +84,16 @@ private: class ProfileListBuilding { public: - ProfileItem * operator() (ProfileItem *parent, Profile *profile) + ProfileItem * operator() (ProfileItem *tqparent, Profile *profile) { - parent->setOpen(true); - return new ProfileItem(parent, profile); + tqparent->setOpen(true); + return new ProfileItem(tqparent, profile); } }; -ProfileEditor::ProfileEditor(TQWidget *parent, const char *name) - :ProfileEditorBase(parent, name) +ProfileEditor::ProfileEditor(TQWidget *tqparent, const char *name) + :ProfileEditorBase(tqparent, name) { refresh(); } @@ -115,14 +115,14 @@ void ProfileEditor::refresh() void ProfileEditor::refreshPropertyCombo() { - KTrader::OfferList list = KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin")); + KTrader::OfferList list = KTrader::self()->query(TQString::tqfromLatin1("KDevelop/Plugin")); TQStringList props; for (KTrader::OfferList::const_iterator it = list.constBegin(); it != list.constEnd(); ++it) { TQStringList currProps = (*it)->property("X-KDevelop-Properties").toStringList(); for (TQStringList::const_iterator p = currProps.constBegin(); p != currProps.constEnd(); ++p) - if (!props.contains(*p)) + if (!props.tqcontains(*p)) props.append(*p); } props.sort(); @@ -258,7 +258,7 @@ void ProfileEditor::removeProfile() if (profile->remove()) { TQListViewItem *item = profilesList->currentItem(); - profilesList->setCurrentItem(item->parent()); + profilesList->setCurrentItem(item->tqparent()); profile->detachFromParent(); delete profile; delete item; @@ -271,8 +271,8 @@ void ProfileEditor::removeProfile() void ProfileEditor::addProperty() { if ( (!propertyCombo->currentText().isEmpty()) && - (ownPropertiesBox->findItem(propertyCombo->currentText()) == 0) && - (derivedPropertiesBox->findItem(propertyCombo->currentText()) == 0) ) + (ownPropertiesBox->tqfindItem(propertyCombo->currentText()) == 0) && + (derivedPropertiesBox->tqfindItem(propertyCombo->currentText()) == 0) ) { ownPropertiesBox->insertItem(propertyCombo->currentText()); @@ -322,9 +322,9 @@ void ProfileEditor::addEnabled() text = allList->currentItem()->text(0); } - if (enabledList->findItem(text, 0) != 0) + if (enabledList->tqfindItem(text, 0) != 0) return; - if (disabledList->findItem(text, 0) != 0) + if (disabledList->tqfindItem(text, 0) != 0) { KMessageBox::error(this, i18n("This plugin is already contained in the list of disabled plugins."), i18n("Enable Plugin")); @@ -368,9 +368,9 @@ void ProfileEditor::addDisabled() text = allList->currentItem()->text(0); } - if (disabledList->findItem(text, 0) != 0) + if (disabledList->tqfindItem(text, 0) != 0) return; - if (enabledList->findItem(text, 0) != 0) + if (enabledList->tqfindItem(text, 0) != 0) { KMessageBox::error(this, i18n("This plugin is already contained in the list of enabled plugins."), i18n("Disable Plugin")); diff --git a/src/profileengine/editor/profileeditor.h b/src/profileengine/editor/profileeditor.h index 182195f4..aae785b1 100644 --- a/src/profileengine/editor/profileeditor.h +++ b/src/profileengine/editor/profileeditor.h @@ -29,8 +29,9 @@ class KListViewItem; class ProfileEditor : public ProfileEditorBase { Q_OBJECT + TQ_OBJECT public: - ProfileEditor(TQWidget *parent = 0, const char *name = 0); + ProfileEditor(TQWidget *tqparent = 0, const char *name = 0); public slots: virtual void removeProperty(); diff --git a/src/profileengine/editor/profileeditorbase.ui b/src/profileengine/editor/profileeditorbase.ui index e91fd13d..094eeffd 100644 --- a/src/profileengine/editor/profileeditorbase.ui +++ b/src/profileengine/editor/profileeditorbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>ProfileEditorBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ProfileEditorBase</cstring> </property> @@ -19,18 +19,18 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSplitter" row="0" column="0"> + <widget class="TQSplitter" row="0" column="0"> <property name="name"> <cstring>splitter2</cstring> </property> <property name="orientation"> <enum>Vertical</enum> </property> - <widget class="QWidgetStack"> + <widget class="TQWidgetStack"> <property name="name"> <cstring>widgetStack1</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WStackPage</cstring> </property> @@ -47,9 +47,9 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <grid> <property name="name"> @@ -73,7 +73,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>142</height> @@ -137,11 +137,11 @@ </vbox> </widget> </widget> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget2</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -190,9 +190,9 @@ <string>Remove</string> </property> </widget> - <widget class="QLayoutWidget" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <vbox> <property name="name"> @@ -204,7 +204,7 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -219,9 +219,9 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="0" column="1" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="0" column="1" rowspan="1" colspan="3"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <vbox> <property name="name"> @@ -233,7 +233,7 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -250,7 +250,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -261,9 +261,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="2" rowspan="4" colspan="1"> + <widget class="TQLayoutWidget" row="0" column="2" rowspan="4" colspan="1"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <vbox> <property name="name"> @@ -275,7 +275,7 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -301,9 +301,9 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="4" column="2" rowspan="4" colspan="1"> + <widget class="TQLayoutWidget" row="4" column="2" rowspan="4" colspan="1"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <vbox> <property name="name"> @@ -315,7 +315,7 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -359,7 +359,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -376,7 +376,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -401,16 +401,16 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="0" column="0" rowspan="8" colspan="1"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="8" colspan="1"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <vbox> <property name="name"> @@ -422,7 +422,7 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_3</cstring> </property> @@ -474,7 +474,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -499,7 +499,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -560,15 +560,15 @@ <connections> <connection> <sender>profilesList</sender> - <signal>currentChanged(QListViewItem*)</signal> + <signal>currentChanged(TQListViewItem*)</signal> <receiver>ProfileEditorBase</receiver> - <slot>profileExecuted(QListViewItem*)</slot> + <slot>profileExecuted(TQListViewItem*)</slot> </connection> <connection> <sender>ownPropertiesBox</sender> - <signal>currentChanged(QListBoxItem*)</signal> + <signal>currentChanged(TQListBoxItem*)</signal> <receiver>ProfileEditorBase</receiver> - <slot>propertyExecuted(QListBoxItem*)</slot> + <slot>propertyExecuted(TQListBoxItem*)</slot> </connection> <connection> <sender>addProfileButton</sender> @@ -596,15 +596,15 @@ </connection> <connection> <sender>profilesList</sender> - <signal>executed(QListViewItem*)</signal> + <signal>executed(TQListViewItem*)</signal> <receiver>ProfileEditorBase</receiver> - <slot>profileExecuted(QListViewItem*)</slot> + <slot>profileExecuted(TQListViewItem*)</slot> </connection> <connection> <sender>profilesList</sender> - <signal>selectionChanged(QListViewItem*)</signal> + <signal>selectionChanged(TQListViewItem*)</signal> <receiver>ProfileEditorBase</receiver> - <slot>profileExecuted(QListViewItem*)</slot> + <slot>profileExecuted(TQListViewItem*)</slot> </connection> <connection> <sender>addEnabledButton</sender> @@ -645,9 +645,9 @@ <tabstop>disabledList</tabstop> <tabstop>pluginsView</tabstop> </tabstops> -<slots> - <slot>profileExecuted(QListViewItem *item)</slot> - <slot>propertyExecuted(QListBoxItem *item)</slot> +<Q_SLOTS> + <slot>profileExecuted(TQListViewItem *item)</slot> + <slot>propertyExecuted(TQListBoxItem *item)</slot> <slot>addProfile()</slot> <slot>removeProfile()</slot> <slot>addProperty()</slot> @@ -656,8 +656,8 @@ <slot>delEnabled()</slot> <slot>addDisabled()</slot> <slot>delDisabled()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>klistview.h</includehint> diff --git a/src/profileengine/lib/profile.cpp b/src/profileengine/lib/profile.cpp index f07c6376..39d247bf 100644 --- a/src/profileengine/lib/profile.cpp +++ b/src/profileengine/lib/profile.cpp @@ -26,8 +26,8 @@ #include <kconfig.h> #include <kio/netaccess.h> -Profile::Profile(Profile *parent, const TQString &name) - :m_parent(parent), m_name(name) +Profile::Profile(Profile *tqparent, const TQString &name) + :m_parent(tqparent), m_name(name) { if (m_parent) m_parent->addChildProfile(this); @@ -49,8 +49,8 @@ Profile::Profile(Profile *parent, const TQString &name) m_explicitDisable = config.readListEntry("List"); } -Profile::Profile(Profile *parent, const TQString &name, const TQString &genericName, const TQString &description) - :m_parent(parent), m_name(name), m_genericName(genericName), m_description(description) +Profile::Profile(Profile *tqparent, const TQString &name, const TQString &genericName, const TQString &description) + :m_parent(tqparent), m_name(name), m_genericName(genericName), m_description(description) { if (m_parent) m_parent->addChildProfile(this); @@ -59,18 +59,18 @@ Profile::Profile(Profile *parent, const TQString &name, const TQString &genericN Profile::~Profile() { - for (TQValueList<Profile*>::iterator it = m_children.begin(); it != m_children.end(); ++it) + for (TQValueList<Profile*>::iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it) delete *it; } void Profile::addChildProfile(Profile *profile) { - m_children.append(profile); + m_tqchildren.append(profile); } void Profile::removeChildProfile(Profile *profile) { - m_children.remove(profile); + m_tqchildren.remove(profile); } TQString Profile::dirName() const @@ -104,10 +104,10 @@ void Profile::save() Profile::EntryList Profile::list(List type) { - EntryList parentList; + EntryList tqparentList; if (m_parent) - parentList = m_parent->list(type); - EntryList list = parentList; + tqparentList = m_parent->list(type); + EntryList list = tqparentList; for (EntryList::iterator it = list.begin(); it != list.end(); ++it) (*it).derived = true; TQStringList &personalList = listByType(type); @@ -119,7 +119,7 @@ Profile::EntryList Profile::list(List type) void Profile::addEntry(List type, const TQString &value) { TQStringList &list = listByType(type); - if (!list.contains(value)) + if (!list.tqcontains(value)) list.append(value); } @@ -187,10 +187,10 @@ KURL::List Profile::resources(const TQString &nameFilter) dir = dir + "kdevelop/profiles" + dirName(); TQDir d(dir); - const QFileInfoList *infoList = d.entryInfoList(nameFilter, TQDir::Files); + const TQFileInfoList *infoList = d.entryInfoList(nameFilter, TQDir::Files); if (!infoList) continue; - for (QFileInfoList::const_iterator infoIt = infoList->constBegin(); + for (TQFileInfoList::const_iterator infoIt = infoList->constBegin(); infoIt != infoList->constEnd(); ++ infoIt) resources.append((*infoIt)->absFilePath()); } diff --git a/src/profileengine/lib/profile.h b/src/profileengine/lib/profile.h index c81db7e3..30e00517 100644 --- a/src/profileengine/lib/profile.h +++ b/src/profileengine/lib/profile.h @@ -45,12 +45,12 @@ public: ExplicitDisable /**<A list of explicitly disabled plugins (names).*/ }; - Profile(Profile *parent, const TQString &name); - Profile(Profile *parent, const TQString &name, const TQString &genericName, const TQString &description); + Profile(Profile *tqparent, const TQString &name); + Profile(Profile *tqparent, const TQString &name, const TQString &genericName, const TQString &description); ~Profile(); - TQValueList<Profile*> children() const { return m_children; } - Profile *parent() const { return m_parent; } + TQValueList<Profile*> tqchildren() const { return m_tqchildren; } + Profile *tqparent() const { return m_parent; } void save(); bool remove(); @@ -81,7 +81,7 @@ protected: private: Profile *m_parent; - TQValueList<Profile*> m_children; + TQValueList<Profile*> m_tqchildren; TQString m_name; diff --git a/src/profileengine/lib/profileengine.cpp b/src/profileengine/lib/profileengine.cpp index af8f2afe..7a6d65d8 100644 --- a/src/profileengine/lib/profileengine.cpp +++ b/src/profileengine/lib/profileengine.cpp @@ -57,7 +57,7 @@ void ProfileEngine::processDir(const TQString &dir, const TQString &currPath, TQ { TQString dirName = *eit; Profile *profile = 0; - if (passedPaths.contains(currPath + dirName)) + if (passedPaths.tqcontains(currPath + dirName)) profile = passedPaths[currPath + dirName]; else { @@ -78,24 +78,24 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType if (!profile) return KTrader::OfferList(); - TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION); + TQString constraint = TQString::tqfromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION); switch (offerType) { case Global: - constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Global'"); + constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Global'"); break; case Project: - constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Project'"); + constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Project'"); break; case Core: - constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Core'"); + constraint += TQString::tqfromLatin1(" 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::fromLatin1(" %1 '%2' in [X-KDevelop-Properties]"). - arg((i++)==0?"":"or").arg((*it).name); + constraint_add += TQString::tqfromLatin1(" %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::fromLatin1("KDevelop/Plugin"), constraint); + KTrader::OfferList list = KTrader::self()->query(TQString::tqfromLatin1("KDevelop/Plugin"), constraint); TQStringList names; /* Wrong, this is not what we want to do. @@ -127,11 +127,11 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType Profile::EntryList enableList = profile->list(Profile::ExplicitEnable); for (Profile::EntryList::const_iterator it = enableList.begin(); it != enableList.end(); ++it) { - if (names.contains((*it).name)) + if (names.tqcontains((*it).name)) continue; - 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); + 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); list += enable; } @@ -149,19 +149,19 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType KTrader::OfferList ProfileEngine::allOffers(OfferType offerType) { - TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION); + TQString constraint = TQString::tqfromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION); switch (offerType) { case Global: - constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Global'"); + constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Global'"); break; case Project: - constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Project'"); + constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Project'"); break; case Core: - constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Core'"); + constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Core'"); break; } - return KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"), constraint); + return KTrader::self()->query(TQString::tqfromLatin1("KDevelop/Plugin"), constraint); } void ProfileEngine::getProfileWithListing(ProfileListing &listing, Profile **profile, @@ -229,7 +229,7 @@ void ProfileEngine::diffProfiles(OfferType offerType, const TQString &profile1, it != offers1List.constEnd(); ++it) { // kdDebug() << "checking: " << *it << endl; - if (offers2List.contains(*it)) + if (offers2List.tqcontains(*it)) { // kdDebug() << " keep" << endl; offers2.remove(offers2List[*it]); diff --git a/src/profileengine/lib/profileengine.h b/src/profileengine/lib/profileengine.h index e790dece..9184df62 100644 --- a/src/profileengine/lib/profileengine.h +++ b/src/profileengine/lib/profileengine.h @@ -177,8 +177,8 @@ public: template<class Operation> void walkProfiles(Operation &op, Profile *root) { - TQValueList<Profile*> children = root->children(); - for (TQValueList<Profile*>::iterator it = children.begin(); it != children.end(); ++it) + TQValueList<Profile*> tqchildren = root->tqchildren(); + for (TQValueList<Profile*>::iterator it = tqchildren.begin(); it != tqchildren.end(); ++it) { op(*it); walkProfiles<Operation>(op, *it); @@ -189,7 +189,7 @@ public: but the operation in this case returns a result of type defined by "Result" template parameter. - When iterating the tree, the result of operation applied to the parent profile + When iterating the tree, the result of operation applied to the tqparent profile is passed as @p result parameter to the recursive call for child profiles. For example, this function can be used to build another hierarcy of profiles @@ -199,24 +199,24 @@ public: @code class ProfileListBuilding { public: - ProfileItem * operator() (ProfileItem *parent, Profile *profile) + ProfileItem * operator() (ProfileItem *tqparent, Profile *profile) { - parent->setOpen(true); - return new ProfileItem(parent, profile); + tqparent->setOpen(true); + return new ProfileItem(tqparent, profile); } }; class ProfileItem: public KListViewItem { public: - ProfileItem(KListView *parent, Profile *profile) - :KListViewItem(parent), m_profile(profile) + ProfileItem(KListView *tqparent, Profile *profile) + :KListViewItem(tqparent), m_profile(profile) { setText(0, profile->genericName()); setText(1, profile->description()); } - ProfileItem(KListViewItem *parent, Profile *profile) - : KListViewItem(parent), m_profile(profile) + ProfileItem(KListViewItem *tqparent, Profile *profile) + : KListViewItem(tqparent), m_profile(profile) { setText(0, profile->genericName()); setText(1, profile->description()); @@ -244,8 +244,8 @@ public: template<class Operation, class Result> void walkProfiles(Operation &op, Result *result, Profile *root) { - TQValueList<Profile*> children = root->children(); - for (TQValueList<Profile*>::iterator it = children.begin(); it != children.end(); ++it) + TQValueList<Profile*> tqchildren = root->tqchildren(); + for (TQValueList<Profile*>::iterator it = tqchildren.begin(); it != tqchildren.end(); ++it) { Result *newResult = op(result, *it); walkProfiles<Operation>(op, newResult, *it); diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp index 63dc88fa..42e5337d 100644 --- a/src/projectmanager.cpp +++ b/src/projectmanager.cpp @@ -221,7 +221,7 @@ bool ProjectManager::loadProject(const KURL &projectURL) if( projectLoaded() && url.path() == projectFile().path() ) { if (KMessageBox::questionYesNo(TopLevel::getInstance()->main(), - i18n("Are you sure you want to reopen the current project?"), TQString::null, i18n("Reopen"), i18n("Do Not Reopen")) == KMessageBox::No) + i18n("Are you sure you want to reopen the current project?"), TQString(), i18n("Reopen"), i18n("Do Not Reopen")) == KMessageBox::No) return false; } @@ -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").arg(m_info->m_projectURL.prettyURL())); + i18n("Could not read project file: %1").tqarg(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").arg(m_info->m_projectURL.prettyURL())); + i18n("Could not read project file: %1").tqarg(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") - .arg(errorLine).arg(errorCol).arg(errorMsg)); + .tqarg(errorLine).tqarg(errorCol).tqarg(errorMsg)); fin.close(); KIO::NetAccess::removeTempFile(path); return false; @@ -411,7 +411,7 @@ bool ProjectManager::saveProjectFile() API::getInstance()->projectDom()->save(stream, 2); fout.close(); } else { - KTempFile fout(TQString::fromLatin1("kdevelop3")); + KTempFile fout(TQString::tqfromLatin1("kdevelop3")); fout.setAutoDelete(true); if (fout.status() != 0) { KMessageBox::sorry(TopLevel::getInstance()->main(), i18n("Could not write the project file.")); @@ -486,7 +486,7 @@ bool ProjectManager::loadProjectPart() if (!projectService) { KMessageBox::sorry(TopLevel::getInstance()->main(), i18n("No project management plugin %1 found.") - .arg(m_info->m_projectPlugin)); + .tqarg(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.") - .arg(m_info->m_projectPlugin)); + .tqarg(m_info->m_projectPlugin)); return false; } @@ -536,13 +536,13 @@ 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").arg(lang).arg(KDEVELOP_PLUGIN_VERSION)); + KTrader::self()->query(TQString::tqfromLatin1("KDevelop/LanguageSupport"), + TQString::tqfromLatin1("[X-KDevelop-Language] == '%1' and [X-KDevelop-Version] == %2").tqarg(lang).tqarg(KDEVELOP_PLUGIN_VERSION)); if (languageSupportOffers.isEmpty()) { KMessageBox::sorry(TopLevel::getInstance()->main(), i18n("No language plugin for %1 found.") - .arg(lang)); + .tqarg(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.") - .arg(lang)); + .tqarg(lang)); return false; } @@ -648,7 +648,7 @@ bool ProjectManager::loadKDevelop2Project( const KURL & url ) // for (TQStringList::const_iterator it = profileKeywords.constBegin(); // it != profileKeywords.constEnd(); ++it) // { -// if (keywords.contains(*it)) +// if (keywords.tqcontains(*it)) // { // idx = profileKeywords.findIndex(*it); // break; diff --git a/src/projectmanager.h b/src/projectmanager.h index 15ac4644..ed71b48c 100644 --- a/src/projectmanager.h +++ b/src/projectmanager.h @@ -40,6 +40,7 @@ Loads and unloads projects. class ProjectManager : public TQObject, public KXMLGUIClient { Q_OBJECT + TQ_OBJECT public: diff --git a/src/projectsession.cpp b/src/projectsession.cpp index 1b09ca71..ae54bbfa 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.").arg(sessionFileName)); + "The loading of the session failed.").tqarg(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").arg(sessionFileName) - + i18n("The document type seems to be: '%1'.").arg(domdoc.doctype().name())); + 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())); return false; } @@ -112,7 +112,7 @@ bool ProjectSession::restoreFromFile( const TQString & sessionFileName, const TQ TQString pluginName = pPlugin->instance()->instanceName(); TQDomElement pluginEl = pluginListEl.namedItem(pluginName).toElement(); if (!pluginEl.isNull()) { - // now plugin, load what you find! + // now plugin, load what you tqfind! pPlugin->restorePartialProjectSession(&pluginEl); } ++it; @@ -128,7 +128,7 @@ void ProjectSession::recreateDocs(TQDomElement& el) { //// TQDomElement mainframeEl = el.namedItem("Mainframe").toElement(); //// bool bMaxMode =initXMLTree() (bool) mainframeEl.attribute("MaximizeMode", "0").toInt(); -//// QextMdiMainFrm* pMainWidget = (QextMdiMainFrm*) qApp->mainWidget(); +//// QextMdiMainFrm* pMainWidget = (QextMdiMainFrm*) tqApp->mainWidget(); //// pMainWidget->setEnableMaximizedChildFrmMode(bMaxMode); //// bool bTaskBarWasOn = pMainWidget->isViewTaskBarOn(); //// pMainWidget->hideViewTaskBar(); @@ -221,8 +221,8 @@ void ProjectSession::recreateViews(KURL& url, TQDomElement docEl, bool activate) } //// // restore focus //// if (pFocusedView != 0L) { -//// if (pFocusedView->parentWidget()->inherits("QextMdiChildView")) { -//// ((QextMdiChildView*)pFocusedView->parentWidget())->activate(); +//// if (pFocusedView->tqparentWidget()->inherits("QextMdiChildView")) { +//// ((QextMdiChildView*)pFocusedView->tqparentWidget())->activate(); //// } //// pFocusedView->setFocus(); //// } @@ -244,7 +244,7 @@ bool ProjectSession::saveToFile( const TQString & sessionFileName, const TQValue //// mainframeEl=domdoc.createElement("Mainframe"); //// session.appendChild( mainframeEl); //// } -//// bool bMaxMode = ((QextMdiMainFrm*)m_pDocViewMan->parent())->isInMaximizedChildFrmMode(); +//// bool bMaxMode = ((QextMdiMainFrm*)m_pDocViewMan->tqparent())->isInMaximizedChildFrmMode(); //// mainframeEl.setAttribute("MaximizeMode", bMaxMode); @@ -349,7 +349,7 @@ bool ProjectSession::saveToFile( const TQString & sessionFileName, const TQValue TQDomElement viewEl = domdoc.createElement( "View"+viewIdStr); docEl.appendChild( viewEl); // focus? -//// viewEl.setAttribute("Focus", (((CEditWidget*)pView->parentWidget()) == m_pDocViewMan->currentEditView())); +//// viewEl.setAttribute("Focus", (((CEditWidget*)pView->tqparentWidget()) == m_pDocViewMan->currentEditView())); viewEl.setAttribute("Type", "???"); TQDomElement viewPropertiesEl = domdoc.createElement("AdditionalSettings"); diff --git a/src/projectsession.h b/src/projectsession.h index ef8ac2df..6ddccefa 100644 --- a/src/projectsession.h +++ b/src/projectsession.h @@ -32,9 +32,10 @@ class KDevPlugin; * Session stuff that is not related to a certain project doesn't belong to here; * it must be saved in a program session which likely is "kdeveloprc". **/ -class ProjectSession : public QObject +class ProjectSession : public TQObject { Q_OBJECT + TQ_OBJECT // methods public: ProjectSession(); diff --git a/src/settingswidget.ui b/src/settingswidget.ui index eedcd231..df44b1d5 100644 --- a/src/settingswidget.ui +++ b/src/settingswidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>SettingsWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form2</cstring> </property> @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QCheckBox" row="1" column="2" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>lastProjectCheckbox</cstring> </property> @@ -36,18 +36,18 @@ <string>Mark this checkbox if you want to continue to work with the last project you worked on. This will cause KDevelop to automatically load this project on start-up. It will usually be shown in the state you left work so you can readily proceed.</string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="4"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>textLabel2</cstring> </property> <property name="text"> <string><qt><h3>Project Settings</h3></qt></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QCheckBox" row="6" column="2" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="6" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>lineWrappingCheckBox</cstring> </property> @@ -61,15 +61,15 @@ <string>By default, KDevelop will wrap long lines around in the Messages Output View window so that valuable information will not be easily overlooked. In some cases this will clutter long message lists. Remove the checkbox mark if you do not want the lines wrap around.</string> </property> </widget> - <widget class="QLayoutWidget" row="5" column="2" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="5" column="2" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>compilerLabel</cstring> </property> @@ -80,7 +80,7 @@ <cstring>compileOutputCombo</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>Very Short</string> @@ -119,7 +119,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="3" column="0" rowspan="1" colspan="4"> + <widget class="TQLabel" row="3" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -129,19 +129,19 @@ <property name="textFormat"> <enum>AutoText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignBottom|AlignLeft</set> </property> </widget> - <widget class="QLayoutWidget" row="2" column="2" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="2" column="2" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -163,7 +163,7 @@ <string>Set the directory where you want your projects in.</string> </property> <property name="whatsThis" stdset="0"> - <string>By default, KDevelop uses a common parent directory for all new projects. Enter the absolute path of this common directory in the box or select it from your directory structure. KDevelop will place the any new project here as a subdirectory.</string> + <string>By default, KDevelop uses a common tqparent directory for all new projects. Enter the absolute path of this common directory in the box or select it from your directory structure. KDevelop will place the any new project here as a subdirectory.</string> </property> </widget> </hbox> @@ -178,22 +178,22 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="4" column="2" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="4" column="2" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>buttonLabel</cstring> </property> @@ -232,14 +232,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>60</height> </size> </property> </spacer> - <widget class="QButtonGroup" row="12" column="3"> + <widget class="TQButtonGroup" row="12" column="3"> <property name="name"> <cstring>terminalButtonGroup</cstring> </property> @@ -253,7 +253,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>useKDETerminal</cstring> </property> @@ -270,15 +270,15 @@ <string>If checked, KDevelop will use the default terminal as set in KControl in KDE components, Component Chooser.</string> </property> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>useOtherTerminal</cstring> </property> @@ -312,14 +312,14 @@ </widget> </grid> </widget> - <widget class="QLabel" row="11" column="0" rowspan="1" colspan="4"> + <widget class="TQLabel" row="11" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>textLabel5_2</cstring> </property> <property name="text"> <string><qt><h3>Terminal Emulation</h3></qt></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> @@ -333,7 +333,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>50</height> @@ -350,25 +350,25 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLabel" row="9" column="0" rowspan="1" colspan="4"> + <widget class="TQLabel" row="9" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>textLabel5</cstring> </property> <property name="text"> <string><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></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> - <widget class="QButtonGroup" row="10" column="3"> + <widget class="TQButtonGroup" row="10" column="3"> <property name="name"> <cstring>designerButtonGroup</cstring> </property> @@ -388,7 +388,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>embeddedDesignerRadioButton</cstring> </property> @@ -402,7 +402,7 @@ <string>KDevelop comes with its own UI designer that can either be embedded or be run as a separate program. Check this button if you wish to integrate the UI designer into KDevelop.</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>seperateAppRadioButton</cstring> </property> @@ -416,7 +416,7 @@ <string>KDevelop comes with its own UI designer that can either be embedded or be run as a separate program. Check this button if you wish to run KDevelop's UI designer as a separate program.</string> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>qtDesignerRadioButton</cstring> </property> @@ -432,7 +432,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox" row="7" column="2" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="7" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>dirNavigMsgCheckBox</cstring> </property> @@ -459,14 +459,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>150</height> </size> </property> </spacer> - <widget class="QButtonGroup" row="8" column="1" rowspan="1" colspan="3"> + <widget class="TQButtonGroup" row="8" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>buttonGroup3</cstring> </property> @@ -479,7 +479,7 @@ <property name="title"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignAuto</set> </property> <vbox> @@ -489,7 +489,7 @@ <property name="margin"> <number>6</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>forceCLocaleRadio</cstring> </property> @@ -497,7 +497,7 @@ <string>Force English compiler output</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>userLocaleRadio</cstring> </property> @@ -517,7 +517,7 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp index 73164f86..bca7766a 100644 --- a/src/simplemainwindow.cpp +++ b/src/simplemainwindow.cpp @@ -57,20 +57,20 @@ #include "editorproxy.h" #include "multibuffer.h" -SimpleMainWindow::SimpleMainWindow(TQWidget* parent, const char *name) - :DMainWindow(parent, name) +SimpleMainWindow::SimpleMainWindow(TQWidget* tqparent, const char *name) + :DMainWindow(tqparent, name) { resize(800, 600); // starts kdevelop at 800x600 the first time - m_mainWindowShare = new MainWindowShare(this); + m_mainWindowShare = new MainWindowShare(TQT_TQOBJECT(this)); - connect(m_bottomDock, TQT_SIGNAL(hidden()), this, TQT_SLOT(raiseEditor())); - connect(m_leftDock, TQT_SIGNAL(hidden()), this, TQT_SLOT(raiseEditor())); - connect(m_rightDock, TQT_SIGNAL(hidden()), this, TQT_SLOT(raiseEditor())); + connect(m_bottomDock, TQT_SIGNAL(hidden()), TQT_TQOBJECT(this), TQT_SLOT(raiseEditor())); + connect(m_leftDock, TQT_SIGNAL(hidden()), TQT_TQOBJECT(this), TQT_SLOT(raiseEditor())); + connect(m_rightDock, TQT_SIGNAL(hidden()), TQT_TQOBJECT(this), TQT_SLOT(raiseEditor())); } SimpleMainWindow::~ SimpleMainWindow( ) { - TopLevel::invalidateInstance( this ); + TopLevel::tqinvalidateInstance( this ); } void SimpleMainWindow::init() @@ -105,19 +105,19 @@ void SimpleMainWindow::init() i18n("Could Not Find Plugins") ); } - connect(Core::getInstance(), TQT_SIGNAL(coreInitialized()), this, TQT_SLOT(slotCoreInitialized())); - connect(Core::getInstance(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened())); - connect(Core::getInstance(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed())); + connect(Core::getInstance(), TQT_SIGNAL(coreInitialized()), TQT_TQOBJECT(this), TQT_SLOT(slotCoreInitialized())); + connect(Core::getInstance(), TQT_SIGNAL(projectOpened()), TQT_TQOBJECT(this), TQT_SLOT(projectOpened())); + connect(Core::getInstance(), TQT_SIGNAL(projectClosed()), TQT_TQOBJECT(this), TQT_SLOT(projectClosed())); connect(Core::getInstance(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); + TQT_TQOBJECT(this), TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); connect(PartController::getInstance(), TQT_SIGNAL(partURLChanged(KParts::ReadOnlyPart *)), - this, TQT_SLOT(slotPartURLChanged(KParts::ReadOnlyPart * ))); + TQT_TQOBJECT(this), TQT_SLOT(slotPartURLChanged(KParts::ReadOnlyPart * ))); connect(PartController::getInstance(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(activePartChanged(KParts::Part*))); + TQT_TQOBJECT(this), TQT_SLOT(activePartChanged(KParts::Part*))); connect(PartController::getInstance(), TQT_SIGNAL(documentChangedState(const KURL &, DocumentState)), - this, TQT_SLOT(documentChangedState(const KURL&, DocumentState))); + TQT_TQOBJECT(this), TQT_SLOT(documentChangedState(const KURL&, DocumentState))); loadSettings(); } @@ -182,7 +182,7 @@ void SimpleMainWindow::contextMenu(TQPopupMenu *popupMenu, const Context *contex bool isOpen = true; for (KURL::List::const_iterator it = m_splitURLs.begin(); it != m_splitURLs.end(); ++it) { - if (!PartController::getInstance()->openURLs().contains(*it) && (*it).isValid()) + if (!PartController::getInstance()->openURLs().tqcontains(*it) && (*it).isValid()) { isOpen = false; break; @@ -217,7 +217,7 @@ void SimpleMainWindow::embedPartView(TQWidget *view, const TQString &title, cons return; TQString shortName = title; - shortName = shortName.right( shortName.length() - (shortName.findRev('/') +1)); + shortName = shortName.right( shortName.length() - (shortName.tqfindRev('/') +1)); addWidget(view, title); view->show(); @@ -322,15 +322,15 @@ void SimpleMainWindow::raiseView(TQWidget *view) { //adymo: a workaround to make editor wrappers work: //editor view is passed to this function but the ui library knows only - //of its parent which is an editor wrapper, simply replacing the view + //of its tqparent which is an editor wrapper, simply replacing the view //by its wrapper helps here - if (view->parent()) - kdDebug() << view->parent()->className() << endl; - if (view->parent() && (view->parent()->isA("EditorWrapper") || view->parent()->isA("MultiBuffer"))) + if (view->tqparent()) + kdDebug() << view->tqparent()->className() << endl; + if (view->tqparent() && (view->tqparent()->isA("EditorWrapper") || view->tqparent()->isA("MultiBuffer"))) { -// kdDebug() << "parent is editor wrapper: " << -// static_cast<EditorWrapper*>(view->parent()) << endl; - view = (TQWidget*)view->parent(); +// kdDebug() << "tqparent is editor wrapper: " << +// static_cast<EditorWrapper*>(view->tqparent()) << endl; + view = (TQWidget*)view->tqparent(); } if (hasDockWidget(view)) @@ -338,7 +338,7 @@ void SimpleMainWindow::raiseView(TQWidget *view) DDockWindow *dock = toolWindow(dockWidgetPosition(view)); dock->raiseWidget(view); } - else if (m_widgets.contains(view) && m_widgetTabs.contains(view)) + else if (m_widgets.tqcontains(view) && m_widgetTabs.tqcontains(view)) m_widgetTabs[view]->showPage(view); } @@ -403,64 +403,64 @@ void SimpleMainWindow::createFramework() PartController::createInstance( this ); connect(PartController::getInstance(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(createGUI(KParts::Part*))); + TQT_TQOBJECT(this), TQT_SLOT(createGUI(KParts::Part*))); } void SimpleMainWindow::createActions() { m_raiseEditor = new KAction(i18n("Raise &Editor"), ALT+Key_C, - this, TQT_SLOT(raiseEditor()), actionCollection(), "raise_editor"); + TQT_TQOBJECT(this), TQT_SLOT(raiseEditor()), actionCollection(), "raise_editor"); m_raiseEditor->setToolTip(i18n("Raise editor")); m_raiseEditor->setWhatsThis(i18n("<b>Raise editor</b><p>Focuses the editor.")); m_lowerAllDocks = new KAction(i18n("Lower All Docks"), CTRL+SHIFT+Key_C, - this, TQT_SLOT(lowerAllDocks()), actionCollection(), "lower_all_docks"); + TQT_TQOBJECT(this), TQT_SLOT(lowerAllDocks()), actionCollection(), "lower_all_docks"); - new KAction(i18n("Switch to next TabWidget"), 0, this, + new KAction(i18n("Switch to next TabWidget"), 0, TQT_TQOBJECT(this), TQT_SLOT(switchToNextTabWidget()), actionCollection(), "switch_to_next_tabwidget" ); m_splitHor = new KAction(i18n("Split &Horizontal"), CTRL+SHIFT+Key_T, - this, TQT_SLOT(slotSplitHorizontalBase()), actionCollection(), "split_h"); + TQT_TQOBJECT(this), TQT_SLOT(slotSplitHorizontalBase()), actionCollection(), "split_h"); m_splitHor->setIcon("view_top_bottom"); m_splitVer = new KAction(i18n("Split &Vertical"), CTRL+SHIFT+Key_L, - this, TQT_SLOT(slotSplitVerticalBase()), actionCollection(), "split_v"); + TQT_TQOBJECT(this), TQT_SLOT(slotSplitVerticalBase()), actionCollection(), "split_v"); m_splitVer->setIcon("view_left_right"); m_splitHor1 = new KAction(i18n("Split &Horizontal"), 0, - this, TQT_SLOT(slotSplitHorizontal()), actionCollection(), "split_h1"); + TQT_TQOBJECT(this), TQT_SLOT(slotSplitHorizontal()), actionCollection(), "split_h1"); m_splitHor1->setIcon("view_top_bottom"); m_splitVer1 = new KAction(i18n("Split &Vertical"), 0, - this, TQT_SLOT(slotSplitVertical()), actionCollection(), "split_v1"); + TQT_TQOBJECT(this), TQT_SLOT(slotSplitVertical()), actionCollection(), "split_v1"); m_splitVer1->setIcon("view_left_right"); m_splitHor2 = new KAction(i18n("Split &Horizontal and Open"), 0, - this, TQT_SLOT(slotSplitHorizontal()), actionCollection(), "split_h2"); + TQT_TQOBJECT(this), TQT_SLOT(slotSplitHorizontal()), actionCollection(), "split_h2"); m_splitHor2->setIcon("view_top_bottom"); m_splitVer2 = new KAction(i18n("Split &Vertical and Open"), 0, - this, TQT_SLOT(slotSplitVertical()), actionCollection(), "split_v2"); + TQT_TQOBJECT(this), TQT_SLOT(slotSplitVertical()), actionCollection(), "split_v2"); m_splitVer2->setIcon("view_left_right"); m_raiseLeftDock = new KAction(i18n("Switch Left Dock"), CTRL+SHIFT+ALT+Key_L, - this, TQT_SLOT(raiseLeftDock()), actionCollection(), "switch_left_dock"); + TQT_TQOBJECT(this), TQT_SLOT(raiseLeftDock()), actionCollection(), "switch_left_dock"); m_raiseRightDock = new KAction(i18n("Switch Right Dock"), CTRL+SHIFT+ALT+Key_R, - this, TQT_SLOT(raiseRightDock()), actionCollection(), "switch_right_dock"); + TQT_TQOBJECT(this), TQT_SLOT(raiseRightDock()), actionCollection(), "switch_right_dock"); m_raiseBottomDock = new KAction(i18n("Switch Bottom Dock"), CTRL+SHIFT+ALT+Key_B, - this, TQT_SLOT(raiseBottomDock()), actionCollection(), "switch_bottom_dock"); + TQT_TQOBJECT(this), TQT_SLOT(raiseBottomDock()), actionCollection(), "switch_bottom_dock"); - KStdAction::configureToolbars(this, TQT_SLOT(configureToolbars()), + KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolbars()), actionCollection(), "set_configure_toolbars"); m_mainWindowShare->createActions(); - connect(m_mainWindowShare, TQT_SIGNAL(gotoNextWindow()), this, TQT_SLOT(gotoNextWindow())); - connect(m_mainWindowShare, TQT_SIGNAL(gotoPreviousWindow()), this, TQT_SLOT(gotoPreviousWindow())); - connect(m_mainWindowShare, TQT_SIGNAL(gotoFirstWindow()), this, TQT_SLOT(gotoFirstWindow())); - connect(m_mainWindowShare, TQT_SIGNAL(gotoLastWindow()), this, TQT_SLOT(gotoLastWindow())); + connect(m_mainWindowShare, TQT_SIGNAL(gotoNextWindow()), TQT_TQOBJECT(this), TQT_SLOT(gotoNextWindow())); + connect(m_mainWindowShare, TQT_SIGNAL(gotoPreviousWindow()), TQT_TQOBJECT(this), TQT_SLOT(gotoPreviousWindow())); + connect(m_mainWindowShare, TQT_SIGNAL(gotoFirstWindow()), TQT_TQOBJECT(this), TQT_SLOT(gotoFirstWindow())); + connect(m_mainWindowShare, TQT_SIGNAL(gotoLastWindow()), TQT_TQOBJECT(this), TQT_SLOT(gotoLastWindow())); } void SimpleMainWindow::raiseEditor() @@ -522,7 +522,7 @@ void SimpleMainWindow::slotCoreInitialized() void SimpleMainWindow::projectOpened() { - setCaption(TQString::null); + setCaption(TQString()); } void SimpleMainWindow::slotPartURLChanged(KParts::ReadOnlyPart *part) @@ -577,9 +577,9 @@ void SimpleMainWindow::documentChangedState(const KURL &url, DocumentState state void SimpleMainWindow::closeTab() { // actionCollection()->action("file_close")->activate(); - if (sender()->isA(TQTOOLBUTTON_OBJECT_NAME_STRING) && sender()->parent()->isA("DTabWidget")) + if (TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->isA(TQTOOLBUTTON_OBJECT_NAME_STRING) && TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->tqparent()->isA("DTabWidget")) { - DTabWidget *tab = (DTabWidget*)sender()->parent(); + DTabWidget *tab = (DTabWidget*)TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->tqparent(); if (tab && tab->currentPage()) closeTab(tab->currentPage()); } @@ -587,7 +587,7 @@ void SimpleMainWindow::closeTab() void SimpleMainWindow::tabContext(TQWidget *w, const TQPoint &p) { - DTabWidget *tabWidget = static_cast<DTabWidget*>(const_cast<TQObject*>(sender())); + DTabWidget *tabWidget = static_cast<DTabWidget*>(TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))); if (!tabWidget) return; @@ -595,7 +595,7 @@ void SimpleMainWindow::tabContext(TQWidget *w, const TQPoint &p) tabMenu.insertTitle(tabWidget->tabLabel(w)); //Find the document on whose tab the user clicked - m_currentTabURL = TQString::null; + m_currentTabURL = TQString(); TQPtrListIterator<KParts::Part> it(*PartController::getInstance()->parts()); while (KParts::Part* part = it.current()) { @@ -633,7 +633,7 @@ void SimpleMainWindow::tabContext(TQWidget *w, const TQPoint &p) ++it; } - connect(&tabMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(tabContextActivated(int))); + connect(&tabMenu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(tabContextActivated(int))); tabMenu.exec(p); } @@ -668,7 +668,7 @@ void SimpleMainWindow::configureToolbars() { saveMainWindowSettings(KGlobal::config(), "SimpleMainWindow"); KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotNewToolbarConfig())); + connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_TQOBJECT(this), TQT_SLOT(slotNewToolbarConfig())); dlg.exec(); } @@ -693,7 +693,7 @@ bool SimpleMainWindow::queryExit() void SimpleMainWindow::setupWindowMenu() { // get the xmlgui created one instead - m_windowMenu = static_cast<TQPopupMenu*>(main()->child("window", "KPopupMenu")); + m_windowMenu = static_cast<TQPopupMenu*>(TQT_TQWIDGET(main()->child("window", "KPopupMenu"))); if (!m_windowMenu) { @@ -707,13 +707,13 @@ void SimpleMainWindow::setupWindowMenu() actionCollection()->action("file_close_all")->plug(m_windowMenu); actionCollection()->action("file_closeother")->plug(m_windowMenu); - TQObject::connect(m_windowMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(openURL(int))); - TQObject::connect(m_windowMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(fillWindowMenu())); + TQObject::connect(m_windowMenu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(openURL(int))); + TQObject::connect(m_windowMenu, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(fillWindowMenu())); } void SimpleMainWindow::openURL(int w) { - TQValueList<QPair<int, KURL> >::ConstIterator it = m_windowList.begin(); + TQValueList<TQPair<int, KURL> >::ConstIterator it = m_windowList.begin(); while (it != m_windowList.end()) { if ((*it).first == w) @@ -732,7 +732,7 @@ void SimpleMainWindow::openURL(int w) void SimpleMainWindow::fillWindowMenu() { // clear menu - TQValueList< QPair< int, KURL > >::ConstIterator it = m_windowList.begin(); + TQValueList< TQPair< int, KURL > >::ConstIterator it = m_windowList.begin(); while (it != m_windowList.end()) { m_windowMenu->removeItem( (*it).first ); @@ -761,12 +761,12 @@ void SimpleMainWindow::fillWindowMenu() int i = 0; if (list.count() > 0) - m_windowList << qMakePair(m_windowMenu->insertSeparator(), KURL()); + m_windowList << tqMakePair(m_windowMenu->insertSeparator(), KURL()); while (itt != list.end()) { - temp = m_windowMenu->insertItem( i < 10 ? TQString("&%1 %2").arg(i).arg((*itt).fileName()) : (*itt).fileName() ); - m_windowList << qMakePair(temp, *itt); + temp = m_windowMenu->insertItem( i < 10 ? TQString("&%1 %2").tqarg(i).tqarg((*itt).fileName()) : (*itt).fileName() ); + m_windowList << tqMakePair(temp, *itt); ++i; ++itt; } @@ -847,13 +847,13 @@ TQWidget *SimpleMainWindow::widgetForURL(KURL url) TQWidget *SimpleMainWindow::widgetInTab(TQWidget *w) { TQWidget *inTab = 0; - if (w && w->parent() && w->parent()->isA("EditorProxy")) - inTab = (TQWidget*)w->parent(); - else if (w && w->parent() && w->parent()->isA("MultiBuffer") - && w->parent()->parent() && w->parent()->parent()->isA("EditorProxy")) - inTab = (TQWidget*)w->parent()->parent(); - else if (w && w->parent() && w->parent()->isA("MultiBuffer")) - inTab = (TQWidget*)w->parent(); + if (w && w->tqparent() && w->tqparent()->isA("EditorProxy")) + inTab = (TQWidget*)w->tqparent(); + else if (w && w->tqparent() && w->tqparent()->isA("MultiBuffer") + && w->tqparent()->tqparent() && w->tqparent()->tqparent()->isA("EditorProxy")) + inTab = (TQWidget*)w->tqparent()->tqparent(); + else if (w && w->tqparent() && w->tqparent()->isA("MultiBuffer")) + inTab = (TQWidget*)w->tqparent(); else inTab = w; return inTab; @@ -900,7 +900,7 @@ void SimpleMainWindow::activePartChanged(KParts::Part *part) void SimpleMainWindow::createGUI(KParts::Part *part) { if ( !part ) - setCaption( TQString::null ); + setCaption( TQString() ); DMainWindow::createGUI(part); m_mainWindowShare->slotGUICreated( part ); @@ -943,7 +943,7 @@ void SimpleMainWindow::switchToNextTabWidget() TQValueList<DTabWidget*>::iterator it = tabWidgets.begin(); while ( it != tabWidgets.end() ) { - if ( !reduced.contains( *it ) ) + if ( !reduced.tqcontains( *it ) ) { reduced << *it; } @@ -1003,9 +1003,9 @@ void SimpleMainWindow::setCaption(const TQString &caption) void SimpleMainWindow::projectClosed() { - DMainWindow::setCaption(TQString::null); + DMainWindow::setCaption(TQString()); } #include "simplemainwindow.moc" -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on diff --git a/src/simplemainwindow.h b/src/simplemainwindow.h index 684f4839..11180edb 100644 --- a/src/simplemainwindow.h +++ b/src/simplemainwindow.h @@ -36,11 +36,12 @@ namespace KParts { class SimpleMainWindow: public DMainWindow, public KDevMainWindow { Q_OBJECT + TQ_OBJECT public: - SimpleMainWindow(TQWidget* parent = 0, const char *name = 0); + SimpleMainWindow(TQWidget* tqparent = 0, const char *name = 0); virtual ~SimpleMainWindow(); - virtual void embedPartView(TQWidget *view, const TQString &title, const TQString& toolTip = TQString::null); + virtual void embedPartView(TQWidget *view, const TQString &title, const TQString& toolTip = TQString()); virtual void embedSelectView(TQWidget *view, const TQString &title, const TQString &toolTip); virtual void embedOutputView(TQWidget *view, const TQString &title, const TQString &toolTip); virtual void embedSelectViewRight(TQWidget* view, const TQString& title, const TQString &toolTip); @@ -130,11 +131,11 @@ private: KAction *m_raiseLeftDock; KAction *m_raiseRightDock; TQPopupMenu *m_windowMenu; - TQValueList<QPair<int, KURL> > m_windowList; + TQValueList<TQPair<int, KURL> > m_windowList; KURL::List m_splitURLs; }; -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on #endif diff --git a/src/splashscreen.cpp b/src/splashscreen.cpp index 25a4c811..ddfb8e62 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)); - repaint(); + tqrepaint(); } @@ -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, Qt::AlignRight, i18n("Version %1").arg( VERSION )); + painter->drawText(r, TQt::AlignRight, i18n("Version %1").tqarg( VERSION )); // Draw message at given position, limited to 43 chars // If message is too long, string is truncated diff --git a/src/splashscreen.h b/src/splashscreen.h index acd0cb5d..317ecdc3 100644 --- a/src/splashscreen.h +++ b/src/splashscreen.h @@ -11,9 +11,10 @@ class TQPixmap; /** Splash screen. */ -class KDevSplashScreen : public QSplashScreen +class KDevSplashScreen : public TQSplashScreen { Q_OBJECT + TQ_OBJECT public: KDevSplashScreen(const TQPixmap& pixmap, WFlags f = 0); diff --git a/src/statusbar.cpp b/src/statusbar.cpp index 02031021..581c2fd2 100644 --- a/src/statusbar.cpp +++ b/src/statusbar.cpp @@ -27,8 +27,8 @@ #include "statusbar.h" #include "partcontroller.h" -KDevStatusBar::KDevStatusBar(TQWidget *parent, const char *name) - : KStatusBar(parent, name), _cursorIface(0), _activePart(0) +KDevStatusBar::KDevStatusBar(TQWidget *tqparent, const char *name) + : KStatusBar(tqparent, name), _cursorIface(0), _activePart(0) { TQWidget * w = new TQWidget( this ); addWidget( w, 1, true ); @@ -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->setAlignment(TQWidget::AlignCenter); + _status->tqsetAlignment(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<KTextEditor::ViewStatusMsgInterface*>(part->widget()))) { connect( part->widget(), TQT_SIGNAL( viewStatusMsg( const TQString & ) ), - this, TQT_SLOT( setStatus( const TQString & ) ) ); + this, TQT_SLOT( settqStatus( const TQString & ) ) ); _status->show(); } @@ -90,7 +90,7 @@ void KDevStatusBar::cursorPositionChanged() } } -void KDevStatusBar::setStatus(const TQString &str) +void KDevStatusBar::settqStatus(const TQString &str) { _status->setText(str); } @@ -98,15 +98,15 @@ void KDevStatusBar::setStatus(const TQString &str) void KDevStatusBar::setCursorPosition(int line, int col) { - _status->setText(i18n(" Line: %1 Col: %2 ").arg(line+1).arg(col)); + _status->setText(i18n(" Line: %1 Col: %2 ").tqarg(line+1).tqarg(col)); } void KDevStatusBar::addWidget ( TQWidget *widget, int stretch, bool permanent) { KStatusBar::addWidget(widget,stretch,permanent); - if(widget->sizeHint().height() + 4 > height()) - setFixedHeight(widget->sizeHint().height() + 4); + if(widget->tqsizeHint().height() + 4 > height()) + setFixedHeight(widget->tqsizeHint().height() + 4); } #include "statusbar.moc" diff --git a/src/statusbar.h b/src/statusbar.h index cf7a4abe..1c325fcf 100644 --- a/src/statusbar.h +++ b/src/statusbar.h @@ -22,21 +22,22 @@ namespace KTextEditor { class ViewCursorInterface; } namespace KParts { class Part; } /** -Status bar. +tqStatus bar. */ class KDevStatusBar : public KStatusBar { Q_OBJECT + TQ_OBJECT public: - KDevStatusBar( TQWidget *parent=0, const char *name=0 ); + KDevStatusBar( TQWidget *tqparent=0, const char *name=0 ); ~KDevStatusBar(); void addWidget ( TQWidget *widget, int stretch = 0, bool permanent = FALSE ); private slots: void cursorPositionChanged(); void activePartChanged(KParts::Part *part); - void setStatus(const TQString &str); + void settqStatus(const TQString &str); void setCursorPosition(int line, int col); private: diff --git a/src/toplevel.cpp b/src/toplevel.cpp index 048b325c..cecfa36d 100644 --- a/src/toplevel.cpp +++ b/src/toplevel.cpp @@ -28,7 +28,7 @@ KDevMainWindow *TopLevel::getInstance() return s_instance; } -void TopLevel::invalidateInstance(KDevMainWindow *instance) +void TopLevel::tqinvalidateInstance(KDevMainWindow *instance) { if ( s_instance == instance ) s_instance = 0; diff --git a/src/toplevel.h b/src/toplevel.h index 8eb0243a..c91d5be2 100644 --- a/src/toplevel.h +++ b/src/toplevel.h @@ -16,7 +16,7 @@ public: static KDevMainWindow *getInstance(); //!< Get a pointer to the single KDevTopLevel object static bool mainWindowValid(); - static void invalidateInstance(KDevMainWindow *instance); //!< Signal that the object has been (or is about to be) destroyed + static void tqinvalidateInstance(KDevMainWindow *instance); //!< Signal that the object has been (or is about to be) destroyed private: |