diff options
Diffstat (limited to 'parts/documentation')
64 files changed, 509 insertions, 484 deletions
diff --git a/parts/documentation/KDevDocumentationIface.h b/parts/documentation/KDevDocumentationIface.h index e398e89d..a4c49b8d 100644 --- a/parts/documentation/KDevDocumentationIface.h +++ b/parts/documentation/KDevDocumentationIface.h @@ -27,6 +27,7 @@ class DocumentationPart; class KDevDocumentationIface : public TQObject, public DCOPObject { Q_OBJECT +// TQ_OBJECT K_DCOP public: KDevDocumentationIface(DocumentationPart *part); diff --git a/parts/documentation/addcatalogdlg.cpp b/parts/documentation/addcatalogdlg.cpp index 21913089..28be5a8c 100644 --- a/parts/documentation/addcatalogdlg.cpp +++ b/parts/documentation/addcatalogdlg.cpp @@ -32,8 +32,8 @@ #include "kdevdocumentationplugin.h" AddCatalogDlg::AddCatalogDlg( TQValueList<DocumentationPlugin*> const & plugins, - TQWidget* parent, const char* name, bool modal, WFlags fl) - :AddCatalogDlgBase(parent,name, modal,fl), m_plugins( plugins ) + TQWidget* tqparent, const char* name, bool modal, WFlags fl) + :AddCatalogDlgBase(tqparent,name, modal,fl), m_plugins( plugins ) { for (TQValueList<DocumentationPlugin*>::const_iterator it = m_plugins.constBegin(); it != m_plugins.constEnd(); ++it) { diff --git a/parts/documentation/addcatalogdlg.h b/parts/documentation/addcatalogdlg.h index 0a437294..ec5654fa 100644 --- a/parts/documentation/addcatalogdlg.h +++ b/parts/documentation/addcatalogdlg.h @@ -29,8 +29,9 @@ class DocumentationPlugin; class AddCatalogDlg: public AddCatalogDlgBase { Q_OBJECT + TQ_OBJECT public: - AddCatalogDlg( TQValueList<DocumentationPlugin*> const & plugins, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + AddCatalogDlg( TQValueList<DocumentationPlugin*> const & plugins, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~AddCatalogDlg(); TQString title() const; diff --git a/parts/documentation/addcatalogdlgbase.ui b/parts/documentation/addcatalogdlgbase.ui index 5274d12b..a24d4d79 100644 --- a/parts/documentation/addcatalogdlgbase.ui +++ b/parts/documentation/addcatalogdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>AddCatalogDlgBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>AddCatalogDlgBase</cstring> </property> @@ -19,9 +19,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout20</cstring> + <cstring>tqlayout20</cstring> </property> <grid> <property name="name"> @@ -35,7 +35,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -53,7 +53,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>18</height> @@ -65,7 +65,7 @@ <cstring>locationURL</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -76,7 +76,7 @@ <cstring>locationURL</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>titleLabel</cstring> </property> @@ -90,14 +90,14 @@ <cstring>titleEdit</cstring> </property> </widget> - <widget class="QComboBox" row="5" column="0"> + <widget class="TQComboBox" row="5" column="0"> <property name="name"> <cstring>docTypeCombo</cstring> </property> </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -121,14 +121,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -145,7 +145,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -195,11 +195,11 @@ <slot>locationURLChanged(const QString&)</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>locationURLChanged( const QString & )</slot> <slot>docTypeChanged( const QString & )</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kurlrequester.h</includehint> diff --git a/parts/documentation/bookmarkview.cpp b/parts/documentation/bookmarkview.cpp index ff2bbece..c361947e 100644 --- a/parts/documentation/bookmarkview.cpp +++ b/parts/documentation/bookmarkview.cpp @@ -65,7 +65,7 @@ TQString DocBookmarkOwner::currentURL() const if (activePart) return activePart->url().url(); else - return TQString::null; + return TQString(); } TQString DocBookmarkOwner::currentTitle() const @@ -79,21 +79,21 @@ TQString DocBookmarkOwner::currentTitle() const return activePart->url().prettyURL(); } else - return TQString::null; + return TQString(); } class DocBookmarkItem: public DocumentationItem { public: - DocBookmarkItem(Type type, KListView *parent, const TQString &name) - :DocumentationItem(type, parent, name) + DocBookmarkItem(Type type, KListView *tqparent, const TQString &name) + :DocumentationItem(type, tqparent, name) { } - DocBookmarkItem(Type type, KListView *parent, DocumentationItem *after, const TQString &name) - :DocumentationItem(type, parent, after, name) + DocBookmarkItem(Type type, KListView *tqparent, DocumentationItem *after, const TQString &name) + :DocumentationItem(type, tqparent, after, name) { } - DocBookmarkItem(Type type, DocumentationItem *parent, const TQString &name) - :DocumentationItem(type, parent, name) + DocBookmarkItem(Type type, DocumentationItem *tqparent, const TQString &name) + :DocumentationItem(type, tqparent, name) { } void setBookmark(const KBookmark &bm) { m_bm = bm; } @@ -107,8 +107,8 @@ private: //class BookmarkView -BookmarkView::BookmarkView(DocumentationWidget *parent, const char *name) - :TQWidget(parent, name), m_widget(parent) +BookmarkView::BookmarkView(DocumentationWidget *tqparent, const char *name) + :TQWidget(tqparent, name), m_widget(tqparent) { m_bmManager = new DocBookmarkManager(m_widget->part()); m_bmOwner = new DocBookmarkOwner(m_widget->part()); diff --git a/parts/documentation/bookmarkview.h b/parts/documentation/bookmarkview.h index 4f639c7c..b180478c 100644 --- a/parts/documentation/bookmarkview.h +++ b/parts/documentation/bookmarkview.h @@ -47,11 +47,12 @@ private: DocumentationPart *m_part; }; -class BookmarkView : public QWidget +class BookmarkView : public TQWidget { Q_OBJECT + TQ_OBJECT public: - BookmarkView(DocumentationWidget *parent = 0, const char *name = 0); + BookmarkView(DocumentationWidget *tqparent = 0, const char *name = 0); ~BookmarkView(); public slots: diff --git a/parts/documentation/contentsview.cpp b/parts/documentation/contentsview.cpp index 2581f5a0..074f6e2b 100644 --- a/parts/documentation/contentsview.cpp +++ b/parts/documentation/contentsview.cpp @@ -33,8 +33,8 @@ #include "documentation_part.h" #include "docutils.h" -ContentsView::ContentsView(DocumentationWidget *parent, const char *name) - :TQWidget(parent, name), m_widget(parent) +ContentsView::ContentsView(DocumentationWidget *tqparent, const char *name) + :TQWidget(tqparent, name), m_widget(tqparent) { TQVBoxLayout *cl = new TQVBoxLayout(this, 0, 0); m_view = new KListView(this); diff --git a/parts/documentation/contentsview.h b/parts/documentation/contentsview.h index 73b133d0..ad323d01 100644 --- a/parts/documentation/contentsview.h +++ b/parts/documentation/contentsview.h @@ -27,11 +27,12 @@ class DocumentationWidget; class TQListViewItem; class KListView; -class ContentsView : public QWidget +class ContentsView : public TQWidget { Q_OBJECT + TQ_OBJECT public: - ContentsView(DocumentationWidget *parent, const char *name = 0); + ContentsView(DocumentationWidget *tqparent, const char *name = 0); ~ContentsView(); KListView *view() const { return m_view; } diff --git a/parts/documentation/docconfiglistview.cpp b/parts/documentation/docconfiglistview.cpp index b8d6071c..17735dd6 100644 --- a/parts/documentation/docconfiglistview.cpp +++ b/parts/documentation/docconfiglistview.cpp @@ -23,8 +23,8 @@ #include "kdevdocumentationplugin.h" -DocConfigListView::DocConfigListView(TQWidget *parent, const char *name) - :KListView(parent, name) +DocConfigListView::DocConfigListView(TQWidget *tqparent, const char *name) + :KListView(tqparent, name) { // setSorting(-1); addColumn(i18n("TOC")); @@ -66,7 +66,7 @@ void DocConfigListView::clickedItem(TQListViewItem *item, const TQPoint &// pnt cfg->setIndex(!cfg->index()); else if ((c == 2) && (cfg->fullTextSearchPossible())) cfg->setFullTextSearch(!cfg->fullTextSearch()); - repaintItem(item); + tqrepaintItem(item); } #include "docconfiglistview.moc" diff --git a/parts/documentation/docconfiglistview.h b/parts/documentation/docconfiglistview.h index a7c0aea0..b81b0203 100644 --- a/parts/documentation/docconfiglistview.h +++ b/parts/documentation/docconfiglistview.h @@ -25,8 +25,9 @@ class DocConfigListView : public KListView { Q_OBJECT + TQ_OBJECT public: - DocConfigListView(TQWidget *parent = 0, const char *name = 0); + DocConfigListView(TQWidget *tqparent = 0, const char *name = 0); ~DocConfigListView(); protected slots: diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp index 0184c4c9..3bcefe97 100644 --- a/parts/documentation/docglobalconfigwidget.cpp +++ b/parts/documentation/docglobalconfigwidget.cpp @@ -51,8 +51,8 @@ #include "docutils.h" DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part, - DocumentationWidget *widget, TQWidget *parent, const char *name, WFlags fl) - :DocGlobalConfigWidgetBase(parent, name, fl), m_part(part), m_widget(widget) + DocumentationWidget *widget, TQWidget *tqparent, const char *name, WFlags fl) + :DocGlobalConfigWidgetBase(tqparent, name, fl), m_part(part), m_widget(widget) { m_View = new DocConfigListView( viewHolder ); viewHolder->addWidget( m_View ); @@ -100,7 +100,7 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part, useAssistant_box->setChecked(m_part->isAssistantUsed()); // Having app-specific settings isn't pretty, but this setting is nonsensical in kdevassistant - if ( kapp->instanceName().find("kdevassistant") != -1 ) + if ( kapp->instanceName().tqfind("kdevassistant") != -1 ) useAssistant_box->hide(); //font sizes and zoom levels @@ -195,7 +195,7 @@ void DocGlobalConfigWidget::accept() for (TQStringList::const_iterator it2 = app.constBegin(); it2 != app.constEnd(); ++it2) { - if (!locs.contains(*it2)) + if (!locs.tqcontains(*it2)) locs.append(*it2); } } diff --git a/parts/documentation/docglobalconfigwidget.h b/parts/documentation/docglobalconfigwidget.h index afef5730..dc2ab3f0 100644 --- a/parts/documentation/docglobalconfigwidget.h +++ b/parts/documentation/docglobalconfigwidget.h @@ -32,9 +32,10 @@ class KListView; class DocGlobalConfigWidget : public DocGlobalConfigWidgetBase { Q_OBJECT + TQ_OBJECT public: DocGlobalConfigWidget(DocumentationPart *part, DocumentationWidget *widget, - TQWidget *parent = 0, const char *name = 0, WFlags fl = 0); + TQWidget *tqparent = 0, const char *name = 0, WFlags fl = 0); ~DocGlobalConfigWidget(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/parts/documentation/docglobalconfigwidgetbase.ui b/parts/documentation/docglobalconfigwidgetbase.ui index 1af1e011..7798ed79 100644 --- a/parts/documentation/docglobalconfigwidgetbase.ui +++ b/parts/documentation/docglobalconfigwidgetbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>DocGlobalConfigWidgetBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DocGlobalConfigWidgetBase</cstring> </property> @@ -22,11 +22,11 @@ <property name="margin"> <number>0</number> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>docTab</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -37,7 +37,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QWidgetStack"> + <widget class="TQWidgetStack"> <property name="name"> <cstring>viewHolder</cstring> </property> @@ -49,7 +49,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WStackPage</cstring> </property> @@ -58,15 +58,15 @@ </attribute> </widget> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>addCollectionButton</cstring> </property> @@ -74,7 +74,7 @@ <string>&Add...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>editCollectionButton</cstring> </property> @@ -82,7 +82,7 @@ <string>&Edit...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>removeCollectionButton</cstring> </property> @@ -100,7 +100,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -111,7 +111,7 @@ </widget> </hbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -132,22 +132,22 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>190</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>htsearchbinLabel</cstring> </property> @@ -176,7 +176,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -199,7 +199,7 @@ <enum>StrongFocus</enum> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>htdigbinLabel</cstring> </property> @@ -218,7 +218,7 @@ <enum>StrongFocus</enum> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>databaseDirLabel</cstring> </property> @@ -229,7 +229,7 @@ <cstring>databaseDirEdit</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>htmergebinLabel</cstring> </property> @@ -244,7 +244,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -265,14 +265,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QButtonGroup" row="1" column="0"> + <widget class="TQButtonGroup" row="1" column="0"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -283,7 +283,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>find_box</cstring> </property> @@ -291,7 +291,7 @@ <string>&Find in documentation</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>index_box</cstring> </property> @@ -299,7 +299,7 @@ <string>&Look in documentation index</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>search_box</cstring> </property> @@ -307,7 +307,7 @@ <string>S&earch in documentation</string> </property> </widget> - <widget class="QCheckBox" row="4" column="0"> + <widget class="TQCheckBox" row="4" column="0"> <property name="name"> <cstring>info_box</cstring> </property> @@ -315,7 +315,7 @@ <string>Goto &infopage</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>man_box</cstring> </property> @@ -325,7 +325,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>useAssistant_box</cstring> </property> @@ -333,7 +333,7 @@ <string>Use KDevelop &Assistant to browse documentation</string> </property> </widget> - <widget class="QGroupBox" row="2" column="0"> + <widget class="TQGroupBox" row="2" column="0"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -344,7 +344,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -373,7 +373,7 @@ <cstring>fixedFont_combo</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -392,7 +392,7 @@ <cstring>fixedFont_combo</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -411,7 +411,7 @@ <cstring>zoom_combo</cstring> </property> </widget> - <widget class="QComboBox" row="2" column="1"> + <widget class="TQComboBox" row="2" column="1"> <item> <property name="text"> <string>20</string> @@ -542,15 +542,15 @@ <tabstop>info_box</tabstop> <tabstop>man_box</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>addCollectionButtonClicked()</slot> <slot>editCollectionButtonClicked()</slot> <slot>removeCollectionButtonClicked()</slot> <slot>collectionsBoxCurrentChanged( int )</slot> <slot>updateConfig()</slot> <slot>updateIndex()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/parts/documentation/docprojectconfigwidget.cpp b/parts/documentation/docprojectconfigwidget.cpp index a37ad5cb..910cd5d4 100644 --- a/parts/documentation/docprojectconfigwidget.cpp +++ b/parts/documentation/docprojectconfigwidget.cpp @@ -33,8 +33,8 @@ #include "documentation_part.h" #include "documentation_widget.h" -DocProjectConfigWidget::DocProjectConfigWidget(DocumentationPart *part, TQWidget *parent, const char *name) - :DocProjectConfigWidgetBase(parent, name), m_part(part) +DocProjectConfigWidget::DocProjectConfigWidget(DocumentationPart *part, TQWidget *tqparent, const char *name) + :DocProjectConfigWidgetBase(tqparent, name), m_part(part) { for (TQValueList<DocumentationPlugin*>::const_iterator it = m_part->m_plugins.constBegin(); it != m_part->m_plugins.constEnd(); ++it) diff --git a/parts/documentation/docprojectconfigwidget.h b/parts/documentation/docprojectconfigwidget.h index c5d904b5..8a925a50 100644 --- a/parts/documentation/docprojectconfigwidget.h +++ b/parts/documentation/docprojectconfigwidget.h @@ -27,8 +27,9 @@ class DocumentationPlugin; class DocProjectConfigWidget: public DocProjectConfigWidgetBase { Q_OBJECT + TQ_OBJECT public: - DocProjectConfigWidget(DocumentationPart *part, TQWidget *parent = 0, const char *name = 0); + DocProjectConfigWidget(DocumentationPart *part, TQWidget *tqparent = 0, const char *name = 0); public slots: virtual void changeDocSystem(const TQString &text); diff --git a/parts/documentation/docprojectconfigwidgetbase.ui b/parts/documentation/docprojectconfigwidgetbase.ui index ccff4bfc..25bf023f 100644 --- a/parts/documentation/docprojectconfigwidgetbase.ui +++ b/parts/documentation/docprojectconfigwidgetbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>DocProjectConfigWidgetBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DocProjectConfigWidgetBase</cstring> </property> @@ -26,14 +26,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>60</height> </size> </property> </spacer> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -52,7 +52,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -63,7 +63,7 @@ <cstring>catalogURL</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -88,14 +88,14 @@ <cstring>docSystemCombo</cstring> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>docSystemCombo</cstring> </property> </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -106,7 +106,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -140,10 +140,10 @@ <tabstop>catalogURL</tabstop> <tabstop>docSystemCombo</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>changeDocSystem(const QString &)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp index 32e57d9e..0d22c07a 100644 --- a/parts/documentation/documentation_part.cpp +++ b/parts/documentation/documentation_part.cpp @@ -76,8 +76,8 @@ static const KDevPluginInfo data("kdevdocumentation"); typedef KDevGenericFactory<DocumentationPart> DocumentationFactory; K_EXPORT_COMPONENT_FACTORY( libkdevdocumentation, DocumentationFactory( data ) ) -DocumentationPart::DocumentationPart(TQObject *parent, const char *name, const TQStringList& ) - :KDevPlugin(&data, parent, name ? name : "DocumentationPart" ), +DocumentationPart::DocumentationPart(TQObject *tqparent, const char *name, const TQStringList& ) + :KDevPlugin(&data, tqparent, name ? name : "DocumentationPart" ), m_projectDocumentationPlugin(0), m_userManualPlugin(0), m_hasIndex(false) { setInstance(DocumentationFactory::instance()); @@ -98,7 +98,7 @@ DocumentationPart::DocumentationPart(TQObject *parent, const char *name, const T TQWhatsThis::add(m_widget, i18n("<b>Documentation browser</b><p>" "The documentation browser gives access to various " - "documentation sources (Qt DCF, Doxygen, KDoc, KDevelopTOC and DevHelp " + "documentation sources (TQt DCF, Doxygen, KDoc, KDevelopTOC and DevHelp " "documentation) and the KDevelop manuals. It also provides documentation index " "and full text search capabilities.")); @@ -125,8 +125,8 @@ DocumentationPart::~DocumentationPart() void DocumentationPart::loadDocumentationPlugins() { KTrader::OfferList docPluginOffers = - KTrader::self()->query(TQString::fromLatin1("KDevelop/DocumentationPlugins"), - TQString("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION)); + KTrader::self()->query(TQString::tqfromLatin1("KDevelop/DocumentationPlugins"), + TQString("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION)); KTrader::OfferList::ConstIterator serviceIt = docPluginOffers.begin(); for ( ; serviceIt != docPluginOffers.end(); ++serviceIt ) @@ -156,7 +156,7 @@ void DocumentationPart::emitIndexSelected(IndexBox *indexBox) { if (!m_hasIndex) { - TQApplication::setOverrideCursor(TQCursor(Qt::WaitCursor)); + TQApplication::setOverrideCursor(TQCursor(TQt::WaitCursor)); emit indexSelected(indexBox); indexBox->fill(); m_hasIndex = true; @@ -347,13 +347,13 @@ void DocumentationPart::infoPage() void DocumentationPart::manPage(const TQString &term) { - TQString url = TQString::fromLatin1("man:/%1").arg(term); + TQString url = TQString::tqfromLatin1("man:/%1").tqarg(term); partController()->showDocument(KURL(url)); } void DocumentationPart::infoPage(const TQString &term) { - TQString url = TQString::fromLatin1("info:/%1").arg(term); + TQString url = TQString::tqfromLatin1("info:/%1").tqarg(term); partController()->showDocument(KURL(url)); } @@ -465,40 +465,40 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context) TQString squeezed = KStringHandler::csqueeze(m_contextStr, 30); int id = -1; if (hasContextFeature(Finder)) { - id = popup->insertItem(i18n("Find Documentation: %1").arg(squeezed), + id = popup->insertItem(i18n("Find Documentation: %1").tqarg(squeezed), this, TQT_SLOT(contextFindDocumentation())); - popup->setWhatsThis(id, i18n("<b>Find documentation</b><p>" + popup->tqsetWhatsThis(id, i18n("<b>Find documentation</b><p>" "Opens the documentation finder tab and searches " "all possible sources of documentation like " "table of contents, index, man and info databases, " "Google, etc.")); } if (hasContextFeature(IndexLookup)) { - id = popup->insertItem(i18n("Look in Documentation Index: %1").arg(squeezed), + id = popup->insertItem(i18n("Look in Documentation Index: %1").tqarg(squeezed), this, TQT_SLOT(contextLookInDocumentationIndex())); - popup->setWhatsThis(id, i18n("<b>Look in documentation index</b><p>" + popup->tqsetWhatsThis(id, i18n("<b>Look in documentation index</b><p>" "Opens the documentation index tab. It allows " "a term to be entered which will be looked for in " "the documentation index.")); } if (hasContextFeature(FullTextSearch)) { - id = popup->insertItem(i18n("Search in Documentation: %1").arg(squeezed), + id = popup->insertItem(i18n("Search in Documentation: %1").tqarg(squeezed), this, TQT_SLOT(contextSearchInDocumentation())); - popup->setWhatsThis(id, i18n("<b>Search in documentation</b><p>Searches " + popup->tqsetWhatsThis(id, i18n("<b>Search in documentation</b><p>Searches " "for a term under the cursor in " "the documentation. For this to work, " "a full text index must be created first, which can be done in the " "configuration dialog of the documentation plugin.")); } if (hasContextFeature(GotoMan)) { - id = popup->insertItem(i18n("Goto Manpage: %1").arg(squeezed), + id = popup->insertItem(i18n("Goto Manpage: %1").tqarg(squeezed), this, TQT_SLOT(contextManPage())); - popup->setWhatsThis(id, i18n("<b>Goto manpage</b><p>Tries to open a man page for the term under the cursor.")); + popup->tqsetWhatsThis(id, i18n("<b>Goto manpage</b><p>Tries to open a man page for the term under the cursor.")); } if (hasContextFeature(GotoInfo)) { - id = popup->insertItem( i18n("Goto Infopage: %1").arg(squeezed), + id = popup->insertItem( i18n("Goto Infopage: %1").tqarg(squeezed), this, TQT_SLOT(contextInfoPage()) ); - popup->setWhatsThis(id, i18n("<b>Goto infopage</b><p>Tries to open an info page for the term under the cursor.")); + popup->tqsetWhatsThis(id, i18n("<b>Goto infopage</b><p>Tries to open an info page for the term under the cursor.")); } if (id != -1) popup->insertSeparator(); @@ -665,7 +665,7 @@ TQCString DocumentationPart::startAssistant() kdDebug() << dcopName.data() << endl; //@fixme: is there another way to wait for the remote object to be loaded - while (!KApplication::dcopClient()->remoteObjects(dcopName).contains("KDevDocumentation")) + while (!KApplication::dcopClient()->remoteObjects(dcopName).tqcontains("KDevDocumentation")) usleep(500); } } @@ -675,7 +675,7 @@ TQCString DocumentationPart::startAssistant() bool DocumentationPart::isAssistantUsed() const { // hack to solve BR #90334 - don't call kdevassistant via DCOP if we ARE kdevassistant - if ( kapp->instanceName().find("kdevassistant") != -1 ) + if ( kapp->instanceName().tqfind("kdevassistant") != -1 ) { return false; } diff --git a/parts/documentation/documentation_part.h b/parts/documentation/documentation_part.h index 056785a0..1334b8ca 100644 --- a/parts/documentation/documentation_part.h +++ b/parts/documentation/documentation_part.h @@ -42,10 +42,11 @@ class TQPopupMenu; class DocumentationPart : public KDevPlugin { Q_OBJECT + TQ_OBJECT public: enum ContextFeature { Finder, IndexLookup, FullTextSearch, GotoMan, GotoInfo }; - DocumentationPart(TQObject *parent, const char *name, const TQStringList &); + DocumentationPart(TQObject *tqparent, const char *name, const TQStringList &); ~DocumentationPart(); void emitIndexSelected(IndexBox *indexBox); diff --git a/parts/documentation/documentation_widget.h b/parts/documentation/documentation_widget.h index d579142b..21325e81 100644 --- a/parts/documentation/documentation_widget.h +++ b/parts/documentation/documentation_widget.h @@ -34,9 +34,10 @@ class SearchView; class BookmarkView; class KListView; -class DocumentationWidget : public QWidget +class DocumentationWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: DocumentationWidget(DocumentationPart *part); ~DocumentationWidget(); diff --git a/parts/documentation/docutils.cpp b/parts/documentation/docutils.cpp index 79fa9915..4291a745 100644 --- a/parts/documentation/docutils.cpp +++ b/parts/documentation/docutils.cpp @@ -87,7 +87,7 @@ void DocUtils::docItemPopup(DocumentationPart *part, const TQString &title, cons if (showSearch) { menu.insertSeparator(); - menu.insertItem(TQString("%1: %2").arg(i18n("Search")).arg(KStringHandler::csqueeze(title,20)), 4); + menu.insertItem(TQString("%1: %2").tqarg(i18n("Search")).tqarg(KStringHandler::csqueeze(title,20)), 4); } switch (menu.exec(pos)) diff --git a/parts/documentation/editbookmarkdlg.ui b/parts/documentation/editbookmarkdlg.ui index fec2dc11..2962e58d 100644 --- a/parts/documentation/editbookmarkdlg.ui +++ b/parts/documentation/editbookmarkdlg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>EditBookmarkDlg</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>EditBookmarkDlg</cstring> </property> @@ -24,7 +24,7 @@ <cstring>locationEdit</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -35,7 +35,7 @@ <cstring>nameEdit</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -51,7 +51,7 @@ <cstring>nameEdit</cstring> </property> </widget> - <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -75,14 +75,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -99,7 +99,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -125,7 +125,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -156,7 +156,7 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>klineedit.h</includehint> diff --git a/parts/documentation/editcatalogdlg.cpp b/parts/documentation/editcatalogdlg.cpp index 8bdc19d5..ed8c2467 100644 --- a/parts/documentation/editcatalogdlg.cpp +++ b/parts/documentation/editcatalogdlg.cpp @@ -28,9 +28,9 @@ #include "docutils.h" #include "kdevdocumentationplugin.h" -EditCatalogDlg::EditCatalogDlg(DocumentationPlugin *plugin, TQWidget* parent, +EditCatalogDlg::EditCatalogDlg(DocumentationPlugin *plugin, TQWidget* tqparent, const char* name, bool modal, WFlags fl) - :EditCatalogBase(parent,name, modal,fl), m_plugin(plugin) + :EditCatalogBase(tqparent,name, modal,fl), m_plugin(plugin) { if (m_plugin->hasCapability(DocumentationPlugin::CustomDocumentationTitles)) { diff --git a/parts/documentation/editcatalogdlg.h b/parts/documentation/editcatalogdlg.h index f8f1fabf..9f54faf8 100644 --- a/parts/documentation/editcatalogdlg.h +++ b/parts/documentation/editcatalogdlg.h @@ -27,9 +27,10 @@ class DocumentationPlugin; class EditCatalogDlg : public EditCatalogBase { Q_OBJECT + TQ_OBJECT public: EditCatalogDlg(DocumentationPlugin *plugin, - TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~EditCatalogDlg(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/parts/documentation/editcatalogdlgbase.ui b/parts/documentation/editcatalogdlgbase.ui index 3fd4caf9..07989ef9 100644 --- a/parts/documentation/editcatalogdlgbase.ui +++ b/parts/documentation/editcatalogdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>EditCatalogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>EditCatalogBase</cstring> </property> @@ -25,7 +25,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -49,14 +49,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -73,7 +73,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -89,9 +89,9 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <grid> <property name="name"> @@ -107,14 +107,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -130,7 +130,7 @@ <cstring>locationURL</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>titleLabel</cstring> </property> @@ -184,10 +184,10 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>locationURLChanged( const QString & )</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>klineedit.h</includehint> diff --git a/parts/documentation/find_documentation.cpp b/parts/documentation/find_documentation.cpp index 782ef467..60b0bce1 100644 --- a/parts/documentation/find_documentation.cpp +++ b/parts/documentation/find_documentation.cpp @@ -41,15 +41,15 @@ #include <klocale.h> -FindDocumentation::FindDocumentation(DocumentationWidget* parent, const char* name) - :FindDocumentationBase(parent, name), +FindDocumentation::FindDocumentation(DocumentationWidget* tqparent, const char* name) + :FindDocumentationBase(tqparent, name), man_item(0), info_item(0), index_item(0), google_item(0), contents_item(0), - last_item(0), m_widget(parent) + last_item(0), m_widget(tqparent) { - TQWidget* tmp = TQApplication::desktop(); + TQWidget* tmp = TQT_TQWIDGET(TQApplication::desktop()); setGeometry(tmp->width()/2 - width()/2, tmp->height()/2 - height()/2, width(), height()); - proc_man = new KProcess( this ); - proc_info = new KProcess( this ); + proc_man = new KProcess( TQT_TQOBJECT(this) ); + proc_info = new KProcess( TQT_TQOBJECT(this) ); connect( proc_man, TQT_SIGNAL(processExited( KProcess* )), this, TQT_SLOT(procManExited( KProcess* )) ); @@ -94,11 +94,11 @@ void FindDocumentation::clickOnItem( TQListViewItem * item ) DocumentationItem* doc_item = dynamic_cast<DocumentationItem*>(item); - if(item->parent() == man_item || - item->parent() == info_item || - item->parent() == google_item || - item->parent() == index_item || - item->parent() == contents_item) + if(item->tqparent() == man_item || + item->tqparent() == info_item || + item->tqparent() == google_item || + item->tqparent() == index_item || + item->tqparent() == contents_item) m_widget->part()->partController()->showDocument(doc_item->url()); } @@ -147,12 +147,12 @@ void FindDocumentation::procManExited( KProcess* ) void FindDocumentation::procInfoReadStdout( KProcess*, char* buf, int len) { - proc_info_out += TQString::fromLatin1( buf, len ); + proc_info_out += TQString::tqfromLatin1( buf, len ); } void FindDocumentation::procManReadStdout( KProcess*, char* buf, int len) { - proc_man_out += TQString::fromLatin1( buf, len ); + proc_man_out += TQString::tqfromLatin1( buf, len ); } void FindDocumentation::searchInInfo() @@ -228,7 +228,7 @@ void FindDocumentation::searchInContents() catalogItem->load(); catalogItem->plugin()->setCatalogURL(catalogItem); } - if (it.current()->text(0).contains(search_term->text(),false)) + if (it.current()->text(0).tqcontains(search_term->text(),false)) { DocumentationItem* newitem = new DocumentationItem(DocumentationItem::Document, contents_item, it.current()->text(0) ); @@ -260,7 +260,7 @@ void FindDocumentation::searchInIndex() DocumentationItem* newitem = 0; while(item) { - if(!item->text().contains(search_term->text(),false)) + if(!item->text().tqcontains(search_term->text(),false)) break; IndexItem::List urls = item->urls(); diff --git a/parts/documentation/find_documentation.h b/parts/documentation/find_documentation.h index 0a9a3e0a..25088d9a 100644 --- a/parts/documentation/find_documentation.h +++ b/parts/documentation/find_documentation.h @@ -31,8 +31,9 @@ class KProcess; class FindDocumentation : public FindDocumentationBase { Q_OBJECT + TQ_OBJECT public: - FindDocumentation(DocumentationWidget* parent, const char* name = 0); + FindDocumentation(DocumentationWidget* tqparent, const char* name = 0); ~FindDocumentation(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/parts/documentation/find_documentation_options.cpp b/parts/documentation/find_documentation_options.cpp index df04ca81..823aad2c 100644 --- a/parts/documentation/find_documentation_options.cpp +++ b/parts/documentation/find_documentation_options.cpp @@ -28,8 +28,8 @@ #include <kconfig.h> #include <kapplication.h> -FindDocumentationOptions::FindDocumentationOptions(TQWidget* parent, const char* name, bool modal) - :FindDocumentationOptionsBase(parent,name, modal), +FindDocumentationOptions::FindDocumentationOptions(TQWidget* tqparent, const char* name, bool modal) + :FindDocumentationOptionsBase(tqparent,name, modal), m_man_item(0), m_info_item(0), m_index_item(0), m_google_item(0), m_contents_item(0) { readOptions(); diff --git a/parts/documentation/find_documentation_options.h b/parts/documentation/find_documentation_options.h index 0c88317b..3fb2ed7c 100644 --- a/parts/documentation/find_documentation_options.h +++ b/parts/documentation/find_documentation_options.h @@ -29,8 +29,9 @@ class KConfig; class FindDocumentationOptions : public FindDocumentationOptionsBase { Q_OBJECT + TQ_OBJECT public: - FindDocumentationOptions(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE); + FindDocumentationOptions(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE); ~FindDocumentationOptions(); /*$PUBLIC_FUNCTIONS$*/ virtual bool isContents( TQCheckListItem * item ); diff --git a/parts/documentation/find_documentation_optionsbase.ui b/parts/documentation/find_documentation_optionsbase.ui index c2beadc9..de265bfe 100644 --- a/parts/documentation/find_documentation_optionsbase.ui +++ b/parts/documentation/find_documentation_optionsbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>FindDocumentationOptionsBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>FindDocumentationOptionsBase</cstring> </property> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView" row="1" column="0"> + <widget class="TQListView" row="1" column="0"> <column> <property name="text"> <string></string> @@ -38,7 +38,7 @@ <cstring>source_list</cstring> </property> </widget> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> <cstring>Layout9_3</cstring> </property> @@ -59,14 +59,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>moveup_button</cstring> </property> @@ -74,7 +74,7 @@ <string>Move &Up</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>movedown_button</cstring> </property> @@ -92,7 +92,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -101,7 +101,7 @@ </spacer> </vbox> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>goto_first_match</cstring> </property> @@ -109,7 +109,7 @@ <string>Go to first match</string> </property> </widget> - <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -133,14 +133,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -157,7 +157,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -173,7 +173,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -210,9 +210,9 @@ sources and change their priority here.</string> <slot>sourceMoveDown()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>sourceMoveUp()</slot> <slot>sourceMoveDown()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/parts/documentation/find_documentationbase.ui b/parts/documentation/find_documentationbase.ui index 58e6aeb0..19da4dab 100644 --- a/parts/documentation/find_documentationbase.ui +++ b/parts/documentation/find_documentationbase.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>FindDocumentationBase</class> <author>Tobias Gläßer</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>FindDocumentationBase</cstring> </property> @@ -28,7 +28,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -36,7 +36,7 @@ <string>Search term:</string> </property> </widget> - <widget class="QPushButton" row="1" column="2"> + <widget class="TQPushButton" row="1" column="2"> <property name="name"> <cstring>button_search</cstring> </property> @@ -52,7 +52,7 @@ <cstring>search_term</cstring> </property> </widget> - <widget class="QPushButton" row="3" column="0"> + <widget class="TQPushButton" row="3" column="0"> <property name="name"> <cstring>butten_options</cstring> </property> @@ -70,7 +70,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>100</width> <height>20</height> @@ -110,9 +110,9 @@ </connection> <connection> <sender>result_list</sender> - <signal>executed(QListViewItem*)</signal> + <signal>executed(TQListViewItem*)</signal> <receiver>FindDocumentationBase</receiver> - <slot>clickOnItem(QListViewItem*)</slot> + <slot>clickOnItem(TQListViewItem*)</slot> </connection> <connection> <sender>butten_options</sender> @@ -122,9 +122,9 @@ </connection> <connection> <sender>result_list</sender> - <signal>mouseButtonPressed(int,QListViewItem*,const QPoint&,int)</signal> + <signal>mouseButtonPressed(int,TQListViewItem*,const QPoint&,int)</signal> <receiver>FindDocumentationBase</receiver> - <slot>buttonPressedOnItem(int,QListViewItem*,const QPoint&,int)</slot> + <slot>buttonPressedOnItem(int,TQListViewItem*,const QPoint&,int)</slot> </connection> <connection> <sender>search_term</sender> @@ -134,9 +134,9 @@ </connection> <connection> <sender>result_list</sender> - <signal>returnPressed(QListViewItem*)</signal> + <signal>returnPressed(TQListViewItem*)</signal> <receiver>FindDocumentationBase</receiver> - <slot>clickOnItem(QListViewItem*)</slot> + <slot>clickOnItem(TQListViewItem*)</slot> </connection> </connections> <tabstops> @@ -145,7 +145,7 @@ <tabstop>result_list</tabstop> <tabstop>butten_options</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>clickOptions()</slot> <slot>setSearchTerm( const QString & term )</slot> <slot>startSearch()</slot> @@ -156,10 +156,10 @@ <slot>searchInInfo()</slot> <slot>procManReadFromStdout()</slot> <slot>procInfoReadFromStdout()</slot> - <slot>clickOnItem( QListViewItem * item )</slot> - <slot>buttonPressedOnItem( int button, QListViewItem * item, const QPoint & pos, int c )</slot> -</slots> -<layoutdefaults spacing="1" margin="1"/> + <slot>clickOnItem( TQListViewItem * item )</slot> + <slot>buttonPressedOnItem( int button, TQListViewItem * item, const QPoint & pos, int c )</slot> +</Q_SLOTS> +<tqlayoutdefaults spacing="1" margin="1"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klistview.h</includehint> diff --git a/parts/documentation/indexview.cpp b/parts/documentation/indexview.cpp index 6a7eddcf..a9e240be 100644 --- a/parts/documentation/indexview.cpp +++ b/parts/documentation/indexview.cpp @@ -38,8 +38,8 @@ #include "documentation_part.h" #include "documentation_widget.h" -IndexView::IndexView(DocumentationWidget *parent, const char *name) - :TQWidget(parent, name), m_widget(parent) +IndexView::IndexView(DocumentationWidget *tqparent, const char *name) + :TQWidget(tqparent, name), m_widget(tqparent) { TQVBoxLayout *l = new TQVBoxLayout(this, 0, 0); @@ -85,7 +85,7 @@ void IndexView::searchInIndex(TQListBoxItem *item) else { SelectTopic *dia = new SelectTopic(urls); - dia->topicLabel->setText(dia->topicLabel->text().arg(item->text())); + dia->topicLabel->setText(dia->topicLabel->text().tqarg(item->text())); if (dia->exec()) m_widget->part()->partController()->showDocument(dia->selectedURL()); delete dia; @@ -123,7 +123,7 @@ bool IndexView::eventFilter(TQObject *watched, TQEvent *e) if (!watched || !e) return true; - if ((watched == m_edit) && (e->type() == TQEvent::KeyPress)) + if ((TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(m_edit)) && (e->type() == TQEvent::KeyPress)) { TQKeyEvent *ke = (TQKeyEvent*)e; if (ke->key() == Key_Up) diff --git a/parts/documentation/indexview.h b/parts/documentation/indexview.h index 92f965f2..8fb04e4d 100644 --- a/parts/documentation/indexview.h +++ b/parts/documentation/indexview.h @@ -28,11 +28,12 @@ class TQListBoxItem; class DocumentationWidget; class FindDocumentation; -class IndexView : public QWidget +class IndexView : public TQWidget { Q_OBJECT + TQ_OBJECT public: - IndexView(DocumentationWidget *parent = 0, const char *name = 0); + IndexView(DocumentationWidget *tqparent = 0, const char *name = 0); ~IndexView(); virtual bool eventFilter(TQObject *watched, TQEvent *e); diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.cpp b/parts/documentation/interfaces/kdevdocumentationplugin.cpp index 3364f71a..22c375d2 100644 --- a/parts/documentation/interfaces/kdevdocumentationplugin.cpp +++ b/parts/documentation/interfaces/kdevdocumentationplugin.cpp @@ -33,30 +33,30 @@ //class DocumentationItem -DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListView *parent, +DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListView *tqparent, const TQString &name) - :KListViewItem(parent, name), m_type(type) + :KListViewItem(tqparent, name), m_type(type) { init(); } -DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListViewItem *parent, +DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListViewItem *tqparent, const TQString &name) - :KListViewItem(parent, name), m_type(type) + :KListViewItem(tqparent, name), m_type(type) { init(); } -DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListView *parent, +DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListView *tqparent, KListViewItem *after, const TQString &name) - :KListViewItem(parent, after, name), m_type(type) + :KListViewItem(tqparent, after, name), m_type(type) { init(); } -DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListViewItem * parent, +DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListViewItem * tqparent, KListViewItem * after, const TQString & name ) - :KListViewItem(parent, after, name), m_type(type) + :KListViewItem(tqparent, after, name), m_type(type) { init(); } @@ -90,8 +90,8 @@ void DocumentationItem::init( ) DocumentationCatalogItem::DocumentationCatalogItem(DocumentationPlugin* plugin, - KListView *parent, const TQString &name) - :DocumentationItem(DocumentationItem::Catalog, parent, name), m_plugin(plugin), + KListView *tqparent, const TQString &name) + :DocumentationItem(DocumentationItem::Catalog, tqparent, name), m_plugin(plugin), isLoaded(false), isActivated(false), m_isProjectDocumentationItem(false) { setExpandable(true); @@ -99,8 +99,8 @@ DocumentationCatalogItem::DocumentationCatalogItem(DocumentationPlugin* plugin, } DocumentationCatalogItem::DocumentationCatalogItem(DocumentationPlugin* plugin, - DocumentationItem *parent, const TQString &name) - :DocumentationItem(DocumentationItem::Catalog, parent, name), m_plugin(plugin), + DocumentationItem *tqparent, const TQString &name) + :DocumentationItem(DocumentationItem::Catalog, tqparent, name), m_plugin(plugin), isLoaded(false), isActivated(false), m_isProjectDocumentationItem(false) { setExpandable(true); @@ -172,7 +172,7 @@ IndexItem::List IndexItem::urls() const TQValueList<IndexItemProto*> itemProtos = m_listbox->items[text()]; for (TQValueList<IndexItemProto*>::const_iterator it = itemProtos.begin(); it != itemProtos.end(); ++it) - urlList.append(qMakePair((*it)->description(), (*it)->url())); + urlList.append(tqMakePair((*it)->description(), (*it)->url())); return urlList; } @@ -181,9 +181,9 @@ IndexItem::List IndexItem::urls() const //class ConfigurationItem -ConfigurationItem::ConfigurationItem(TQListView *parent, DocumentationPlugin * plugin, const TQString &title, const TQString &url, +ConfigurationItem::ConfigurationItem(TQListView *tqparent, DocumentationPlugin * plugin, const TQString &title, const TQString &url, bool indexPossible, bool fullTextSearchPossible) - :TQCheckListItem(parent, "", TQCheckListItem::CheckBox), m_title(title), m_url(url), + :TQCheckListItem(tqparent, "", TQCheckListItem::CheckBox), m_title(title), m_url(url), m_origTitle(title), m_contents(true), m_index(false), m_fullTextSearch(false), m_indexPossible(indexPossible), m_fullTextSearchPossible(fullTextSearchPossible), m_docPlugin( plugin ) @@ -209,7 +209,7 @@ void ConfigurationItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colu p->fillRect(0, 0, width, height(), cg.brush(crole)); TQFontMetrics fm(lv->fontMetrics()); - int boxsize = lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv); + int boxsize = lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv); int marg = lv->itemMargin(); int styleflags = TQStyle::Style_Default; @@ -229,7 +229,7 @@ void ConfigurationItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colu y = (fm.height() + 2 + marg - boxsize) / 2; TQStyleOption opt(this); - lv->style().drawPrimitive(TQStyle::PE_CheckListIndicator, p, + lv->tqstyle().tqdrawPrimitive(TQStyle::PE_CheckListIndicator, p, TQRect(x, y, boxsize, fm.height() + 2 + marg), cg, styleflags, opt); return; @@ -240,7 +240,7 @@ void ConfigurationItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colu int ConfigurationItem::width(const TQFontMetrics &fm, const TQListView *lv, int c) const { if ((c == 0) || (c == 1) || (c == 2)) - return lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv) + 4; + return lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv) + 4; return TQListViewItem::width(fm, lv, c); } @@ -253,8 +253,8 @@ int ConfigurationItem::width(const TQFontMetrics &fm, const TQListView *lv, int //class DocumentationPlugin -DocumentationPlugin::DocumentationPlugin(KConfig *pluginConfig, TQObject *parent, const char *name) - :TQObject(parent, name), config(pluginConfig), m_indexCreated(false) +DocumentationPlugin::DocumentationPlugin(KConfig *pluginConfig, TQObject *tqparent, const char *name) + :TQObject(tqparent, name), config(pluginConfig), m_indexCreated(false) { } @@ -462,7 +462,7 @@ void DocumentationPlugin::reinit(KListView *contents, IndexBox *index, TQStringL for (TQStringList::const_iterator it = deletedConfigurationItems.constBegin(); it != deletedConfigurationItems.constEnd(); ++it) { - if (namedCatalogs.contains(*it)) + if (namedCatalogs.tqcontains(*it)) delete namedCatalogs[*it]; } deletedConfigurationItems.clear(); @@ -472,15 +472,15 @@ void DocumentationPlugin::reinit(KListView *contents, IndexBox *index, TQStringL it != entryMap.end(); ++it) { config->setGroup("Locations"); - if (restrictions.contains(it.key()) || (!catalogEnabled(it.key()))) + if (restrictions.tqcontains(it.key()) || (!catalogEnabled(it.key()))) { - if (namedCatalogs.contains(it.key())) + if (namedCatalogs.tqcontains(it.key())) delete namedCatalogs[it.key()]; } else { kdDebug() << "updating 1" << endl; - if (!namedCatalogs.contains(it.key())) //create catalog if it does not exist + if (!namedCatalogs.tqcontains(it.key())) //create catalog if it does not exist { DocumentationCatalogItem * item = createCatalog(contents, it.key(), config->readPathEntry(it.key())); loadIndex(index, item); @@ -493,7 +493,7 @@ void DocumentationPlugin::reinit(KListView *contents, IndexBox *index, TQStringL clearCatalogIndex(namedCatalogs[it.key()]); } else if ( (indexEnabled(namedCatalogs[it.key()])) //index is requested in configuration but does not yet exist - && (!indexes.contains(namedCatalogs[it.key()])) ) + && (!indexes.tqcontains(namedCatalogs[it.key()])) ) { kdDebug() << " index requested " << endl; loadIndex(index, namedCatalogs[it.key()]); @@ -512,7 +512,7 @@ void DocumentationPlugin::loadCatalogConfiguration(KListView *configurationView) for (TQMap<TQString, TQString>::const_iterator it = entryMap.begin(); it != entryMap.end(); ++it) { - if (namedCatalogs.contains(it.key()) + if (namedCatalogs.tqcontains(it.key()) && namedCatalogs[it.key()]->isProjectDocumentationItem()) continue; @@ -613,8 +613,8 @@ void DocumentationPlugin::setCatalogEnabled(const TQString &name, bool e) //class IndexBox -IndexBox::IndexBox(TQWidget *parent, const char *name) - :KListBox(parent, name), m_dirty(false) +IndexBox::IndexBox(TQWidget *tqparent, const char *name) + :KListBox(tqparent, name), m_dirty(false) { } @@ -630,7 +630,7 @@ void IndexBox::removeIndexItem(IndexItemProto *item) if (items[text].count() == 0) { items.remove(text); - TQListBoxItem *item = findItem(text, Qt::CaseSensitive | Qt::ExactMatch); + TQListBoxItem *item = tqfindItem(text, TQt::CaseSensitive | TQt::ExactMatch); if (item) delete item; } diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.h b/parts/documentation/interfaces/kdevdocumentationplugin.h index 0c1dcf0d..fc7af7e3 100644 --- a/parts/documentation/interfaces/kdevdocumentationplugin.h +++ b/parts/documentation/interfaces/kdevdocumentationplugin.h @@ -43,10 +43,10 @@ public: Document /**<Document.*/ }; - DocumentationItem(Type type, KListView *parent, const TQString &name); - DocumentationItem(Type type, KListView *parent, KListViewItem *after, const TQString &name); - DocumentationItem(Type type, KListViewItem *parent, const TQString &name); - DocumentationItem(Type type, KListViewItem *parent, KListViewItem *after, const TQString &name); + DocumentationItem(Type type, KListView *tqparent, const TQString &name); + DocumentationItem(Type type, KListView *tqparent, KListViewItem *after, const TQString &name); + DocumentationItem(Type type, KListViewItem *tqparent, const TQString &name); + DocumentationItem(Type type, KListViewItem *tqparent, KListViewItem *after, const TQString &name); virtual void setURL(const KURL &url) { m_url = url; } virtual KURL url() const { return m_url; } @@ -72,8 +72,8 @@ class DocumentationPlugin; class DocumentationCatalogItem: public DocumentationItem { public: - DocumentationCatalogItem(DocumentationPlugin* plugin, KListView *parent, const TQString &name); - DocumentationCatalogItem(DocumentationPlugin* plugin, DocumentationItem *parent, const TQString &name); + DocumentationCatalogItem(DocumentationPlugin* plugin, KListView *tqparent, const TQString &name); + DocumentationCatalogItem(DocumentationPlugin* plugin, DocumentationItem *tqparent, const TQString &name); virtual ~DocumentationCatalogItem(); DocumentationPlugin* plugin() const { return m_plugin; } @@ -122,7 +122,7 @@ private: /**Documentation index item.*/ class IndexItem: public TQListBoxText { public: - typedef QPair<TQString, KURL> URL; + typedef TQPair<TQString, KURL> URL; typedef TQValueList<URL> List; IndexItem(IndexBox *listbox, const TQString &text); @@ -136,7 +136,7 @@ private: /**Documentation index view.*/ class IndexBox: public KListBox{ public: - IndexBox(TQWidget *parent = 0, const char *name = 0); + IndexBox(TQWidget *tqparent = 0, const char *name = 0); virtual void addIndexItem(IndexItemProto *item); virtual void removeIndexItem(IndexItemProto *item); @@ -158,10 +158,10 @@ class TQFontMetrics; class DocumentationPlugin; /**Documentation configuration item.*/ -class ConfigurationItem: public QCheckListItem +class ConfigurationItem: public TQCheckListItem { public: - ConfigurationItem(TQListView *parent, DocumentationPlugin * plugin, const TQString &title, const TQString &url, + ConfigurationItem(TQListView *tqparent, DocumentationPlugin * plugin, const TQString &title, const TQString &url, bool indexPossible, bool fullTextSearchPossible); virtual TQString title() const { return m_title; } @@ -214,9 +214,10 @@ methods to load documentation catalogs and indexes for a documentation of that type. It also has methods to configure catalogs and provides a list of URL's for the full text search tool. */ -class DocumentationPlugin: public QObject +class DocumentationPlugin: public TQObject { Q_OBJECT + TQ_OBJECT public: /**Capability of documentation plugin.*/ enum Capability { Index=1 /**<index can be built for catalogs*/, @@ -233,7 +234,7 @@ public: setCapabilities(Index | FullTextSearch); @endcode */ - DocumentationPlugin(KConfig *pluginConfig, TQObject *parent =0, const char *name =0); + DocumentationPlugin(KConfig *pluginConfig, TQObject *tqparent =0, const char *name =0); virtual ~DocumentationPlugin(); /**Returns the i18n name of the plugin.*/ @@ -310,7 +311,7 @@ public: virtual void deleteCatalogConfiguration(const ConfigurationItem *const configurationItem); /**Returns a mode and a filter for catalog locator dialogs.*/ - virtual QPair<KFile::Mode, TQString> catalogLocatorProps() = 0; + virtual TQPair<KFile::Mode, TQString> catalogLocatorProps() = 0; /**Returns a title of catalog defined by an url parameter.*/ virtual TQString catalogTitle(const TQString &url) = 0; @@ -389,6 +390,7 @@ Represents functionality to display project documentation catalog and index in d */ class ProjectDocumentationPlugin: public TQObject { Q_OBJECT + TQ_OBJECT public: ProjectDocumentationPlugin(DocumentationPlugin *docPlugin, DocumentationPlugin::ProjectDocType type); virtual ~ProjectDocumentationPlugin(); diff --git a/parts/documentation/plugins/chm/docchmplugin.cpp b/parts/documentation/plugins/chm/docchmplugin.cpp index e0b19de9..fb033a7f 100644 --- a/parts/documentation/plugins/chm/docchmplugin.cpp +++ b/parts/documentation/plugins/chm/docchmplugin.cpp @@ -38,9 +38,9 @@ static const KDevPluginInfo data("docchmplugin"); typedef KDevGenericFactory<DocCHMPlugin> DocCHMPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocchmplugin, DocCHMPluginFactory(data) ) -DocCHMPlugin::DocCHMPlugin(TQObject* parent, const char* name, TQStringList // args +DocCHMPlugin::DocCHMPlugin(TQObject* tqparent, const char* name, TQStringList // args ) - :DocumentationPlugin(DocCHMPluginFactory::instance()->config(), parent, name) + :DocumentationPlugin(DocCHMPluginFactory::instance()->config(), tqparent, name) { setCapabilities(CustomDocumentationTitles); // | Index | FullTextSearch | ProjectDocumentation autoSetup(); @@ -59,15 +59,15 @@ DocumentationCatalogItem* DocCHMPlugin::createCatalog(KListView* contents, const return item; } -QPair<KFile::Mode, TQString> DocCHMPlugin::catalogLocatorProps() +TQPair<KFile::Mode, TQString> DocCHMPlugin::catalogLocatorProps() { - return QPair<KFile::Mode, TQString>(KFile::File, "*.chm"); + return TQPair<KFile::Mode, TQString>(KFile::File, "*.chm"); } TQString DocCHMPlugin::catalogTitle(const TQString& // url ) { - return TQString::null; + return TQString(); } TQString DocCHMPlugin::pluginName() const @@ -127,9 +127,9 @@ void DocCHMPlugin::createIndex(IndexBox* // index } -static KListViewItem* chainEnd(KListViewItem *parent) { - if(parent == 0) return 0; - KListViewItem* ret = dynamic_cast<KListViewItem*>(parent->firstChild()); +static KListViewItem* chainEnd(KListViewItem *tqparent) { + if(tqparent == 0) return 0; + KListViewItem* ret = dynamic_cast<KListViewItem*>(tqparent->firstChild()); if(ret == 0) return 0; while(ret->nextSibling() != 0) { ret = dynamic_cast<KListViewItem*>(ret->nextSibling()); @@ -138,15 +138,15 @@ static KListViewItem* chainEnd(KListViewItem *parent) { } static TQString decodeHTML(const TQString& s) { - TQRegExp rx(TQString::fromLatin1("&#(\\d+);| ")); + TQRegExp rx(TQString::tqfromLatin1("&#(\\d+);| ")); TQString out = s; int pos = rx.search(out); while(pos > -1) { TQString found = rx.cap(0); if(found != " ") { - out.replace(pos, found.length(), static_cast<char>(rx.cap(1).toInt())); + out.tqreplace(pos, found.length(), static_cast<char>(rx.cap(1).toInt())); }else{ - out.replace(pos, found.length(), " "); + out.tqreplace(pos, found.length(), " "); } pos = rx.search(out, pos+1); } @@ -163,11 +163,11 @@ void DocCHMPlugin::createTOC(DocumentationCatalogItem* item) items.push_back(item); for(TQStringList::Iterator it = lines.begin(); it != lines.end();) { bool ok1 = true, ok2 = true; - int parent = (*it).toInt(&ok1); + int tqparent = (*it).toInt(&ok1); ++it; int current = (*it).toInt(&ok2); ++it; - if(int(items.size()) != current || !ok1 || !ok2 || parent < 0 || parent >= int(items.size()) || current < 0 || current != int(items.size())) { + if(int(items.size()) != current || !ok1 || !ok2 || tqparent < 0 || tqparent >= int(items.size()) || current < 0 || current != int(items.size())) { kdDebug(9002) << "DocCHMPlugin::createTOC error while parsing output of ioslave" << endl; break; } @@ -178,9 +178,9 @@ void DocCHMPlugin::createTOC(DocumentationCatalogItem* item) ++it; items.push_back(new DocumentationItem( - DocumentationItem::Document, items[parent], chainEnd(items[parent]), decodeHTML(name))); + DocumentationItem::Document, items[tqparent], chainEnd(items[tqparent]), decodeHTML(name))); items[current]->setURL(url); - if(parent != 0) items[parent]->setType(DocumentationItem::Book); + if(tqparent != 0) items[tqparent]->setType(DocumentationItem::Book); } diff --git a/parts/documentation/plugins/chm/docchmplugin.h b/parts/documentation/plugins/chm/docchmplugin.h index ca90a978..3f069faf 100644 --- a/parts/documentation/plugins/chm/docchmplugin.h +++ b/parts/documentation/plugins/chm/docchmplugin.h @@ -25,15 +25,16 @@ class DocCHMPlugin :public DocumentationPlugin { Q_OBJECT + TQ_OBJECT public: - DocCHMPlugin(TQObject* parent, const char* name, TQStringList args = TQStringList()); + DocCHMPlugin(TQObject* tqparent, const char* name, TQStringList args = TQStringList()); ~DocCHMPlugin(); virtual TQString pluginName() const; virtual void setCatalogURL(DocumentationCatalogItem* item); virtual TQString catalogTitle(const TQString& url); - virtual QPair<KFile::Mode, TQString> catalogLocatorProps(); + virtual TQPair<KFile::Mode, TQString> catalogLocatorProps(); virtual DocumentationCatalogItem* createCatalog(KListView* contents, const TQString& title, const TQString& url); virtual void createTOC(DocumentationCatalogItem* item); diff --git a/parts/documentation/plugins/custom/doccustomplugin.cpp b/parts/documentation/plugins/custom/doccustomplugin.cpp index ae95aff1..47012a2b 100644 --- a/parts/documentation/plugins/custom/doccustomplugin.cpp +++ b/parts/documentation/plugins/custom/doccustomplugin.cpp @@ -32,9 +32,9 @@ static const KDevPluginInfo data("doccustomplugin"); typedef KDevGenericFactory<DocCustomPlugin> DocCustomPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdoccustomplugin, DocCustomPluginFactory(data) ) -DocCustomPlugin::DocCustomPlugin(TQObject* parent, const char* name, const TQStringList // args +DocCustomPlugin::DocCustomPlugin(TQObject* tqparent, const char* name, const TQStringList // args ) - :DocumentationPlugin(DocCustomPluginFactory::instance()->config(), parent, name) + :DocumentationPlugin(DocCustomPluginFactory::instance()->config(), tqparent, name) { setCapabilities(CustomDocumentationTitles | ProjectUserManual); autoSetup(); @@ -62,14 +62,14 @@ DocumentationCatalogItem* DocCustomPlugin::createCatalog(KListView* contents, co return item; } -QPair<KFile::Mode, TQString> DocCustomPlugin::catalogLocatorProps() +TQPair<KFile::Mode, TQString> DocCustomPlugin::catalogLocatorProps() { - return QPair<KFile::Mode, TQString>(KFile::File, "all/allfiles"); + return TQPair<KFile::Mode, TQString>(KFile::File, "all/allfiles"); } TQString DocCustomPlugin::catalogTitle(const TQString& /*url*/) { - return TQString::null; + return TQString(); } TQStringList DocCustomPlugin::fullTextSearchLocations() diff --git a/parts/documentation/plugins/custom/doccustomplugin.h b/parts/documentation/plugins/custom/doccustomplugin.h index 77bc9750..33efec8f 100644 --- a/parts/documentation/plugins/custom/doccustomplugin.h +++ b/parts/documentation/plugins/custom/doccustomplugin.h @@ -24,7 +24,7 @@ class DocCustomPlugin : public DocumentationPlugin { public: - DocCustomPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); + DocCustomPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); ~DocCustomPlugin(); virtual TQString pluginName() const; @@ -39,7 +39,7 @@ public: virtual TQStringList fullTextSearchLocations(); - virtual QPair<KFile::Mode, TQString> catalogLocatorProps(); + virtual TQPair<KFile::Mode, TQString> catalogLocatorProps(); virtual TQString catalogTitle(const TQString& url); virtual void autoSetupPlugin(); diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp index 11c2b6a7..79106157 100644 --- a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp +++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp @@ -41,13 +41,13 @@ class DevHelpDocumentationCatalogItem: public DocumentationCatalogItem { public: DevHelpDocumentationCatalogItem(const TQString &devHelpFile, DocumentationPlugin* plugin, - KListView *parent, const TQString &name) - :DocumentationCatalogItem(plugin, parent, name), m_devHelpFile(devHelpFile) + KListView *tqparent, const TQString &name) + :DocumentationCatalogItem(plugin, tqparent, name), m_devHelpFile(devHelpFile) { } DevHelpDocumentationCatalogItem(const TQString &devHelpFile, DocumentationPlugin* plugin, - DocumentationItem *parent, const TQString &name) - :DocumentationCatalogItem(plugin, parent, name), m_devHelpFile(devHelpFile) + DocumentationItem *tqparent, const TQString &name) + :DocumentationCatalogItem(plugin, tqparent, name), m_devHelpFile(devHelpFile) { } TQString devHelpFile() const { return m_devHelpFile; } @@ -73,9 +73,9 @@ static const KDevPluginInfo data("docdevhelpplugin"); typedef KDevGenericFactory<DocDevHelpPlugin> DocDevHelpPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocdevhelpplugin, DocDevHelpPluginFactory(data) ) -DocDevHelpPlugin::DocDevHelpPlugin(TQObject* parent, const char* name, +DocDevHelpPlugin::DocDevHelpPlugin(TQObject* tqparent, const char* name, const TQStringList /*args*/) - :DocumentationPlugin(DocDevHelpPluginFactory::instance()->config(), parent, name) + :DocumentationPlugin(DocDevHelpPluginFactory::instance()->config(), tqparent, name) { setCapabilities(Index | FullTextSearch | ProjectDocumentation); autoSetup(); @@ -90,29 +90,29 @@ DocumentationCatalogItem* DocDevHelpPlugin::createCatalog(KListView* contents, c return new DevHelpDocumentationCatalogItem(url, this, contents, title); } -QPair<KFile::Mode, TQString> DocDevHelpPlugin::catalogLocatorProps() +TQPair<KFile::Mode, TQString> DocDevHelpPlugin::catalogLocatorProps() { - return QPair<KFile::Mode, TQString>(KFile::File, "*.devhelp"); + return TQPair<KFile::Mode, TQString>(KFile::File, "*.devhelp"); } TQString DocDevHelpPlugin::catalogTitle(const TQString& url) { TQFileInfo fi(url); if (!fi.exists()) - return TQString::null; + return TQString(); TQFile f(url); if (!f.open(IO_ReadOnly)) - return TQString::null; + return TQString(); TQDomDocument doc; if (!doc.setContent(&f)) - return TQString::null; + return TQString(); f.close(); TQDomElement docEl = doc.documentElement(); - return docEl.attribute("title", TQString::null); + return docEl.attribute("title", TQString()); } TQString DocDevHelpPlugin::pluginName() const @@ -194,7 +194,7 @@ void DocDevHelpPlugin::autoSetupPlugin() continue; scanList << dir.path(); - const QFileInfoList *dirEntries = dir.entryInfoList(); + const TQFileInfoList *dirEntries = dir.entryInfoList(); if ( !dirEntries ) continue; TQPtrListIterator<TQFileInfo> it(*dirEntries); for (; it.current(); ++it) @@ -224,8 +224,8 @@ void DocDevHelpPlugin::scanDevHelpDir(const TQString &path) d.setFilter(TQDir::Files); //scan for *.devhelp files - const QFileInfoList *list = d.entryInfoList(); - QFileInfoListIterator it( *list ); + const TQFileInfoList *list = d.entryInfoList(); + TQFileInfoListIterator it( *list ); TQFileInfo *fi; while ( (fi = it.current()) != 0 ) { @@ -240,7 +240,7 @@ void DocDevHelpPlugin::scanDevHelpDir(const TQString &path) void DocDevHelpPlugin::pushToScanStack(TQValueStack<TQString> &stack, const TQString &value) { - if ( (!value.isEmpty()) && (!stack.contains(value)) ) + if ( (!value.isEmpty()) && (!stack.tqcontains(value)) ) { stack << value; kdDebug() << "Devhelp scan stack: +: " << value << endl; @@ -320,7 +320,7 @@ void DocDevHelpPlugin::createTOC(DocumentationCatalogItem* item) addTocSect(dhItem, childEl, baseUrl, true); } -void DocDevHelpPlugin::addTocSect(DocumentationItem *parent, TQDomElement childEl, +void DocDevHelpPlugin::addTocSect(DocumentationItem *tqparent, TQDomElement childEl, TQString baseUrl, bool book) { while (!childEl.isNull()) @@ -330,11 +330,11 @@ void DocDevHelpPlugin::addTocSect(DocumentationItem *parent, TQDomElement childE TQString name = childEl.attribute("name"); TQString url = childEl.attribute("link"); - if (name.isEmpty() && url.contains("ix")) + if (name.isEmpty() && url.tqcontains("ix")) name = "Index"; DocumentationItem *item = new DocumentationItem( - book ? DocumentationItem::Book : DocumentationItem::Document, parent, name); + book ? DocumentationItem::Book : DocumentationItem::Document, tqparent, name); item->setURL(KURL(baseUrl+"/"+url)); TQDomElement grandchildEl = childEl.lastChild().toElement(); @@ -371,7 +371,7 @@ void DocDevHelpPlugin::setCatalogURL(DocumentationCatalogItem* item) if (item->url().isEmpty()) { - KURL url(fi.dirPath(true) + "/" + docEl.attribute("link", TQString::null)); + KURL url(fi.dirPath(true) + "/" + docEl.attribute("link", TQString())); item->setURL(url); } } diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.h b/parts/documentation/plugins/devhelp/docdevhelpplugin.h index 9e4df5c2..dde545d3 100644 --- a/parts/documentation/plugins/devhelp/docdevhelpplugin.h +++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.h @@ -28,8 +28,9 @@ class DocDevHelpPlugin: public DocumentationPlugin { Q_OBJECT + TQ_OBJECT public: - DocDevHelpPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); + DocDevHelpPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); ~DocDevHelpPlugin(); virtual TQString pluginName() const; @@ -47,14 +48,14 @@ public: virtual TQStringList fullTextSearchLocations(); virtual void autoSetupPlugin(); - virtual QPair<KFile::Mode, TQString> catalogLocatorProps(); + virtual TQPair<KFile::Mode, TQString> catalogLocatorProps(); virtual ProjectDocumentationPlugin *projectDocumentationPlugin(ProjectDocType type); protected: void pushToScanStack(TQValueStack<TQString> &stack, const TQString &value); void scanDevHelpDir(const TQString &path); - void addTocSect(DocumentationItem *parent, TQDomElement childEl, TQString baseUrl, bool book=false); + void addTocSect(DocumentationItem *tqparent, TQDomElement childEl, TQString baseUrl, bool book=false); }; #endif diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.cpp b/parts/documentation/plugins/djvu/docdjvuplugin.cpp index f9761155..77997d6b 100644 --- a/parts/documentation/plugins/djvu/docdjvuplugin.cpp +++ b/parts/documentation/plugins/djvu/docdjvuplugin.cpp @@ -31,8 +31,8 @@ static const KAboutData data("docdjvuplugin", I18N_NOOP("Djvu documentation plug typedef KDevGenericFactory<DocDjvuPlugin> DocDjvuPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocdjvuplugin, DocDjvuPluginFactory(&data) ) -DocDjvuPlugin::DocDjvuPlugin(TQObject* parent, const char* name, const TQStringList args) - :DocumentationPlugin(DocDjvuPluginFactory::instance()->config(), parent, name) +DocDjvuPlugin::DocDjvuPlugin(TQObject* tqparent, const char* name, const TQStringList args) + :DocumentationPlugin(DocDjvuPluginFactory::instance()->config(), tqparent, name) { setCapabilities(CustomDocumentationTitles | ProjectUserManual); autoSetup(); @@ -59,14 +59,14 @@ DocumentationCatalogItem* DocDjvuPlugin::createCatalog(KListView* contents, cons return item; } -QPair<KFile::Mode, TQString> DocDjvuPlugin::catalogLocatorProps() +TQPair<KFile::Mode, TQString> DocDjvuPlugin::catalogLocatorProps() { - return QPair<KFile::Mode, TQString>(KFile::File, "all/allfiles"); + return TQPair<KFile::Mode, TQString>(KFile::File, "all/allfiles"); } TQString DocDjvuPlugin::catalogTitle(const TQString& /*url*/) { - return TQString::null; + return TQString(); } TQStringList DocDjvuPlugin::fullTextSearchLocations() diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.h b/parts/documentation/plugins/djvu/docdjvuplugin.h index 05689bd8..ec99e024 100644 --- a/parts/documentation/plugins/djvu/docdjvuplugin.h +++ b/parts/documentation/plugins/djvu/docdjvuplugin.h @@ -24,7 +24,7 @@ class DocDjvuPlugin : public DocumentationPlugin { public: - DocDjvuPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); + DocDjvuPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); ~DocDjvuPlugin(); virtual TQString pluginName() const; @@ -39,7 +39,7 @@ public: virtual TQStringList fullTextSearchLocations(); - virtual QPair<KFile::Mode, TQString> catalogLocatorProps(); + virtual TQPair<KFile::Mode, TQString> catalogLocatorProps(); virtual TQString catalogTitle(const TQString& url); virtual void autoSetupPlugin(); diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp index a92eb60f..f50ceb3d 100644 --- a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp +++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp @@ -44,13 +44,13 @@ class DoxyDocumentationCatalogItem: public DocumentationCatalogItem { public: DoxyDocumentationCatalogItem(const TQString &origUrl, DocumentationPlugin* plugin, - KListView *parent, const TQString &name) - :DocumentationCatalogItem(plugin, parent, name), m_origUrl(origUrl) + KListView *tqparent, const TQString &name) + :DocumentationCatalogItem(plugin, tqparent, name), m_origUrl(origUrl) { } DoxyDocumentationCatalogItem(const TQString &origUrl, DocumentationPlugin* plugin, - DocumentationItem *parent, const TQString &name) - :DocumentationCatalogItem(plugin, parent, name), m_origUrl(origUrl) + DocumentationItem *tqparent, const TQString &name) + :DocumentationCatalogItem(plugin, tqparent, name), m_origUrl(origUrl) { } TQString origUrl() const { return m_origUrl; } @@ -64,8 +64,8 @@ static const KDevPluginInfo data("docdoxygenplugin"); typedef KDevGenericFactory<DocDoxygenPlugin> DocDoxygenPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocdoxygenplugin, DocDoxygenPluginFactory(data) ) -DocDoxygenPlugin::DocDoxygenPlugin(TQObject* parent, const char* name, const TQStringList) - :DocumentationPlugin(DocDoxygenPluginFactory::instance()->config(), parent, name) +DocDoxygenPlugin::DocDoxygenPlugin(TQObject* tqparent, const char* name, const TQStringList) + :DocumentationPlugin(DocDoxygenPluginFactory::instance()->config(), tqparent, name) { setCapabilities(Index | FullTextSearch | ProjectDocumentation | CustomDocumentationTitles ); autoSetup(); @@ -75,22 +75,22 @@ DocDoxygenPlugin::~DocDoxygenPlugin() { } -QPair<KFile::Mode, TQString> DocDoxygenPlugin::catalogLocatorProps() +TQPair<KFile::Mode, TQString> DocDoxygenPlugin::catalogLocatorProps() { - return QPair<KFile::Mode, TQString>(KFile::File, "index.html *.tag"); + return TQPair<KFile::Mode, TQString>(KFile::File, "index.html *.tag"); } TQString DocDoxygenPlugin::catalogTitle(const TQString& url) { TQFileInfo fi(url); if (!fi.exists()) - return TQString::null; + return TQString(); if (fi.extension(false) == "html") { TQFile f(url); if (!f.open(IO_ReadOnly)) - return TQString::null; + return TQString(); TQTextStream ts(&f); TQString contents = ts.read(); @@ -118,7 +118,7 @@ TQString DocDoxygenPlugin::catalogTitle(const TQString& url) return re.cap(1); } } - return TQString::null; + return TQString(); } TQString DocDoxygenPlugin::pluginName() const @@ -256,7 +256,7 @@ void DocDoxygenPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* it if (!d.exists()) continue; - const QFileInfoList *dirEntries = d.entryInfoList(); + const TQFileInfoList *dirEntries = d.entryInfoList(); if (!dirEntries) continue; TQPtrListIterator<TQFileInfo> it(*dirEntries); for (; it.current(); ++it) @@ -306,7 +306,7 @@ void DocDoxygenPlugin::createTOC(DocumentationCatalogItem* item) if (!d.exists()) continue; - const QFileInfoList *dirEntries = d.entryInfoList(); + const TQFileInfoList *dirEntries = d.entryInfoList(); if (!dirEntries) continue; TQPtrListIterator<TQFileInfo> it(*dirEntries); for (; it.current(); ++it) @@ -434,9 +434,9 @@ void DocDoxygenPlugin::createBookIndex(const TQString &tagfile, IndexBox* index, } void DocDoxygenPlugin::createIndexFromTag(TQDomDocument &dom, IndexBox *index, - DocumentationCatalogItem *item, TQDomElement &parentEl, const TQString &prefix) + DocumentationCatalogItem *item, TQDomElement &tqparentEl, const TQString &prefix) { - TQDomElement docEl = parentEl; + TQDomElement docEl = tqparentEl; TQDomElement childEl = docEl.firstChild().toElement(); while (!childEl.isNull()) @@ -450,7 +450,7 @@ void DocDoxygenPlugin::createIndexFromTag(TQDomDocument &dom, IndexBox *index, TQString filename = childEl.namedItem("filename").firstChild().toText().data(); IndexItemProto *indexItem = new IndexItemProto(this, item, index, classname, - i18n("%1 Class Reference").arg(classname)); + i18n("%1 Class Reference").tqarg(classname)); indexItem->addURL(KURL(prefix + filename)); createIndexFromTag(dom, index, item, childEl, prefix + filename); @@ -460,14 +460,14 @@ void DocDoxygenPlugin::createIndexFromTag(TQDomDocument &dom, IndexBox *index, || (childEl.attribute("kind") == "slot") || (childEl.attribute("kind") == "signal") )) { - TQString classname = parentEl.namedItem("name").firstChild().toText().data(); + TQString classname = tqparentEl.namedItem("name").firstChild().toText().data(); TQString membername = childEl.namedItem("name").firstChild().toText().data(); TQString anchor = childEl.namedItem("anchor").firstChild().toText().data(); TQString arglist = childEl.namedItem("arglist").firstChild().toText().data(); if (classname != membername) { - IndexItemProto *indexItem = new IndexItemProto(this, item, index, membername,i18n("%1::%2%3 Member Reference").arg(classname).arg(membername).arg(arglist)); + IndexItemProto *indexItem = new IndexItemProto(this, item, index, membername,i18n("%1::%2%3 Member Reference").tqarg(classname).tqarg(membername).tqarg(arglist)); indexItem->addURL(KURL(prefix + "#" + anchor)); } } diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.h b/parts/documentation/plugins/doxygen/docdoxygenplugin.h index 8cf9ec45..d24cedb9 100644 --- a/parts/documentation/plugins/doxygen/docdoxygenplugin.h +++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.h @@ -28,8 +28,9 @@ class TQDomElement; class DocDoxygenPlugin: public DocumentationPlugin { Q_OBJECT + TQ_OBJECT public: - DocDoxygenPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); + DocDoxygenPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); ~DocDoxygenPlugin(); virtual TQString pluginName() const; @@ -44,7 +45,7 @@ public: virtual TQStringList fullTextSearchLocations(); - virtual QPair<KFile::Mode, TQString> catalogLocatorProps(); + virtual TQPair<KFile::Mode, TQString> catalogLocatorProps(); virtual TQString catalogTitle(const TQString& url); virtual void autoSetupPlugin(); @@ -52,12 +53,12 @@ public: virtual ProjectDocumentationPlugin *projectDocumentationPlugin(ProjectDocType type); protected: - void createBookTOC(DocumentationItem* item, const TQString &tagUrl = TQString::null, - const TQString &baseHtmlUrl = TQString::null); - void createBookIndex(const TQString &tagfile, IndexBox* index, DocumentationCatalogItem* item, const TQString &baseHtmlUrl = TQString::null); + void createBookTOC(DocumentationItem* item, const TQString &tagUrl = TQString(), + const TQString &baseHtmlUrl = TQString()); + void createBookIndex(const TQString &tagfile, IndexBox* index, DocumentationCatalogItem* item, const TQString &baseHtmlUrl = TQString()); void createIndexFromTag(TQDomDocument &dom, IndexBox* index, DocumentationCatalogItem* item, - TQDomElement &parentEl, const TQString &prefix); + TQDomElement &tqparentEl, const TQString &prefix); void autoSetupDocs(const TQString &defaultDir, const TQString &searchDir, const TQString &name); diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp index 6dd73707..5829b0bb 100644 --- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp +++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp @@ -43,13 +43,13 @@ class TOCDocumentationCatalogItem: public DocumentationCatalogItem { public: TOCDocumentationCatalogItem(const TQString &tocFile, DocumentationPlugin* plugin, - KListView *parent, const TQString &name) - :DocumentationCatalogItem(plugin, parent, name), m_tocFile(tocFile) + KListView *tqparent, const TQString &name) + :DocumentationCatalogItem(plugin, tqparent, name), m_tocFile(tocFile) { } TOCDocumentationCatalogItem(const TQString &tocFile, DocumentationPlugin* plugin, - DocumentationItem *parent, const TQString &name) - :DocumentationCatalogItem(plugin, parent, name), m_tocFile(tocFile) + DocumentationItem *tqparent, const TQString &name) + :DocumentationCatalogItem(plugin, tqparent, name), m_tocFile(tocFile) { } TQString tocFile() const { return m_tocFile; } @@ -63,9 +63,9 @@ static const KDevPluginInfo data("dockdevtocplugin"); typedef KDevGenericFactory<DocKDevTOCPlugin> DocKDevTOCPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdockdevtocplugin, DocKDevTOCPluginFactory(data) ) -DocKDevTOCPlugin::DocKDevTOCPlugin(TQObject* parent, const char* name, +DocKDevTOCPlugin::DocKDevTOCPlugin(TQObject* tqparent, const char* name, const TQStringList /*args*/) - :DocumentationPlugin(DocKDevTOCPluginFactory::instance()->config(), parent, name) + :DocumentationPlugin(DocKDevTOCPluginFactory::instance()->config(), tqparent, name) { setCapabilities(Index); autoSetup(); @@ -85,24 +85,24 @@ DocumentationCatalogItem* DocKDevTOCPlugin::createCatalog(KListView* contents, c return new TOCDocumentationCatalogItem(url, this, contents, title); } -QPair<KFile::Mode, TQString> DocKDevTOCPlugin::catalogLocatorProps() +TQPair<KFile::Mode, TQString> DocKDevTOCPlugin::catalogLocatorProps() { - return QPair<KFile::Mode, TQString>(KFile::File, "*.toc"); + return TQPair<KFile::Mode, TQString>(KFile::File, "*.toc"); } TQString DocKDevTOCPlugin::catalogTitle(const TQString& url) { TQFileInfo fi(url); if (!fi.exists()) - return TQString::null; + return TQString(); TQFile f(url); if (!f.open(IO_ReadOnly)) - return TQString::null; + return TQString(); TQDomDocument doc; if (!doc.setContent(&f) || (doc.doctype().name() != "kdeveloptoc")) - return TQString::null; + return TQString(); f.close(); TQDomElement titleEl = doc.documentElement().namedItem("title").toElement(); @@ -159,7 +159,7 @@ void DocKDevTOCPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* it TQString base; if (!baseEl.isNull()) - base = baseEl.attribute("href", TQString::null); + base = baseEl.attribute("href", TQString()); TQDomElement indexEl = docEl.namedItem("index").toElement(); TQDomElement childEl = indexEl.firstChild().toElement(); @@ -204,22 +204,22 @@ void DocKDevTOCPlugin::createTOC(DocumentationCatalogItem* item) TQString base; if (!baseEl.isNull()) - base = baseEl.attribute("href", TQString::null); + base = baseEl.attribute("href", TQString()); TQDomElement childEl = docEl.lastChild().toElement(); addTocSect(tocItem, childEl, base, 1); } -void DocKDevTOCPlugin::addTocSect(DocumentationItem *parent, TQDomElement childEl, const TQString &base, uint level) +void DocKDevTOCPlugin::addTocSect(DocumentationItem *tqparent, TQDomElement childEl, const TQString &base, uint level) { while (!childEl.isNull()) { - if (childEl.tagName() == TQString("tocsect%1").arg(level)) + if (childEl.tagName() == TQString("tocsect%1").tqarg(level)) { TQString name = childEl.attribute("name"); TQString url = childEl.attribute("url"); - DocumentationItem *item = new DocumentationItem(level == 1 ? DocumentationItem::Book : DocumentationItem::Document, parent, name); + DocumentationItem *item = new DocumentationItem(level == 1 ? DocumentationItem::Book : DocumentationItem::Document, tqparent, name); item->setURL(KURL(constructURL(base, url))); TQDomElement grandchildEl = childEl.lastChild().toElement(); @@ -259,8 +259,8 @@ void DocKDevTOCPlugin::setCatalogURL(DocumentationCatalogItem* item) if (baseEl.isNull()) item->setURL(KURL()); else - item->setURL(KURL(constructURL(baseEl.attribute("href", TQString::null), - baseEl.attribute("url", TQString::null)))); + item->setURL(KURL(constructURL(baseEl.attribute("href", TQString()), + baseEl.attribute("url", TQString())))); } } diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h index 626848b9..fc980247 100644 --- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h +++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h @@ -27,8 +27,9 @@ class DocKDevTOCPlugin : public DocumentationPlugin { Q_OBJECT + TQ_OBJECT public: - DocKDevTOCPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); + DocKDevTOCPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); ~DocKDevTOCPlugin(); virtual TQString pluginName() const; @@ -43,11 +44,11 @@ public: virtual TQStringList fullTextSearchLocations(); - virtual QPair<KFile::Mode, TQString > catalogLocatorProps(); + virtual TQPair<KFile::Mode, TQString > catalogLocatorProps(); virtual void autoSetupPlugin(); protected: - void addTocSect(DocumentationItem *parent, TQDomElement childEl, const TQString &base, uint level); + void addTocSect(DocumentationItem *tqparent, TQDomElement childEl, const TQString &base, uint level); static TQString constructURL(const TQString &base, const TQString &url) ; }; diff --git a/parts/documentation/plugins/pdb/docpdbplugin.cpp b/parts/documentation/plugins/pdb/docpdbplugin.cpp index 8fdc4643..17089c89 100644 --- a/parts/documentation/plugins/pdb/docpdbplugin.cpp +++ b/parts/documentation/plugins/pdb/docpdbplugin.cpp @@ -31,8 +31,8 @@ static const KAboutData data("docpdbplugin", I18N_NOOP("PalmDoc documentation pl typedef KDevGenericFactory<DocPDBPlugin> DocPDBPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocpdbplugin, DocPDBPluginFactory(&data) ) -DocPDBPlugin::DocPDBPlugin(TQObject* parent, const char* name, const TQStringList args) - :DocumentationPlugin(DocPDBPluginFactory::instance()->config(), parent, name) +DocPDBPlugin::DocPDBPlugin(TQObject* tqparent, const char* name, const TQStringList args) + :DocumentationPlugin(DocPDBPluginFactory::instance()->config(), tqparent, name) { setCapabilities(CustomDocumentationTitles | ProjectUserManual); autoSetup(); @@ -59,14 +59,14 @@ DocumentationCatalogItem* DocPDBPlugin::createCatalog(KListView* contents, const return item; } -QPair<KFile::Mode, TQString> DocPDBPlugin::catalogLocatorProps() +TQPair<KFile::Mode, TQString> DocPDBPlugin::catalogLocatorProps() { - return QPair<KFile::Mode, TQString>(KFile::File, "all/allfiles"); + return TQPair<KFile::Mode, TQString>(KFile::File, "all/allfiles"); } TQString DocPDBPlugin::catalogTitle(const TQString& /*url*/) { - return TQString::null; + return TQString(); } TQStringList DocPDBPlugin::fullTextSearchLocations() diff --git a/parts/documentation/plugins/pdb/docpdbplugin.h b/parts/documentation/plugins/pdb/docpdbplugin.h index b9544a7b..33bb5ded 100644 --- a/parts/documentation/plugins/pdb/docpdbplugin.h +++ b/parts/documentation/plugins/pdb/docpdbplugin.h @@ -24,7 +24,7 @@ class DocPDBPlugin : public DocumentationPlugin { public: - DocPDBPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); + DocPDBPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); ~DocPDBPlugin(); virtual TQString pluginName() const; @@ -39,7 +39,7 @@ public: virtual TQStringList fullTextSearchLocations(); - virtual QPair<KFile::Mode, TQString> catalogLocatorProps(); + virtual TQPair<KFile::Mode, TQString> catalogLocatorProps(); virtual TQString catalogTitle(const TQString& url); virtual void autoSetupPlugin(); diff --git a/parts/documentation/plugins/pdf/docpdfplugin.cpp b/parts/documentation/plugins/pdf/docpdfplugin.cpp index 79dab511..8fa76deb 100644 --- a/parts/documentation/plugins/pdf/docpdfplugin.cpp +++ b/parts/documentation/plugins/pdf/docpdfplugin.cpp @@ -31,8 +31,8 @@ static const KAboutData data("docpdfplugin", I18N_NOOP("PDF documentation plugin typedef KDevGenericFactory<DocPDFPlugin> DocPDFPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocpdfplugin, DocPDFPluginFactory(&data) ) -DocPDFPlugin::DocPDFPlugin(TQObject* parent, const char* name, const TQStringList args) - :DocumentationPlugin(DocPDFPluginFactory::instance()->config(), parent, name) +DocPDFPlugin::DocPDFPlugin(TQObject* tqparent, const char* name, const TQStringList args) + :DocumentationPlugin(DocPDFPluginFactory::instance()->config(), tqparent, name) { setCapabilities(CustomDocumentationTitles | ProjectUserManual); autoSetup(); @@ -59,14 +59,14 @@ DocumentationCatalogItem* DocPDFPlugin::createCatalog(KListView* contents, const return item; } -QPair<KFile::Mode, TQString> DocPDFPlugin::catalogLocatorProps() +TQPair<KFile::Mode, TQString> DocPDFPlugin::catalogLocatorProps() { - return QPair<KFile::Mode, TQString>(KFile::File, "*.pdf"); + return TQPair<KFile::Mode, TQString>(KFile::File, "*.pdf"); } TQString DocPDFPlugin::catalogTitle(const TQString& /*url*/) { - return TQString::null; + return TQString(); } TQStringList DocPDFPlugin::fullTextSearchLocations() diff --git a/parts/documentation/plugins/pdf/docpdfplugin.h b/parts/documentation/plugins/pdf/docpdfplugin.h index b7e8b26b..e3a9c099 100644 --- a/parts/documentation/plugins/pdf/docpdfplugin.h +++ b/parts/documentation/plugins/pdf/docpdfplugin.h @@ -24,7 +24,7 @@ class DocPDFPlugin : public DocumentationPlugin { public: - DocPDFPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); + DocPDFPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); ~DocPDFPlugin(); virtual TQString pluginName() const; @@ -39,7 +39,7 @@ public: virtual TQStringList fullTextSearchLocations(); - virtual QPair<KFile::Mode, TQString> catalogLocatorProps(); + virtual TQPair<KFile::Mode, TQString> catalogLocatorProps(); virtual TQString catalogTitle(const TQString& url); virtual void autoSetupPlugin(); diff --git a/parts/documentation/plugins/qt/docqtplugin.cpp b/parts/documentation/plugins/qt/docqtplugin.cpp index b4118f97..5efe880f 100644 --- a/parts/documentation/plugins/qt/docqtplugin.cpp +++ b/parts/documentation/plugins/qt/docqtplugin.cpp @@ -37,17 +37,17 @@ #include "../../../../config.h" -class QtDocumentationCatalogItem: public DocumentationCatalogItem +class TQtDocumentationCatalogItem: public DocumentationCatalogItem { public: - QtDocumentationCatalogItem(const TQString &dcfFile, DocumentationPlugin* plugin, - KListView *parent, const TQString &name) - :DocumentationCatalogItem(plugin, parent, name), m_dcfFile(dcfFile) + TQtDocumentationCatalogItem(const TQString &dcfFile, DocumentationPlugin* plugin, + KListView *tqparent, const TQString &name) + :DocumentationCatalogItem(plugin, tqparent, name), m_dcfFile(dcfFile) { } - QtDocumentationCatalogItem(const TQString &dcfFile, DocumentationPlugin* plugin, - DocumentationItem *parent, const TQString &name) - :DocumentationCatalogItem(plugin, parent, name), m_dcfFile(dcfFile) + TQtDocumentationCatalogItem(const TQString &dcfFile, DocumentationPlugin* plugin, + DocumentationItem *tqparent, const TQString &name) + :DocumentationCatalogItem(plugin, tqparent, name), m_dcfFile(dcfFile) { } TQString dcfFile() const { return m_dcfFile; } @@ -57,23 +57,23 @@ private: }; static const KDevPluginInfo data("docqtplugin"); -typedef KDevGenericFactory<DocQtPlugin> DocQtPluginFactory; -K_EXPORT_COMPONENT_FACTORY( libdocqtplugin, DocQtPluginFactory(data) ) +typedef KDevGenericFactory<DocTQtPlugin> DocTQtPluginFactory; +K_EXPORT_COMPONENT_FACTORY( libdocqtplugin, DocTQtPluginFactory(data) ) -DocQtPlugin::DocQtPlugin(TQObject* parent, const char* name, const TQStringList) - :DocumentationPlugin(DocQtPluginFactory::instance()->config(), parent, name) +DocTQtPlugin::DocTQtPlugin(TQObject* tqparent, const char* name, const TQStringList) + :DocumentationPlugin(DocTQtPluginFactory::instance()->config(), tqparent, name) { setCapabilities(Index | FullTextSearch | CustomDocumentationTitles); autoSetup(); } -DocQtPlugin::~DocQtPlugin() +DocTQtPlugin::~DocTQtPlugin() { } -void DocQtPlugin::createTOC(DocumentationCatalogItem *item) +void DocTQtPlugin::createTOC(DocumentationCatalogItem *item) { - QtDocumentationCatalogItem *qtItem = dynamic_cast<QtDocumentationCatalogItem *>(item); + TQtDocumentationCatalogItem *qtItem = dynamic_cast<TQtDocumentationCatalogItem *>(item); if (!qtItem) return; @@ -135,32 +135,32 @@ void DocQtPlugin::createTOC(DocumentationCatalogItem *item) } } -void DocQtPlugin::autoSetupPlugin() +void DocTQtPlugin::autoSetupPlugin() { TQString qtDocDir(QT_DOCDIR); qtDocDir = URLUtil::envExpand(qtDocDir); if (qtDocDir.isEmpty()) { - qtDocDir = getenv("QTDIR"); + qtDocDir = getenv("TQTDIR"); } if (!qtDocDir.isEmpty()) { config->setGroup("Search Settings"); - config->writeEntry("Qt Reference Documentation", true); + config->writeEntry("TQt Reference Documentation", true); config->setGroup("Index Settings"); - config->writeEntry("Qt Reference Documentation", true); + config->writeEntry("TQt Reference Documentation", true); config->setGroup("Locations"); - config->writePathEntry("Qt Reference Documentation", qtDocDir + TQString("/qt.dcf")); - config->writePathEntry("Qt Assistant Manual", qtDocDir + TQString("/assistant.dcf")); - config->writePathEntry("Qt Designer Manual", qtDocDir + TQString("/designer.dcf")); - config->writePathEntry("Guide to the Qt Translation Tools", qtDocDir + TQString("/linguist.dcf")); + config->writePathEntry("TQt Reference Documentation", qtDocDir + TQString("/qt.dcf")); + config->writePathEntry("TQt Assistant Manual", qtDocDir + TQString("/assistant.dcf")); + config->writePathEntry("TQt Designer Manual", qtDocDir + TQString("/designer.dcf")); + config->writePathEntry("Guide to the TQt Translation Tools", qtDocDir + TQString("/linguist.dcf")); config->writePathEntry("qmake User Guide", qtDocDir + TQString("/qmake.dcf")); } } -void DocQtPlugin::setCatalogURL(DocumentationCatalogItem *item) +void DocTQtPlugin::setCatalogURL(DocumentationCatalogItem *item) { - QtDocumentationCatalogItem *qtItem = dynamic_cast<QtDocumentationCatalogItem *>(item); + TQtDocumentationCatalogItem *qtItem = dynamic_cast<TQtDocumentationCatalogItem *>(item); if (!qtItem) return; @@ -185,19 +185,19 @@ void DocQtPlugin::setCatalogURL(DocumentationCatalogItem *item) if (item->url().isEmpty()) { - KURL url(fi.dirPath(true) + "/" + docEl.attribute("ref", TQString::null)); + KURL url(fi.dirPath(true) + "/" + docEl.attribute("ref", TQString())); item->setURL(url); } } -TQString DocQtPlugin::pluginName() const +TQString DocTQtPlugin::pluginName() const { - return i18n("Qt Documentation Collection"); + return i18n("TQt Documentation Collection"); } -bool DocQtPlugin::needRefreshIndex(DocumentationCatalogItem *item) +bool DocTQtPlugin::needRefreshIndex(DocumentationCatalogItem *item) { - QtDocumentationCatalogItem *qtItem = dynamic_cast<QtDocumentationCatalogItem *>(item); + TQtDocumentationCatalogItem *qtItem = dynamic_cast<TQtDocumentationCatalogItem *>(item); if (!qtItem) return false; @@ -213,9 +213,9 @@ bool DocQtPlugin::needRefreshIndex(DocumentationCatalogItem *item) return false; } -void DocQtPlugin::createIndex(IndexBox *index, DocumentationCatalogItem *item) +void DocTQtPlugin::createIndex(IndexBox *index, DocumentationCatalogItem *item) { - QtDocumentationCatalogItem *qtItem = dynamic_cast<QtDocumentationCatalogItem *>(item); + TQtDocumentationCatalogItem *qtItem = dynamic_cast<TQtDocumentationCatalogItem *>(item); if (!qtItem) return; @@ -249,10 +249,10 @@ void DocQtPlugin::createIndex(IndexBox *index, DocumentationCatalogItem *item) } } -void DocQtPlugin::createSectionIndex(TQFileInfo &fi, IndexBox *index, DocumentationCatalogItem *item, +void DocTQtPlugin::createSectionIndex(TQFileInfo &fi, IndexBox *index, DocumentationCatalogItem *item, TQDomElement section) { - //adymo: do not load section to index for Qt reference documentation + //adymo: do not load section to index for TQt reference documentation TQString title = section.attribute("title"); if (fi.fileName() != "qt.dcf") { @@ -285,7 +285,7 @@ void DocQtPlugin::createSectionIndex(TQFileInfo &fi, IndexBox *index, Documentat } } -TQStringList DocQtPlugin::fullTextSearchLocations() +TQStringList DocTQtPlugin::fullTextSearchLocations() { TQStringList locs; @@ -306,34 +306,34 @@ TQStringList DocQtPlugin::fullTextSearchLocations() return locs; } -QPair<KFile::Mode, TQString> DocQtPlugin::catalogLocatorProps() +TQPair<KFile::Mode, TQString> DocTQtPlugin::catalogLocatorProps() { - return QPair<KFile::Mode, TQString>(KFile::File, "*.xml *.dcf"); + return TQPair<KFile::Mode, TQString>(KFile::File, "*.xml *.dcf"); } -TQString DocQtPlugin::catalogTitle(const TQString &url) +TQString DocTQtPlugin::catalogTitle(const TQString &url) { TQFileInfo fi(url); if (!fi.exists()) - return TQString::null; + return TQString(); TQFile f(url); if (!f.open(IO_ReadOnly)) - return TQString::null; + return TQString(); TQDomDocument doc; if (!doc.setContent(&f) || (doc.doctype().name() != "DCF")) - return TQString::null; + return TQString(); f.close(); TQDomElement docEl = doc.documentElement(); - return docEl.attribute("title", TQString::null); + return docEl.attribute("title", TQString()); } -DocumentationCatalogItem *DocQtPlugin::createCatalog(KListView *contents, const TQString &title, const TQString &url) +DocumentationCatalogItem *DocTQtPlugin::createCatalog(KListView *contents, const TQString &title, const TQString &url) { - return new QtDocumentationCatalogItem(url, this, contents, title); + return new TQtDocumentationCatalogItem(url, this, contents, title); } #include "docqtplugin.moc" diff --git a/parts/documentation/plugins/qt/docqtplugin.h b/parts/documentation/plugins/qt/docqtplugin.h index e09ce7a5..1bc1e865 100644 --- a/parts/documentation/plugins/qt/docqtplugin.h +++ b/parts/documentation/plugins/qt/docqtplugin.h @@ -17,20 +17,21 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef DOCQTPLUGIN_H -#define DOCQTPLUGIN_H +#ifndef DOCTQTPLUGIN_H +#define DOCTQTPLUGIN_H #include <kdevdocumentationplugin.h> #include <tqdom.h> class KConfig; -class DocQtPlugin : public DocumentationPlugin +class DocTQtPlugin : public DocumentationPlugin { Q_OBJECT + TQ_OBJECT public: - DocQtPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); - ~DocQtPlugin(); + DocTQtPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); + ~DocTQtPlugin(); virtual TQString pluginName() const; @@ -46,7 +47,7 @@ public: virtual TQStringList fullTextSearchLocations(); - virtual QPair<KFile::Mode, TQString> catalogLocatorProps(); + virtual TQPair<KFile::Mode, TQString> catalogLocatorProps(); virtual TQString catalogTitle(const TQString &url); virtual void autoSetupPlugin(); diff --git a/parts/documentation/protocols/chm/chm.cpp b/parts/documentation/protocols/chm/chm.cpp index 1d7543c3..dbcbb07f 100644 --- a/parts/documentation/protocols/chm/chm.cpp +++ b/parts/documentation/protocols/chm/chm.cpp @@ -76,7 +76,7 @@ ChmProtocol::~ChmProtocol() void ChmProtocol::get( const KURL& url ) { /** When :catalog is appended to the end, a plain-text representation of the catalog - * is given out where each entry consists of four lines, an integer representing the parent + * is given out where each entry consists of four lines, an integer representing the tqparent * of the node, an integer representing a node's ID, the Title of the Node, and it's hyperlink. * When :contents is appended, all contained htm- and html-files will be printed, each in a line. */ @@ -105,7 +105,7 @@ void ChmProtocol::get( const KURL& url ) } - if (m_dirMap.find(path) == m_dirMap.end()) { + if (m_dirMap.tqfind(path) == m_dirMap.end()) { error( KIO::ERR_DOES_NOT_EXIST, url.prettyURL() ); return; } @@ -178,25 +178,25 @@ void ChmProtocol::get( const KURL& url ) TQRegExp mergeParam("<param name=\"Merge\" value=\"(.*)\">", false); mergeParam.setMinimal(true); - std::stack<int> parents; + std::stack<int> tqparents; int counter = 1; int current = 0; int old = 0, pos = 0; - parents.push(0); - while ((pos = s.find(object, pos)) != -1) { + tqparents.push(0); + while ((pos = s.tqfind(object, pos)) != -1) { if(htmlOutput) output += s.mid(old, pos - old); if(catalog) { TQRegExp ex("<UL>|</UL>", false); ex.setMinimal(true); TQString ms = s.mid(old, pos - old); int pos = 0; - while( (pos = ms.find(ex, pos)) != -1) { + while( (pos = ms.tqfind(ex, pos)) != -1) { if(ms.mid(pos, 4) == "<UL>") { - parents.push(current); + tqparents.push(current); } else{ - if(parents.empty()){ + if(tqparents.empty()){ }else{ - current = parents.top(); - parents.pop(); + current = tqparents.top(); + tqparents.pop(); } } pos++; @@ -206,9 +206,9 @@ void ChmProtocol::get( const KURL& url ) old = pos; TQString obj = object.cap(1); TQString name, local; - if (obj.find(nameParam) != -1) { + if (obj.tqfind(nameParam) != -1) { name = nameParam.cap(1); - if (obj.find(localParam) != -1) { + if (obj.tqfind(localParam) != -1) { local = localParam.cap(1); //output += "<a href=\"" + local + "\">" + name + "</a>"; //added by lucida lucida@users.sf.net @@ -221,7 +221,7 @@ void ChmProtocol::get( const KURL& url ) KURL u = url; u.setPath(bigpath + local); TQString str; - output += str.sprintf("%i\n%i\n", parents.top(), current); + output += str.sprintf("%i\n%i\n", tqparents.top(), current); output += name + "\n" + u.prettyURL() + "\n"; } m_bIndex = 1; @@ -233,10 +233,10 @@ void ChmProtocol::get( const KURL& url ) if(htmlOutput) output += name; } } - if (obj.find(mergeParam) != -1 && htmlOutput) { + if (obj.tqfind(mergeParam) != -1 && htmlOutput) { TQString link = mergeParam.cap(1); - TQString href = link.left(link.find("::")); - TQString path = m_chmFile.left(m_chmFile.findRev("/") + 1); + TQString href = link.left(link.tqfind("::")); + TQString path = m_chmFile.left(m_chmFile.tqfindRev("/") + 1); //output += " (<a href=\"" + path + href + "\">link</a>)"; m_bIndex = 1; output += " (<a target=\"browse\" href=\"" + url.url() + path + href + "\">link</a>)"; @@ -301,7 +301,7 @@ bool ChmProtocol::checkNewFile( TQString fullPath, TQString& path ) { //kdDebug() << "ChmProtocol::checkNewFile " << fullPath << endl; - fullPath = fullPath.replace(TQRegExp("::"), ""); + fullPath = fullPath.tqreplace(TQRegExp("::"), ""); // Are we already looking at that file ? if ( !m_chmFile.isEmpty() && fullPath.startsWith(m_chmFile) ) @@ -324,7 +324,7 @@ bool ChmProtocol::checkNewFile( TQString fullPath, TQString& path ) fullPath += '/'; //kdDebug() << "the full path is " << fullPath << endl; - while ( (pos=fullPath.find( '/', pos+1 )) != -1 ) + while ( (pos=fullPath.tqfind( '/', pos+1 )) != -1 ) { TQString tryPath = fullPath.left( pos ); //kdDebug() << fullPath << " trying " << tryPath << endl; @@ -342,7 +342,7 @@ bool ChmProtocol::checkNewFile( TQString fullPath, TQString& path ) } else { - path = TQString::fromLatin1("/"); + path = TQString::tqfromLatin1("/"); } kdDebug() << "Found. chmFile=" << chmFile << " path=" << path << endl; break; diff --git a/parts/documentation/protocols/chm/chmfile.cpp b/parts/documentation/protocols/chm/chmfile.cpp index 43ae8877..2d705b8e 100644 --- a/parts/documentation/protocols/chm/chmfile.cpp +++ b/parts/documentation/protocols/chm/chmfile.cpp @@ -66,7 +66,7 @@ bool Chm::getChunk(TQFile& f, uint chunkSize, ChmDirectoryMap& directoryMap) con char tag[4]; if (f.readBlock(tag, 4) != 4) return false; - if (!qstrncmp(tag, "PMGL", 4)) + if (!tqstrncmp(tag, "PMGL", 4)) { uint quickref_length = getIntel32(f); f.at(f.at() + 12); @@ -87,7 +87,7 @@ bool Chm::getChunk(TQFile& f, uint chunkSize, ChmDirectoryMap& directoryMap) con return (f.at(f.at() + quickref_length)); } - else if (!qstrncmp(tag, "PMGI", 4)) + else if (!tqstrncmp(tag, "PMGI", 4)) { // evaluation of the index chunk is not yet implemented => skip it return f.at(f.at() + chunkSize - 4); @@ -105,7 +105,7 @@ bool Chm::read(const TQString& fileSpec, ChmDirectoryMap& dirMap, TQByteArray& c // read CHM file header char tag[4]; - if (f.readBlock(tag, 4) != 4 || qstrncmp(tag, "ITSF", 4)) return false; + if (f.readBlock(tag, 4) != 4 || tqstrncmp(tag, "ITSF", 4)) return false; uint chm_version = getIntel32(f); if (!f.at(f.at() + 0x30)) return false; @@ -120,7 +120,7 @@ bool Chm::read(const TQString& fileSpec, ChmDirectoryMap& dirMap, TQByteArray& c // read directory header if (!f.at(section_1_offset)) return false; - if (f.readBlock(tag, 4) != 4 || qstrncmp(tag, "ITSP", 4)) return false; + if (f.readBlock(tag, 4) != 4 || tqstrncmp(tag, "ITSP", 4)) return false; if (!f.at(f.at() + 12)) return false; uint directory_chunk_size = getIntel32(f); if (!f.at(f.at() + 24)) return false; diff --git a/parts/documentation/protocols/chm/decompress.cpp b/parts/documentation/protocols/chm/decompress.cpp index b8f45ae2..212eb244 100644 --- a/parts/documentation/protocols/chm/decompress.cpp +++ b/parts/documentation/protocols/chm/decompress.cpp @@ -121,7 +121,7 @@ struct * The LZX document does not state the uncompressed block has an * uncompressed length field. Where does this length field come from, so * we can know how large the block is? The implementation has it as the 24 - * bits following after the 3 blocktype bits, before the alignment + * bits following after the 3 blocktype bits, before the tqalignment * padding. * * The LZX document states that aligned offset blocks have their aligned @@ -228,7 +228,7 @@ int LZXinit(int window) { * REMOVE_BITS(n) removes N bits from the bit buffer * * These bit access routines work by using the area beyond the MSB and the - * LSB as a free source of zeroes. This avoids having to mask any bits. + * LSB as a free source of zeroes. This avoids having to tqmask any bits. * So we have to know the bit width of the bitbuffer variable. This is * sizeof(ULONG) * 8, also defined as ULONG_BITS */ @@ -328,9 +328,9 @@ int make_decode_table(ULONG nsyms, ULONG nbits, UBYTE *length, UWORD *table) { register UBYTE bit_num = 1; ULONG fill; ULONG pos = 0; /* the current position in the decode table */ - ULONG table_mask = 1 << nbits; - ULONG bit_mask = table_mask >> 1; /* don't do 0 length codes */ - ULONG next_symbol = bit_mask; /* base of allocation for long codes */ + ULONG table_tqmask = 1 << nbits; + ULONG bit_tqmask = table_tqmask >> 1; /* don't do 0 length codes */ + ULONG next_symbol = bit_tqmask; /* base of allocation for long codes */ /* fill entries for codes short enough for a direct mapping */ while (bit_num <= nbits) @@ -341,27 +341,27 @@ int make_decode_table(ULONG nsyms, ULONG nbits, UBYTE *length, UWORD *table) { { leaf = pos; - if ((pos += bit_mask) > table_mask) return 1; /* table overrun */ + if ((pos += bit_tqmask) > table_tqmask) return 1; /* table overrun */ /* fill all possible lookups of this symbol with the symbol itself */ - fill = bit_mask; + fill = bit_tqmask; while (fill-- > 0) table[leaf++] = sym; } } - bit_mask >>= 1; + bit_tqmask >>= 1; bit_num++; } /* if there are any codes longer than nbits */ - if (pos != table_mask) + if (pos != table_tqmask) { /* clear the remainder of the table */ - for (sym = pos; sym < table_mask; sym++) table[sym] = 0; + for (sym = pos; sym < table_tqmask; sym++) table[sym] = 0; /* give ourselves room for codes to grow by up to 16 more bits */ pos <<= 16; - table_mask <<= 16; - bit_mask = 1 << 15; + table_tqmask <<= 16; + bit_tqmask = 1 << 15; while (bit_num <= 16) { @@ -385,16 +385,16 @@ int make_decode_table(ULONG nsyms, ULONG nbits, UBYTE *length, UWORD *table) { } table[leaf] = sym; - if ((pos += bit_mask) > table_mask) return 1; /* table overflow */ + if ((pos += bit_tqmask) > table_tqmask) return 1; /* table overflow */ } } - bit_mask >>= 1; + bit_tqmask >>= 1; bit_num++; } } /* full table? */ - if (pos == table_mask) return 0; + if (pos == table_tqmask) return 0; /* either erroneous table, or all elements are 0 - let's find out. */ for (sym = 0; sym < nsyms; sym++) if (length[sym]) return 1; @@ -555,7 +555,7 @@ int LZXdecompress(UBYTE* inpos, int inlen, UBYTE* outpos, int outlen) { togo -= this_run; LZX(block_remaining) -= this_run; - /* apply 2^x-1 mask */ + /* apply 2^x-1 tqmask */ window_posn &= window_size - 1; /* runs can't straddle the window wraparound */ if ((window_posn + this_run) > window_size) diff --git a/parts/documentation/protocols/chm/kchmpart.cpp b/parts/documentation/protocols/chm/kchmpart.cpp index b1d9d166..7b91c7fc 100644 --- a/parts/documentation/protocols/chm/kchmpart.cpp +++ b/parts/documentation/protocols/chm/kchmpart.cpp @@ -35,8 +35,8 @@ extern "C" KInstance* KChmPartFactory::s_instance = 0L; KAboutData* KChmPartFactory::s_about = 0L; -KChmPartFactory::KChmPartFactory( TQObject* parent, const char* name ) - : KParts::Factory( parent, name ) +KChmPartFactory::KChmPartFactory( TQObject* tqparent, const char* name ) + : KParts::Factory( tqparent, name ) { } @@ -47,10 +47,10 @@ KChmPartFactory::~KChmPartFactory() delete s_about; } -KParts::Part* KChmPartFactory::createPartObject( TQWidget *parentWidget, const char *, TQObject *, +KParts::Part* KChmPartFactory::createPartObject( TQWidget *tqparentWidget, const char *, TQObject *, const char *name, const char *, const TQStringList & ) { - KChmPart* part = new KChmPart( parentWidget, name ); + KChmPart* part = new KChmPart( tqparentWidget, name ); return part; } @@ -66,7 +66,7 @@ KInstance* KChmPartFactory::instance() } -KChmPart::KChmPart( TQWidget * parent, const char * name ) +KChmPart::KChmPart( TQWidget * tqparent, const char * name ) : KDevHTMLPart( ), m_job(0) { KInstance * instance = new KInstance( "kchmpart" ); diff --git a/parts/documentation/protocols/chm/kchmpart.h b/parts/documentation/protocols/chm/kchmpart.h index 023f8ed9..37bb4695 100644 --- a/parts/documentation/protocols/chm/kchmpart.h +++ b/parts/documentation/protocols/chm/kchmpart.h @@ -33,13 +33,14 @@ class KAboutData; class KChmPartFactory: public KParts::Factory { Q_OBJECT + TQ_OBJECT public: - KChmPartFactory( TQObject *parent = 0, const char *name = 0 ); + KChmPartFactory( TQObject *tqparent = 0, const char *name = 0 ); virtual ~KChmPartFactory(); virtual KParts::Part* createPartObject( - TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, + TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name, const char *classname, const TQStringList &args ); static KInstance *instance(); @@ -54,6 +55,7 @@ class KChmPartFactory: public KParts::Factory class KChmPart : public KDevHTMLPart { Q_OBJECT + TQ_OBJECT public: KChmPart( TQWidget *, const char * = 0 ); KParts::BrowserExtension * extension() { return m_extension; } diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp index c7b2305a..a2d688ec 100644 --- a/parts/documentation/searchview.cpp +++ b/parts/documentation/searchview.cpp @@ -49,8 +49,8 @@ #include "documentation_part.h" #include "docutils.h" -SearchView::SearchView(DocumentationPart *part, TQWidget *parent, const char *name) - :TQWidget(parent, name), m_part(part) +SearchView::SearchView(DocumentationPart *part, TQWidget *tqparent, const char *name) + :TQWidget(tqparent, name), m_part(part) { TQVBoxLayout *l = new TQVBoxLayout(this, 0, KDialog::spacingHint()); @@ -182,11 +182,11 @@ void SearchView::search() d.mkdir(savedir); TQString query = TQString("words=%1;method=%2;matchesperpage=%3;format=%4;sort=%5") - .arg(m_edit->text()) - .arg(m_searchMethodBox->currentItem()==1? "or" : "and") - .arg(50) - .arg("builtin-short") - .arg(m_sortMethodBox->currentItem()==2? "date" : m_sortMethodBox->currentItem()==1? "title" : "score"); + .tqarg(m_edit->text()) + .tqarg(m_searchMethodBox->currentItem()==1? "or" : "and") + .tqarg(50) + .tqarg("builtin-short") + .tqarg(m_sortMethodBox->currentItem()==2? "date" : m_sortMethodBox->currentItem()==1? "title" : "score"); kdDebug(9002) << "starting kprocess" << endl; kdDebug(9002) << "htdig line:" << exe << " -c " << (indexdir + "/htdig.conf ") << query << endl; @@ -211,7 +211,7 @@ void SearchView::search() } // While receiving data from the subprocess, we want - // to block the user interface, but still get repaint + // to block the user interface, but still get tqrepaint // events. Hack taken from NetAccess... kapp->setOverrideCursor(waitCursor); TQWidget blocker(0, 0, WType_Dialog | WShowModal); @@ -230,8 +230,8 @@ void SearchView::search() delete proc; // modify the search result - searchResult = searchResult.replace(TQRegExp("http://localhost/"), "file:/"); - searchResult = searchResult.replace(TQRegExp("Content-type: text/html"), ""); + searchResult = searchResult.tqreplace(TQRegExp("http://localhost/"), "file:/"); + searchResult = searchResult.tqreplace(TQRegExp("Content-type: text/html"), ""); // dump the search result TQFile f(savedir + "/results.html"); @@ -268,7 +268,7 @@ void SearchView::analyseSearchResults() TQRegExp starsExp("alt=\"\\*\""); starsExp.setMinimal(true); - int stars = line.contains(starsExp); + int stars = line.tqcontains(starsExp); TQRegExp urlExp("<strong><a href=\"(.*)\">(.*)</a></strong>"); if (urlExp.search(line)==-1) diff --git a/parts/documentation/searchview.h b/parts/documentation/searchview.h index 98f11834..e1d9d106 100644 --- a/parts/documentation/searchview.h +++ b/parts/documentation/searchview.h @@ -30,11 +30,12 @@ class KPushButton; class KProcess; class TQListViewItem; -class SearchView: public QWidget +class SearchView: public TQWidget { Q_OBJECT + TQ_OBJECT public: - SearchView(DocumentationPart *part, TQWidget *parent = 0, const char *name = 0); + SearchView(DocumentationPart *part, TQWidget *tqparent = 0, const char *name = 0); ~SearchView(); public slots: diff --git a/parts/documentation/selecttopic.cpp b/parts/documentation/selecttopic.cpp index 4dab4d83..ef35a2a1 100644 --- a/parts/documentation/selecttopic.cpp +++ b/parts/documentation/selecttopic.cpp @@ -19,8 +19,8 @@ ***************************************************************************/ #include "selecttopic.h" -SelectTopic::SelectTopic(IndexItem::List &urls, TQWidget *parent, const char *name) - :SelectTopicBase(parent, name), m_urls(urls) +SelectTopic::SelectTopic(IndexItem::List &urls, TQWidget *tqparent, const char *name) + :SelectTopicBase(tqparent, name), m_urls(urls) { for (IndexItem::List::const_iterator it = m_urls.begin(); it != m_urls.end(); ++it) topicBox->insertItem((*it).first); diff --git a/parts/documentation/selecttopic.h b/parts/documentation/selecttopic.h index fdddbf4c..e90f893c 100644 --- a/parts/documentation/selecttopic.h +++ b/parts/documentation/selecttopic.h @@ -26,8 +26,9 @@ class SelectTopic: public SelectTopicBase{ Q_OBJECT + TQ_OBJECT public: - SelectTopic(IndexItem::List &urls, TQWidget *parent = 0, const char *name = 0); + SelectTopic(IndexItem::List &urls, TQWidget *tqparent = 0, const char *name = 0); KURL selectedURL(); public slots: diff --git a/parts/documentation/selecttopicbase.ui b/parts/documentation/selecttopicbase.ui index b363be2a..1d04e0a2 100644 --- a/parts/documentation/selecttopicbase.ui +++ b/parts/documentation/selecttopicbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>SelectTopicBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>SelectTopicBase</cstring> </property> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -46,14 +46,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -70,7 +70,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -86,7 +86,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>topicLabel</cstring> </property> @@ -97,7 +97,7 @@ <cstring>listBox1</cstring> </property> </widget> - <widget class="QListBox" row="1" column="0"> + <widget class="TQListBox" row="1" column="0"> <property name="name"> <cstring>topicBox</cstring> </property> @@ -135,8 +135,8 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>newSlot()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp index 63e21888..d0146d0e 100644 --- a/parts/documentation/tools/htdig/htdigindex.cpp +++ b/parts/documentation/tools/htdig/htdigindex.cpp @@ -39,9 +39,9 @@ #define INDEXER -ProgressDialog::ProgressDialog(bool index, TQWidget *parent, const char *name) +ProgressDialog::ProgressDialog(bool index, TQWidget *tqparent, const char *name) :KDialogBase(KDialogBase::Plain, i18n("Generating Search Index"), Cancel | Ok, Close, - parent, name, false) + tqparent, name, false) { proc = 0; @@ -122,7 +122,7 @@ void ProgressDialog::done(int r) void ProgressDialog::setFilesScanned(int n) { - filesLabel->setText(i18n("Files processed: %1").arg(n)); + filesLabel->setText(i18n("Files processed: %1").tqarg(n)); } void ProgressDialog::setFilesToDig(int n) @@ -162,7 +162,7 @@ void ProgressDialog::addDir(const TQString &dir) setFilesScanned(++filesScanned); } - TQDir d2(dir, TQString::null, TQDir::Name|TQDir::IgnoreCase, TQDir::Dirs); + TQDir d2(dir, TQString(), TQDir::Name|TQDir::IgnoreCase, TQDir::Dirs); TQStringList dlist = d2.entryList(); for ( it=dlist.begin(); it != dlist.end(); ++it ) @@ -214,7 +214,7 @@ bool ProgressDialog::createConfig() if (language == "C") language = "en"; - TQString wrapper = locate("data", TQString("kdevdocumentation/%1/wrapper.html").arg(language)); + TQString wrapper = locate("data", TQString("kdevdocumentation/%1/wrapper.html").tqarg(language)); if (wrapper.isEmpty()) wrapper = locate("data", TQString("kdevdocumentation/en/wrapper.html")); if (wrapper.isEmpty()) @@ -323,12 +323,12 @@ void ProgressDialog::htdigStdout(KProcess *, char *buffer, int len) TQString line = TQString(buffer).left(len); int cnt=0, index=-1; - while ( (index = line.find("http://", index+1)) > 0) + while ( (index = line.tqfind("http://", index+1)) > 0) cnt++; filesDigged += cnt; cnt=0, index=-1; - while ( (index = line.find("not changed", index+1)) > 0) + while ( (index = line.tqfind("not changed", index+1)) > 0) cnt++; filesDigged -= cnt; diff --git a/parts/documentation/tools/htdig/htdigindex.h b/parts/documentation/tools/htdig/htdigindex.h index 3383b2df..06746ad5 100644 --- a/parts/documentation/tools/htdig/htdigindex.h +++ b/parts/documentation/tools/htdig/htdigindex.h @@ -25,8 +25,9 @@ class KProgress; class ProgressDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ProgressDialog(bool index, TQWidget *parent=0, const char *name=0); + ProgressDialog(bool index, TQWidget *tqparent=0, const char *name=0); ~ProgressDialog(); void addDir(const TQString &dir); |