summaryrefslogtreecommitdiffstats
path: root/parts/ctags2
diff options
context:
space:
mode:
Diffstat (limited to 'parts/ctags2')
-rw-r--r--parts/ctags2/ctags2_createtagfile.cpp4
-rw-r--r--parts/ctags2/ctags2_createtagfile.h3
-rw-r--r--parts/ctags2/ctags2_createtagfilebase.ui24
-rw-r--r--parts/ctags2/ctags2_part.cpp14
-rw-r--r--parts/ctags2/ctags2_part.h3
-rw-r--r--parts/ctags2/ctags2_selecttagfile.cpp4
-rw-r--r--parts/ctags2/ctags2_selecttagfile.h3
-rw-r--r--parts/ctags2/ctags2_selecttagfilebase.ui22
-rw-r--r--parts/ctags2/ctags2_settingswidget.cpp6
-rw-r--r--parts/ctags2/ctags2_settingswidget.h9
-rw-r--r--parts/ctags2/ctags2_settingswidgetbase.ui54
-rw-r--r--parts/ctags2/ctags2_widget.cpp8
-rw-r--r--parts/ctags2/ctags2_widget.h1
-rw-r--r--parts/ctags2/ctags2_widgetbase.ui22
-rw-r--r--parts/ctags2/ctagskinds.cpp4
-rw-r--r--parts/ctags2/readtags.c4
-rw-r--r--parts/ctags2/tagitem.h2
-rw-r--r--parts/ctags2/tags.cpp2
-rw-r--r--parts/ctags2/tags.h2
19 files changed, 98 insertions, 93 deletions
diff --git a/parts/ctags2/ctags2_createtagfile.cpp b/parts/ctags2/ctags2_createtagfile.cpp
index e066a136..ab9febc4 100644
--- a/parts/ctags2/ctags2_createtagfile.cpp
+++ b/parts/ctags2/ctags2_createtagfile.cpp
@@ -16,8 +16,8 @@
#include "ctags2_part.h"
-CreateTagFile::CreateTagFile(TQWidget* parent, const char* name, bool modal, WFlags fl)
-: CTags2CreateTagFileBase( parent, name, modal, fl )
+CreateTagFile::CreateTagFile(TQWidget* tqparent, const char* name, bool modal, WFlags fl)
+: CTags2CreateTagFileBase( tqparent, name, modal, fl )
{
dirToTag->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly);
newTagFilePath->setMode( KFile::File | KFile::LocalOnly );
diff --git a/parts/ctags2/ctags2_createtagfile.h b/parts/ctags2/ctags2_createtagfile.h
index 068c1815..61cc6448 100644
--- a/parts/ctags2/ctags2_createtagfile.h
+++ b/parts/ctags2/ctags2_createtagfile.h
@@ -19,9 +19,10 @@
class CreateTagFile : public CTags2CreateTagFileBase {
Q_OBJECT
+ TQ_OBJECT
public:
- CreateTagFile(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+ CreateTagFile(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
~CreateTagFile();
TQString name();
TQString tagsfilePath();
diff --git a/parts/ctags2/ctags2_createtagfilebase.ui b/parts/ctags2/ctags2_createtagfilebase.ui
index bf4469f3..ae3bcea4 100644
--- a/parts/ctags2/ctags2_createtagfilebase.ui
+++ b/parts/ctags2/ctags2_createtagfilebase.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>CTags2CreateTagFileBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
<property name="name">
<cstring>CTags2CreateTagFileBase</cstring>
</property>
@@ -19,7 +19,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel3</cstring>
</property>
@@ -32,7 +32,7 @@
<cstring>displayName</cstring>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1_3</cstring>
</property>
@@ -45,7 +45,7 @@
<cstring>newTagFilePath</cstring>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel2_2</cstring>
</property>
@@ -58,9 +58,9 @@
<cstring>dirToTag</cstring>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout6</cstring>
+ <cstring>tqlayout6</cstring>
</property>
<hbox>
<property name="name">
@@ -76,14 +76,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>81</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>createTagFileButton</cstring>
</property>
@@ -91,7 +91,7 @@
<string>&amp;Create</string>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>cancelButton</cstring>
</property>
@@ -135,11 +135,11 @@
<slot>validate()</slot>
</connection>
</connections>
-<slots>
+<Q_SLOTS>
<slot>createTagFile()</slot>
<slot>validate()</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/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp
index b05a12a4..60fe4ca5 100644
--- a/parts/ctags2/ctags2_part.cpp
+++ b/parts/ctags2/ctags2_part.cpp
@@ -58,8 +58,8 @@ typedef KDevGenericFactory<CTags2Part> CTags2Factory;
static const KDevPluginInfo data("kdevctags2");
K_EXPORT_COMPONENT_FACTORY( libkdevctags2, CTags2Factory( data ) )
-CTags2Part::CTags2Part(TQObject *parent, const char *name, const TQStringList& )
- : KDevPlugin(&data, parent, name ? name : "ctags2Part" )
+CTags2Part::CTags2Part(TQObject *tqparent, const char *name, const TQStringList& )
+ : KDevPlugin(&data, tqparent, name ? name : "ctags2Part" )
{
setInstance(CTags2Factory::instance());
setXMLFile("kdevpart_ctags2.rc");
@@ -194,13 +194,13 @@ void CTags2Part::contextMenu(TQPopupMenu *popup, const Context *context)
popup->insertSeparator();
if ( showDeclaration )
- popup->insertItem( i18n("CTags - Go to Declaration: %1").arg(squeezed), this, TQT_SLOT(slotGotoDeclaration()) );
+ popup->insertItem( i18n("CTags - Go to Declaration: %1").tqarg(squeezed), this, TQT_SLOT(slotGotoDeclaration()) );
if ( showDefinition )
- popup->insertItem( i18n("CTags - Go to Definition: %1").arg(squeezed), this, TQT_SLOT(slotGotoDefinition()) );
+ popup->insertItem( i18n("CTags - Go to Definition: %1").tqarg(squeezed), this, TQT_SLOT(slotGotoDefinition()) );
if ( showLookup )
- popup->insertItem( i18n("CTags - Lookup: %1").arg(squeezed), this, TQT_SLOT(slotGotoTag()) );
+ popup->insertItem( i18n("CTags - Lookup: %1").tqarg(squeezed), this, TQT_SLOT(slotGotoTag()) );
}
}
@@ -268,9 +268,9 @@ int CTags2Part::getFileLineFromStream( TQTextStream & istream, TQString const &
{
if ( pattern.isEmpty() ) return -1;
- // ctags interestingly escapes "/", but apparently nothing else. lets revert that
+ // ctags interestingly escapes "/", but aptqparently nothing else. lets revert that
TQString unescaped = pattern;
- unescaped.replace( "\\/", "/" );
+ unescaped.tqreplace( "\\/", "/" );
// most of the time, the ctags pattern has the form /^foo$/
// but this isn't true for some macro definitions
diff --git a/parts/ctags2/ctags2_part.h b/parts/ctags2/ctags2_part.h
index 05a53c41..648c6ded 100644
--- a/parts/ctags2/ctags2_part.h
+++ b/parts/ctags2/ctags2_part.h
@@ -29,10 +29,11 @@ class KDialogBase;
class CTags2Part : public KDevPlugin
{
Q_OBJECT
+ TQ_OBJECT
public:
- CTags2Part(TQObject *parent, const char *name, const TQStringList &);
+ CTags2Part(TQObject *tqparent, const char *name, const TQStringList &);
~CTags2Part();
int getFileLineFromPattern( KURL const & url, TQString const & pattern);
diff --git a/parts/ctags2/ctags2_selecttagfile.cpp b/parts/ctags2/ctags2_selecttagfile.cpp
index c1a8d617..38227d1d 100644
--- a/parts/ctags2/ctags2_selecttagfile.cpp
+++ b/parts/ctags2/ctags2_selecttagfile.cpp
@@ -15,8 +15,8 @@
#include "ctags2_selecttagfile.h"
-SelectTagFile::SelectTagFile( TQWidget* parent, const char* name, bool modal, WFlags fl)
-: SelectTagFileBase( parent, name, modal, fl )
+SelectTagFile::SelectTagFile( TQWidget* tqparent, const char* name, bool modal, WFlags fl)
+: SelectTagFileBase( tqparent, name, modal, fl )
{
tagFile->setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly );
okButton->setEnabled( false );
diff --git a/parts/ctags2/ctags2_selecttagfile.h b/parts/ctags2/ctags2_selecttagfile.h
index d4f4f5f9..a069743e 100644
--- a/parts/ctags2/ctags2_selecttagfile.h
+++ b/parts/ctags2/ctags2_selecttagfile.h
@@ -16,9 +16,10 @@
class SelectTagFile : public SelectTagFileBase {
Q_OBJECT
+ TQ_OBJECT
public:
- SelectTagFile( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+ SelectTagFile( TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
~SelectTagFile();
TQString name();
TQString tagsfilePath();
diff --git a/parts/ctags2/ctags2_selecttagfilebase.ui b/parts/ctags2/ctags2_selecttagfilebase.ui
index cddd5f26..db02f864 100644
--- a/parts/ctags2/ctags2_selecttagfilebase.ui
+++ b/parts/ctags2/ctags2_selecttagfilebase.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>SelectTagFileBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
<property name="name">
<cstring>SelectTagFileBase</cstring>
</property>
@@ -19,7 +19,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -32,7 +32,7 @@
<cstring>displayName</cstring>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@@ -45,9 +45,9 @@
<cstring>tagFile</cstring>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout4</cstring>
+ <cstring>tqlayout4</cstring>
</property>
<hbox>
<property name="name">
@@ -63,14 +63,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>101</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>okButton</cstring>
</property>
@@ -78,7 +78,7 @@
<string>O&amp;K</string>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>cancelButton</cstring>
</property>
@@ -116,10 +116,10 @@
<slot>validate()</slot>
</connection>
</connections>
-<slots>
+<Q_SLOTS>
<slot>validate()</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/ctags2/ctags2_settingswidget.cpp b/parts/ctags2/ctags2_settingswidget.cpp
index d7458a85..ea607eb6 100644
--- a/parts/ctags2/ctags2_settingswidget.cpp
+++ b/parts/ctags2/ctags2_settingswidget.cpp
@@ -30,8 +30,8 @@
#include "ctags2_createtagfile.h"
-CTags2SettingsWidget::CTags2SettingsWidget( CTags2Part * part, TQWidget* parent, const char* name, WFlags fl )
- : CTags2SettingsWidgetBase( parent, name, fl ), m_part( part )
+CTags2SettingsWidget::CTags2SettingsWidget( CTags2Part * part, TQWidget* tqparent, const char* name, WFlags fl )
+ : CTags2SettingsWidgetBase( tqparent, name, fl ), m_part( part )
{
binaryPath->completionObject()->setMode( KURLCompletion::FileCompletion );
binaryPath->setMode( KFile::File | KFile::LocalOnly );
@@ -91,7 +91,7 @@ void CTags2SettingsWidget::loadSettings()
while ( it != entryMap.end() )
{
TQString file = config->readPathEntry( it.key() );
- new TagsItem( otherTagFiles, it.key(), file, activeTagsFiles.contains( file ) );
+ new TagsItem( otherTagFiles, it.key(), file, activeTagsFiles.tqcontains( file ) );
++it;
}
}
diff --git a/parts/ctags2/ctags2_settingswidget.h b/parts/ctags2/ctags2_settingswidget.h
index 5a9d5c71..1ee3ede0 100644
--- a/parts/ctags2/ctags2_settingswidget.h
+++ b/parts/ctags2/ctags2_settingswidget.h
@@ -18,11 +18,11 @@
class CTags2Part;
-class TagsItem : public QCheckListItem
+class TagsItem : public TQCheckListItem
{
public:
- TagsItem( TQListView * parent, TQString name, TQString tagsfilePath, bool active )
- : TQCheckListItem( parent, name, TQCheckListItem::CheckBox ), m_name( name ), m_tagsfilePath( tagsfilePath )
+ TagsItem( TQListView * tqparent, TQString name, TQString tagsfilePath, bool active )
+ : TQCheckListItem( tqparent, name, TQCheckListItem::CheckBox ), m_name( name ), m_tagsfilePath( tagsfilePath )
{
setOn( active );
setText( 1, tagsfilePath );
@@ -40,9 +40,10 @@ private:
class CTags2SettingsWidget : public CTags2SettingsWidgetBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- CTags2SettingsWidget( CTags2Part * part, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+ CTags2SettingsWidget( CTags2Part * part, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
~CTags2SettingsWidget();
signals:
diff --git a/parts/ctags2/ctags2_settingswidgetbase.ui b/parts/ctags2/ctags2_settingswidgetbase.ui
index 27898206..2ea6e4aa 100644
--- a/parts/ctags2/ctags2_settingswidgetbase.ui
+++ b/parts/ctags2/ctags2_settingswidgetbase.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>CTags2SettingsWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>CTags2SettingsWidgetBase</cstring>
</property>
@@ -16,11 +16,11 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QTabWidget">
+ <widget class="TQTabWidget">
<property name="name">
<cstring>tabWidget8</cstring>
</property>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab</cstring>
</property>
@@ -31,7 +31,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>groupBox1</cstring>
</property>
@@ -50,7 +50,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>showDeclarationBox</cstring>
</property>
@@ -61,7 +61,7 @@
<string>If checked, an option to go directly to the matching tag declaration will be shown. If more than one match, all matches will be shown in the main ctags result view.</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>showDefinitionBox</cstring>
</property>
@@ -72,7 +72,7 @@
<string>If checked, an option to go directly to the matching tag definition will be shown. If more than one match, all matches will be shown in the main ctags result view.</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>showLookupBox</cstring>
</property>
@@ -85,7 +85,7 @@
</widget>
</vbox>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>groupBox3_2</cstring>
</property>
@@ -104,7 +104,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>jumpToFirstBox</cstring>
</property>
@@ -115,7 +115,7 @@
<string>If more than one hit was produced from an attempt to find an exact match, go to the first match in the list. Note: the &lt;i&gt;Go To Next Match&lt;/i&gt; shortcut can be used to step between the matches.</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>tagfileCustomBox</cstring>
</property>
@@ -142,7 +142,7 @@
</widget>
</vbox>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>groupBox3</cstring>
</property>
@@ -164,7 +164,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -192,7 +192,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>31</height>
@@ -201,7 +201,7 @@
</spacer>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab</cstring>
</property>
@@ -212,15 +212,15 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
+ <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>layout15</cstring>
+ <cstring>tqlayout15</cstring>
</property>
<grid>
<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>textLabel2</cstring>
</property>
@@ -238,7 +238,7 @@
</widget>
</grid>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel1_2</cstring>
</property>
@@ -246,15 +246,15 @@
<string>Other tag files:</string>
</property>
</widget>
- <widget class="QLayoutWidget" row="2" column="1">
+ <widget class="TQLayoutWidget" row="2" column="1">
<property name="name">
- <cstring>layout21</cstring>
+ <cstring>tqlayout21</cstring>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QPushButton" row="0" column="0">
+ <widget class="TQPushButton" row="0" column="0">
<property name="name">
<cstring>createButton</cstring>
</property>
@@ -262,7 +262,7 @@
<string>&amp;Create...</string>
</property>
</widget>
- <widget class="QPushButton" row="1" column="0">
+ <widget class="TQPushButton" row="1" column="0">
<property name="name">
<cstring>addButton</cstring>
</property>
@@ -270,7 +270,7 @@
<string>&amp;Add...</string>
</property>
</widget>
- <widget class="QPushButton" row="2" column="0">
+ <widget class="TQPushButton" row="2" column="0">
<property name="name">
<cstring>removeButton</cstring>
</property>
@@ -290,7 +290,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>61</height>
@@ -361,14 +361,14 @@
<slot>clear()</slot>
</connection>
</connections>
-<slots>
+<Q_SLOTS>
<slot>createNewTagSlot()</slot>
<slot>addNewTagFile()</slot>
<slot>removeTagFile()</slot>
<slot>moveUpTagFile()</slot>
<slot>moveDownTagFile()</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/ctags2/ctags2_widget.cpp b/parts/ctags2/ctags2_widget.cpp
index ab277966..f6fec985 100644
--- a/parts/ctags2/ctags2_widget.cpp
+++ b/parts/ctags2/ctags2_widget.cpp
@@ -28,7 +28,7 @@
#include "ctags2_widget.h"
#include "tags.h"
-class TagItem : public QListViewItem
+class TagItem : public TQListViewItem
{
public:
TagItem(TQListView * lv, TQString const & tag, TQString const & type, TQString const & file, TQString const & pattern );
@@ -104,7 +104,7 @@ void CTags2Widget::line_edit_changed_delayed( )
void CTags2Widget::showHitCount( int n )
{
- hitcount_label->setText( i18n("Hits: %1").arg( n ) );
+ hitcount_label->setText( i18n("Hits: %1").tqarg( n ) );
}
int CTags2Widget::calculateHitCount( )
@@ -133,7 +133,7 @@ void CTags2Widget::itemExecuted( TQListViewItem * item )
void CTags2Widget::regeneratebutton_clicked()
{
- TQApplication::setOverrideCursor(Qt::waitCursor);
+ TQApplication::setOverrideCursor(TQt::waitCursor);
_part->createTagsFile();
@@ -174,7 +174,7 @@ void CTags2Widget::goToNext( )
if ( (item = item->nextSibling()) != NULL )
{
item->setSelected( true );
- output_view->repaint( true );
+ output_view->tqrepaint( true );
itemExecuted( item );
return;
}
diff --git a/parts/ctags2/ctags2_widget.h b/parts/ctags2/ctags2_widget.h
index 8b3bb4f4..f86197c0 100644
--- a/parts/ctags2/ctags2_widget.h
+++ b/parts/ctags2/ctags2_widget.h
@@ -22,6 +22,7 @@ class TQListViewItem;
class CTags2Widget : public CTags2WidgetBase
{
Q_OBJECT
+ TQ_OBJECT
public:
CTags2Widget( CTags2Part * part, const char* name = 0, WFlags fl = 0 );
diff --git a/parts/ctags2/ctags2_widgetbase.ui b/parts/ctags2/ctags2_widgetbase.ui
index ef564767..801a9c3d 100644
--- a/parts/ctags2/ctags2_widgetbase.ui
+++ b/parts/ctags2/ctags2_widgetbase.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>CTags2WidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>CTags2WidgetBase</cstring>
</property>
@@ -69,15 +69,15 @@
<string>Result view for a tag lookup. Click a line to go to the corresponding place in the code.</string>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -93,7 +93,7 @@
<string>Type the identifier you want to lookup. &lt;p&gt; The identifier will populate and display a reducing list as you type.</string>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>hitcount_label</cstring>
</property>
@@ -111,14 +111,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>80</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>datetime_label</cstring>
</property>
@@ -126,7 +126,7 @@
<string>Date:</string>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>generate_button</cstring>
</property>
@@ -168,12 +168,12 @@
<tabstop>input_edit</tabstop>
<tabstop>output_view</tabstop>
</tabstops>
-<slots>
+<Q_SLOTS>
<slot access="private">line_edit_changed_delayed()</slot>
<slot access="private">line_edit_changed()</slot>
<slot access="private">regeneratebutton_clicked()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/parts/ctags2/ctagskinds.cpp b/parts/ctags2/ctagskinds.cpp
index e198c577..012db208 100644
--- a/parts/ctags2/ctagskinds.cpp
+++ b/parts/ctags2/ctagskinds.cpp
@@ -290,7 +290,7 @@ static CTagsKindMapping *findKindMapping(const TQString &extension)
TQString CTagsKinds::findKind( const char * kindChar, const TQString &extension )
{
- if ( kindChar == 0 ) return TQString::null;
+ if ( kindChar == 0 ) return TQString();
CTagsKindMapping *kindMapping = findKindMapping(extension);
if (kindMapping) {
@@ -302,5 +302,5 @@ TQString CTagsKinds::findKind( const char * kindChar, const TQString &extension
}
}
- return TQString::null;
+ return TQString();
}
diff --git a/parts/ctags2/readtags.c b/parts/ctags2/readtags.c
index 38014d3f..dce0a2e8 100644
--- a/parts/ctags2/readtags.c
+++ b/parts/ctags2/readtags.c
@@ -649,7 +649,7 @@ static tagResult findSequential (tagFile *const file)
return result;
}
-static tagResult find (tagFile *const file, tagEntry *const entry,
+static tagResult tqfind (tagFile *const file, tagEntry *const entry,
const char *const name, const int options)
{
tagResult result = TagFailure;
@@ -758,7 +758,7 @@ extern tagResult tagsFind (tagFile *const file, tagEntry *const entry,
{
tagResult result = TagFailure;
if (file != NULL && file->initialized)
- result = find (file, entry, name, options);
+ result = tqfind (file, entry, name, options);
return result;
}
diff --git a/parts/ctags2/tagitem.h b/parts/ctags2/tagitem.h
index 19bc0a59..7108fcb9 100644
--- a/parts/ctags2/tagitem.h
+++ b/parts/ctags2/tagitem.h
@@ -14,7 +14,7 @@
#include <tqlistview.h>
-class TagItem : public QListViewItem
+class TagItem : public TQListViewItem
{
public:
TagItem(TQListView * lv, TQString const & tag, TQString const & type, TQString const & file, TQString const & pattern );
diff --git a/parts/ctags2/tags.cpp b/parts/ctags2/tags.cpp
index 19993823..8b83c701 100644
--- a/parts/ctags2/tags.cpp
+++ b/parts/ctags2/tags.cpp
@@ -123,7 +123,7 @@ Tags::TagList Tags::getMatches(const char* tagFile, const TQString & tagpart, bo
{
type = "macro";
}
- if ( types.isEmpty() || types.contains( entry.kind ) )
+ if ( types.isEmpty() || types.tqcontains( entry.kind ) )
{
list << TagEntry( TQString( entry.name ), type, file, TQString( entry.address.pattern ) );
}
diff --git a/parts/ctags2/tags.h b/parts/ctags2/tags.h
index 22b7e7ea..d289d9d6 100644
--- a/parts/ctags2/tags.h
+++ b/parts/ctags2/tags.h
@@ -45,7 +45,7 @@ public:
/**
* Method to check if the tag database contains a specific tag
* @param tag Tag to look up
- * @return returns true if tag database contains 'tag'
+ * @return returns true if tag database tqcontains 'tag'
*/
static bool hasTag( const TQString & tag );