diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-12 01:36:19 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-12 01:36:19 +0000 |
| commit | 99a2774ca6f1cab334de5d43fe36fc44ae889a4c (patch) | |
| tree | eff34cf0762227f6baf2a93e8fef48d4bed2651c /kbabel/kbabel | |
| parent | 1c104292188541106338d4940b0f04beeb4301a0 (diff) | |
| download | tdesdk-99a2774ca6f1cab334de5d43fe36fc44ae889a4c.tar.gz tdesdk-99a2774ca6f1cab334de5d43fe36fc44ae889a4c.zip | |
TQt4 convert kdesdk
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1236185 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kbabel/kbabel')
56 files changed, 602 insertions, 581 deletions
diff --git a/kbabel/kbabel/charselectview.cpp b/kbabel/kbabel/charselectview.cpp index 2e58b084..f174c3ed 100644 --- a/kbabel/kbabel/charselectview.cpp +++ b/kbabel/kbabel/charselectview.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -49,17 +49,17 @@ using namespace KBabel; -CharacterSelectorView::CharacterSelectorView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project) - : KBCatalogView(catalog,parent,project) +CharacterSelectorView::CharacterSelectorView(KBCatalog* catalog,TQWidget *tqparent, Project::Ptr project) + : KBCatalogView(catalog,tqparent,project) { - TQVBoxLayout* layout = new TQVBoxLayout( this ); - layout->setResizeMode( TQLayout::Minimum ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + tqlayout->setResizeMode( TQLayout::Minimum ); - layout->setSpacing( KDialog::spacingHint() ); + tqlayout->setSpacing( KDialog::spacingHint() ); TQHBox* bar = new TQHBox(this); bar->setSpacing( KDialog::spacingHint() ); - layout->addWidget (bar); + tqlayout->addWidget (bar); TQLabel *lTable = new TQLabel( i18n( "Table:" ), bar ); _tableNum = new TQSpinBox( 0, 255, 1, bar ); @@ -72,7 +72,7 @@ CharacterSelectorView::CharacterSelectorView(KBCatalog* catalog,TQWidget *parent _table->setNumRows(16); scroll->addChild(_table); - layout->addWidget (scroll); + tqlayout->addWidget (scroll); connect( _table, TQT_SIGNAL( doubleClicked() ), this, TQT_SLOT( emitChar() ) ); connect( _tableNum, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( setTab(int) )); diff --git a/kbabel/kbabel/charselectview.h b/kbabel/kbabel/charselectview.h index 160b5295..4d0ee3a6 100644 --- a/kbabel/kbabel/charselectview.h +++ b/kbabel/kbabel/charselectview.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -41,11 +41,12 @@ class TQSpinBox; class CharacterSelectorView : public KBCatalogView { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - CharacterSelectorView(KBCatalog* catalog,TQWidget *parent, KBabel::Project::Ptr project); + CharacterSelectorView(KBCatalog* catalog,TQWidget *tqparent, KBabel::Project::Ptr project); void saveSettings(KConfig* config); void restoreSettings(KConfig* config); diff --git a/kbabel/kbabel/colorpreferences.ui b/kbabel/kbabel/colorpreferences.ui index 97e89df6..73f6b8d9 100644 --- a/kbabel/kbabel/colorpreferences.ui +++ b/kbabel/kbabel/colorpreferences.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ColorPreferences</class> <author>Stanislav Visnovsky</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ColorPreferences</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -33,7 +33,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -44,7 +44,7 @@ <cstring>kcfg_BackgroundColor</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -55,7 +55,7 @@ <cstring>kcfg_QuotedColor</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -74,7 +74,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>label</cstring> </property> @@ -97,7 +97,7 @@ phrases.</qt></string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -124,7 +124,7 @@ phrases.</qt></string> <string></string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -143,7 +143,7 @@ phrases.</qt></string> <string></string> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -164,7 +164,7 @@ phrases.</qt></string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>50</height> @@ -175,7 +175,7 @@ phrases.</qt></string> </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/kbabel/kbabel/commentview.cpp b/kbabel/kbabel/commentview.cpp index 57d838b9..7126f422 100644 --- a/kbabel/kbabel/commentview.cpp +++ b/kbabel/kbabel/commentview.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -62,12 +62,12 @@ using namespace KBabel; -CommentView::CommentView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project) - : KBCatalogView(catalog,parent, project) +CommentView::CommentView(KBCatalog* catalog,TQWidget *tqparent, Project::Ptr project) + : KBCatalogView(catalog,tqparent, project) { setAcceptDrops(true); - TQVBoxLayout* layout=new TQVBoxLayout(this); + TQVBoxLayout* tqlayout=new TQVBoxLayout(this); commentEdit = new MsgMultiLineEdit(0, 0, this); commentEdit->setMinimumHeight(50); @@ -77,12 +77,12 @@ CommentView::CommentView(KBCatalog* catalog,TQWidget *parent, Project::Ptr proje TQLabel* label=new TQLabel(commentEdit,i18n("&Comment:"),this); - TQHBoxLayout* hb=new TQHBoxLayout(layout); + TQHBoxLayout* hb=new TQHBoxLayout(tqlayout); hb->addSpacing(KDialog::marginHint()); hb->addWidget(label); - layout->addWidget(commentEdit); - layout->setStretchFactor(commentEdit,1); + tqlayout->addWidget(commentEdit); + tqlayout->setStretchFactor(commentEdit,1); TQWhatsThis::add(this, i18n("<qt><p><b>Comment Editor</b></p>\n\ diff --git a/kbabel/kbabel/commentview.h b/kbabel/kbabel/commentview.h index 8dcce18d..f00d1241 100644 --- a/kbabel/kbabel/commentview.h +++ b/kbabel/kbabel/commentview.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -47,11 +47,12 @@ class MsgMultiLineEdit; class CommentView : public KBCatalogView { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - CommentView(KBCatalog* catalog,TQWidget *parent, KBabel::Project::Ptr project); + CommentView(KBCatalog* catalog,TQWidget *tqparent, KBabel::Project::Ptr project); /** * this is called from the catalog when updating his views. diff --git a/kbabel/kbabel/contextview.cpp b/kbabel/kbabel/contextview.cpp index 264d4e84..72303fef 100644 --- a/kbabel/kbabel/contextview.cpp +++ b/kbabel/kbabel/contextview.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -47,17 +47,17 @@ using namespace KBabel; -ContextView::ContextView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project) - : KBCatalogView(catalog,parent,project) +ContextView::ContextView(KBCatalog* catalog,TQWidget *tqparent, Project::Ptr project) + : KBCatalogView(catalog,tqparent,project) { - TQVBoxLayout* layout = new TQVBoxLayout( this ); - layout->setResizeMode( TQLayout::Minimum ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + tqlayout->setResizeMode( TQLayout::Minimum ); _textview = new TQTextView (this, "context textview"); KCursor::setAutoHideCursor(_textview->viewport(),true); _textview->setReadOnly(true); - layout->addWidget (_textview); + tqlayout->addWidget (_textview); TQWhatsThis::add(this, i18n("<qt><p><b>PO Context</b></p>" @@ -92,7 +92,7 @@ void ContextView::updateView() startIndex = _currentIndex-context; } - for(uint i=startIndex; i < QMIN(startIndex+(2*context+1), total); i++) + for(uint i=startIndex; i < TQMIN(startIndex+(2*context+1), total); i++) { if(i == _currentIndex) { @@ -106,15 +106,15 @@ void ContextView::updateView() if(!temp.isEmpty()) { temp = TQStyleSheet::convertFromPlainText(temp); - temp.replace(TQRegExp("^<p>"),""); - temp.replace(TQRegExp("</p>$"),""); + temp.tqreplace(TQRegExp("^<p>"),""); + temp.tqreplace(TQRegExp("</p>$"),""); entry += "<i>"+temp+"</i><br/>"; } // FIXME: should care about plural forms temp = TQStyleSheet::convertFromPlainText(_catalog->msgid(i).first()); - temp.replace(TQRegExp("^<p>"),""); - temp.replace(TQRegExp("</p>$"),""); + temp.tqreplace(TQRegExp("^<p>"),""); + temp.tqreplace(TQRegExp("</p>$"),""); entry += temp + "<br/>---<br/>"; TQStringList tempList = _catalog->msgstr(i); @@ -137,12 +137,12 @@ void ContextView::updateView() temp = ""; for( TQStringList::Iterator i=tempList.begin() ; i != tempList.end() ; ++i) { - temp += i18n("Plural %1: %2\n").arg(counter++).arg(*i); + temp += i18n("Plural %1: %2\n").tqarg(counter++).tqarg(*i); } } temp = TQStyleSheet::convertFromPlainText(temp); - temp.replace(TQRegExp("^<p>"),""); - temp.replace(TQRegExp("</p>$"),""); + temp.tqreplace(TQRegExp("^<p>"),""); + temp.tqreplace(TQRegExp("</p>$"),""); entry += temp+"<br/>"; } diff --git a/kbabel/kbabel/contextview.h b/kbabel/kbabel/contextview.h index 72faa160..9f0b2405 100644 --- a/kbabel/kbabel/contextview.h +++ b/kbabel/kbabel/contextview.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -40,11 +40,12 @@ class TQTextView; class ContextView : public KBCatalogView { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - ContextView(KBCatalog* catalog,TQWidget *parent, KBabel::Project::Ptr project); + ContextView(KBCatalog* catalog,TQWidget *tqparent, KBabel::Project::Ptr project); public slots: virtual void updateView(); diff --git a/kbabel/kbabel/editordiffpreferences.ui b/kbabel/kbabel/editordiffpreferences.ui index db21bc8e..14e9c44c 100644 --- a/kbabel/kbabel/editordiffpreferences.ui +++ b/kbabel/kbabel/editordiffpreferences.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>EditorDiffPreferences</class> <author>Stanislav Visnovsky</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>EditorDiffPreferences</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -17,7 +17,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -28,7 +28,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>textLabel2</cstring> </property> @@ -36,7 +36,7 @@ <string>Added Characters</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -47,7 +47,7 @@ <cstring>kcfg_DiffAddUnderline</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -58,7 +58,7 @@ <cstring>kcfg_DiffAddColor</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -66,7 +66,7 @@ <string>Removed Characters</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -77,7 +77,7 @@ <cstring>kcfg_DiffDelStrikeOut</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -88,7 +88,7 @@ <cstring>kcfg_DiffDelColor</cstring> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <item> <property name="text"> <string>Highlighted</string> @@ -118,7 +118,7 @@ </color> </property> </widget> - <widget class="QComboBox" row="4" column="1"> + <widget class="TQComboBox" row="4" column="1"> <item> <property name="text"> <string>Highlighted</string> @@ -150,9 +150,9 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -170,7 +170,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>31</height> @@ -184,7 +184,7 @@ <functions> <function>init()</function> </functions> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/kbabel/kbabel/editorpreferences.ui b/kbabel/kbabel/editorpreferences.ui index ee8632f9..13c49925 100644 --- a/kbabel/kbabel/editorpreferences.ui +++ b/kbabel/kbabel/editorpreferences.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>EditorPreferences</class> <author>Stanislav Visnovsky</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>EditorPreferences</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -17,11 +17,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget2</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -32,7 +32,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame6</cstring> </property> @@ -46,7 +46,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_AutoUnsetFuzzy</cstring> </property> @@ -60,7 +60,7 @@ unset (this means the string <i>, fuzzy</i> is removed from the entry's comment).</p></qt></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_CleverEditing</cstring> </property> @@ -81,7 +81,7 @@ generate syntactically incorrect text.</p></qt></string> </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -105,7 +105,7 @@ activated, you will still see a message in the statusbar. <cstring>_kcfg_AutoCheckTools</cstring> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_BeepOnError</cstring> </property> @@ -113,7 +113,7 @@ activated, you will still see a message in the statusbar. <string>&Beep on error</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_AutoCheckColorError</cstring> </property> @@ -133,7 +133,7 @@ activated, you will still see a message in the statusbar. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> @@ -142,7 +142,7 @@ activated, you will still see a message in the statusbar. </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -153,7 +153,7 @@ activated, you will still see a message in the statusbar. <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame3</cstring> </property> @@ -167,7 +167,7 @@ activated, you will still see a message in the statusbar. <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>kcfg_HighlightSyntax</cstring> </property> @@ -175,7 +175,7 @@ activated, you will still see a message in the statusbar. <string>H&ighlight syntax</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>kcfg_HighlightBackground</cstring> </property> @@ -183,7 +183,7 @@ activated, you will still see a message in the statusbar. <string>Highlight backgrou&nd</string> </property> </widget> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>kcfg_WhitespacePoints</cstring> </property> @@ -191,7 +191,7 @@ activated, you will still see a message in the statusbar. <string>Mark &whitespaces with points</string> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>kcfg_EnableQuotes</cstring> </property> @@ -201,22 +201,22 @@ activated, you will still see a message in the statusbar. </widget> </grid> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup1</cstring> </property> <property name="title"> - <string>Status LEDs</string> + <string>tqStatus LEDs</string> </property> <property name="whatsThis" stdset="0"> - <string><qt><p><b>Status LEDs</b></p> + <string><qt><p><b>tqStatus LEDs</b></p> <p>Choose here where the status LEDs are displayed and what color they have.</p></qt></string> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>kcfg_LedInStatusbar</cstring> </property> @@ -224,7 +224,7 @@ activated, you will still see a message in the statusbar. <string>Display in stat&usbar</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioButton2</cstring> </property> @@ -245,14 +245,14 @@ activated, you will still see a message in the statusbar. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -283,7 +283,7 @@ activated, you will still see a message in the statusbar. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>29</height> @@ -341,11 +341,11 @@ activated, you will still see a message in the statusbar. <includes> <include location="local" impldecl="in implementation">editorpreferences.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot specifier="non virtual">ledWarning( bool show )</slot> <slot specifier="non virtual">toggleOther( bool other )</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>toolselectionwidget.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/kbabel/kbabel/editorpreferences.ui.h b/kbabel/kbabel/editorpreferences.ui.h index b7f9827c..99819cde 100644 --- a/kbabel/kbabel/editorpreferences.ui.h +++ b/kbabel/kbabel/editorpreferences.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ diff --git a/kbabel/kbabel/errorlistview.cpp b/kbabel/kbabel/errorlistview.cpp index c49c7940..74deba91 100644 --- a/kbabel/kbabel/errorlistview.cpp +++ b/kbabel/kbabel/errorlistview.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -47,17 +47,17 @@ using namespace KBabel; -ErrorListView::ErrorListView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project) - : KBCatalogView(catalog,parent,project) +ErrorListView::ErrorListView(KBCatalog* catalog,TQWidget *tqparent, Project::Ptr project) + : KBCatalogView(catalog,tqparent,project) { - TQVBoxLayout* layout = new TQVBoxLayout( this ); - layout->setResizeMode( TQLayout::Minimum ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + tqlayout->setResizeMode( TQLayout::Minimum ); _textview = new TQTextView (this); KCursor::setAutoHideCursor(_textview->viewport(),true); _textview->setReadOnly(true); - layout->addWidget(_textview); + tqlayout->addWidget(_textview); TQWhatsThis::add(this, i18n( "<qt><p><b>Error List</b></p>" "<p>This window shows the list of errors found by validator tools " @@ -70,7 +70,7 @@ void ErrorListView::updateView() if( _catalog->numberOfEntries() == 0 ) return; - _textview->setText( _catalog->itemStatus( _currentIndex ).join( "\n---\n" ) ); + _textview->setText( _catalog->itemtqStatus( _currentIndex ).join( "\n---\n" ) ); } #include "errorlistview.moc" diff --git a/kbabel/kbabel/errorlistview.h b/kbabel/kbabel/errorlistview.h index 320e122d..022d94c1 100644 --- a/kbabel/kbabel/errorlistview.h +++ b/kbabel/kbabel/errorlistview.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -39,11 +39,12 @@ class TQTextView; class ErrorListView : public KBCatalogView { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - ErrorListView(KBCatalog* catalog,TQWidget *parent, KBabel::Project::Ptr project); + ErrorListView(KBCatalog* catalog,TQWidget *tqparent, KBabel::Project::Ptr project); public slots: virtual void updateView(); diff --git a/kbabel/kbabel/fontpreferences.ui b/kbabel/kbabel/fontpreferences.ui index aefb8c7e..24c68e35 100644 --- a/kbabel/kbabel/fontpreferences.ui +++ b/kbabel/kbabel/fontpreferences.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>FontPreferences</class> <author>Stanislav Visnovsky</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>FontPreferences</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -17,7 +17,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -28,7 +28,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkBox1</cstring> </property> @@ -56,8 +56,8 @@ <includes> <include location="local" impldecl="in implementation">fontpreferences.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="private">showOnlyFixedFonts( bool on )</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbabel/kbabel/fontpreferences.ui.h b/kbabel/kbabel/fontpreferences.ui.h index 065318f1..20e02941 100644 --- a/kbabel/kbabel/fontpreferences.ui.h +++ b/kbabel/kbabel/fontpreferences.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ diff --git a/kbabel/kbabel/gotodialog.cpp b/kbabel/kbabel/gotodialog.cpp index b08b0098..9bec7bf7 100644 --- a/kbabel/kbabel/gotodialog.cpp +++ b/kbabel/kbabel/gotodialog.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -37,8 +37,8 @@ #include "gotodialog.h" -GotoDialog::GotoDialog(int max,TQWidget* parent) - : KDialogBase(parent,0,true,i18n("Go to Entry"),Ok|Cancel) +GotoDialog::GotoDialog(int max,TQWidget* tqparent) + : KDialogBase(tqparent,0,true,i18n("Go to Entry"),Ok|Cancel) { TQGroupBox* box=new TQGroupBox(1,Qt::Horizontal,i18n("Go to Entry"),this); _spinBox= new KIntSpinBox(1,max,1,1,10,box); diff --git a/kbabel/kbabel/gotodialog.h b/kbabel/kbabel/gotodialog.h index 4c033973..afd9b250 100644 --- a/kbabel/kbabel/gotodialog.h +++ b/kbabel/kbabel/gotodialog.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -45,7 +45,7 @@ class KIntSpinBox; class GotoDialog : public KDialogBase { public: - GotoDialog(int max, TQWidget* parent); + GotoDialog(int max, TQWidget* tqparent); virtual ~GotoDialog(); /** reimplemented to select contents when shown*/ diff --git a/kbabel/kbabel/headereditor.cpp b/kbabel/kbabel/headereditor.cpp index 2f686652..553724bc 100644 --- a/kbabel/kbabel/headereditor.cpp +++ b/kbabel/kbabel/headereditor.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -49,7 +49,7 @@ using namespace KBabel; HeaderEditor::HeaderEditor(Catalog* cat,const char* name) - : KDialogBase((TQWidget*)0,name,false,TQString::null, Ok|Cancel|Default|User1) + : KDialogBase((TQWidget*)0,name,false,TQString(), Ok|Cancel|Default|User1) { restoreSettings(); @@ -108,7 +108,7 @@ bool HeaderEditor::isModified() void HeaderEditor::readHeader(bool readOnly) { - setCaption(i18n("Header Editor for %1").arg(_catalog->currentURL().prettyURL())); + setCaption(i18n("Header Editor for %1").tqarg(_catalog->currentURL().prettyURL())); _editor->headerEdit->setReadOnly(readOnly); _editor->commentEdit->setReadOnly(readOnly); diff --git a/kbabel/kbabel/headereditor.h b/kbabel/kbabel/headereditor.h index 88dda5ee..03159212 100644 --- a/kbabel/kbabel/headereditor.h +++ b/kbabel/kbabel/headereditor.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -47,6 +47,7 @@ class HeaderWidget; class HeaderEditor : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * constructor for the HeaderEditor diff --git a/kbabel/kbabel/headerwidget.ui b/kbabel/kbabel/headerwidget.ui index f74a9ef5..ce241a3d 100644 --- a/kbabel/kbabel/headerwidget.ui +++ b/kbabel/kbabel/headerwidget.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>HeaderWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>HeaderWidget</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>commentLabel</cstring> </property> @@ -35,7 +35,7 @@ <enum>NoWrap</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>headerLabel</cstring> </property> @@ -56,7 +56,7 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>ktextedit.h</includehint> <includehint>ktextedit.h</includehint> diff --git a/kbabel/kbabel/hidingmsgedit.cpp b/kbabel/kbabel/hidingmsgedit.cpp index 60a62da4..d1458fb4 100644 --- a/kbabel/kbabel/hidingmsgedit.cpp +++ b/kbabel/kbabel/hidingmsgedit.cpp @@ -15,11 +15,11 @@ * * In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -41,8 +41,8 @@ using namespace KBabel; -HidingMsgEdit::HidingMsgEdit(uint numberOfPlurals, TQWidget* eventFilter, KSpell* spell, TQWidget *parent, const char *name ) : - TQWidgetStack(parent,name) +HidingMsgEdit::HidingMsgEdit(uint numberOfPlurals, TQWidget* eventFilter, KSpell* spell, TQWidget *tqparent, const char *name ) : + TQWidgetStack(tqparent,name) , _singleEdit(0) , _multipleEdit(0) , _eventFilter(eventFilter) @@ -177,9 +177,9 @@ void HidingMsgEdit::setNumberOfPlurals( uint numberOfPlurals ) MsgMultiLineEdit* pl; for(uint i=0 ; i< _numberOfPlurals ; i++) { - pl = new MsgMultiLineEdit( i, _spell, _multipleEdit, TQString("multipleEdit %1").arg(i).local8Bit()); + pl = new MsgMultiLineEdit( i, _spell, _multipleEdit, TQString("multipleEdit %1").tqarg(i).local8Bit()); _allEdits.append(pl); - _multipleEdit->addTab( pl, i18n("Plural %1").arg(i+1)); + _multipleEdit->addTab( pl, i18n("Plural %1").tqarg(i+1)); if( _eventFilter ) pl->installEventFilter(_eventFilter); } diff --git a/kbabel/kbabel/hidingmsgedit.h b/kbabel/kbabel/hidingmsgedit.h index b38a3bd5..65c65d40 100644 --- a/kbabel/kbabel/hidingmsgedit.h +++ b/kbabel/kbabel/hidingmsgedit.h @@ -15,11 +15,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -51,8 +51,9 @@ namespace KBabel class HidingMsgEdit : public TQWidgetStack { Q_OBJECT + TQ_OBJECT public: - HidingMsgEdit(uint numberOfPlurals, TQWidget* eventFilter=0, KSpell* spell=0, TQWidget *parent=0, const char *name=0); + HidingMsgEdit(uint numberOfPlurals, TQWidget* eventFilter=0, KSpell* spell=0, TQWidget *tqparent=0, const char *name=0); ~HidingMsgEdit(); void setNumberOfPlurals(uint numberOfPlurals); @@ -101,7 +102,7 @@ public: // reiplemented to return correct value bool hasFocus (); public slots: // Public slots - void setText(TQStringList texts, TQString msgctxt = TQString::null); + void setText(TQStringList texts, TQString msgctxt = TQString()); void showSingle(); void showMultiple(); void showPlurals( bool on ); diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp index 0c3c897d..73f4d365 100644 --- a/kbabel/kbabel/kbabel.cpp +++ b/kbabel/kbabel/kbabel.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -113,11 +113,11 @@ TQPtrList<KBabelPreferences> KBabelMW::prefDialogs; class MyKProgress: public KProgress { public: - MyKProgress( TQWidget *parent, const char *name ) : KProgress( parent, name ) + MyKProgress( TQWidget *tqparent, const char *name ) : KProgress( tqparent, name ) { - setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ); + tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ); } - TQSize sizeHint() const { return TQSize( 1, 1);} + TQSize tqsizeHint() const { return TQSize( 1, 1);} }; KBabelMW::KBabelMW(TQString projectFile) @@ -129,7 +129,7 @@ KBabelMW::KBabelMW(TQString projectFile) if ( _project == NULL ) // FIXME should not happen anymore { - KMessageBox::error( this, i18n("Cannot open project file\n%1").arg(projectFile) + KMessageBox::error( this, i18n("Cannot open project file\n%1").tqarg(projectFile) , i18n("Project File Error")); _project = ProjectManager::open(KBabel::ProjectManager::defaultProjectName()); } @@ -147,7 +147,7 @@ KBabelMW::KBabelMW(KBCatalog* catalog, TQString projectFile) if ( _project == NULL ) { - KMessageBox::error( this, i18n("Cannot open project file\n%1").arg(projectFile) + KMessageBox::error( this, i18n("Cannot open project file\n%1").tqarg(projectFile) , i18n("Project File Error")); _project = ProjectManager::open(KBabel::ProjectManager::defaultProjectName()); } @@ -333,7 +333,7 @@ void KBabelMW::init(KBCatalog* catalog) "The minimum requirement is to fill out the Identity page.\n" "Also check the encoding on the Save page, which is currently " "set to %1. You may want to change this setting " - "according to the settings of your language team.").arg(encodingStr)); + "according to the settings of your language team.").tqarg(encodingStr)); TQTimer::singleShot(1,this,TQT_SLOT(projectConfigure())); } @@ -437,10 +437,10 @@ void KBabelMW::setupActions() action = KStdAction::copy(m_view, TQT_SIGNAL(signalCopy()), actionCollection()); action = KStdAction::paste(m_view, TQT_SIGNAL(signalPaste()), actionCollection()); action = KStdAction::selectAll(m_view, TQT_SIGNAL(signalSelectAll()), actionCollection()); - action = KStdAction::find(m_view, TQT_SLOT(find()), actionCollection()); + action = KStdAction::tqfind(m_view, TQT_SLOT(tqfind()), actionCollection()); action = KStdAction::findNext(m_view, TQT_SLOT(findNext()), actionCollection()); action = KStdAction::findPrev(m_view, TQT_SLOT(findPrev()), actionCollection()); - action = KStdAction::replace(m_view, TQT_SLOT(replace()), actionCollection()); + action = KStdAction::tqreplace(m_view, TQT_SLOT(tqreplace()), actionCollection()); action = KStdAction::clear( m_view, TQT_SLOT(clear()), actionCollection(), "clear" ); @@ -454,8 +454,8 @@ void KBabelMW::setupActions() action = new KAction(i18n("Copy Selected Character to Msgstr"), Key_F10, m_charselectorview ,TQT_SLOT(emitChar()), actionCollection(), "char2msgstr"); - a_unsetFuzzy = new KAction(i18n("To&ggle Fuzzy Status"), "togglefuzzy", CTRL+Key_U, m_view - , TQT_SLOT(removeFuzzyStatus()), actionCollection(), "edit_toggle_fuzzy"); + a_unsetFuzzy = new KAction(i18n("To&ggle Fuzzy tqStatus"), "togglefuzzy", CTRL+Key_U, m_view + , TQT_SLOT(removeFuzzytqStatus()), actionCollection(), "edit_toggle_fuzzy"); action = new KAction(i18n("&Edit Header..."), 0, m_view, TQT_SLOT(editHeader()), actionCollection(), "edit_edit_header"); @@ -710,7 +710,7 @@ void KBabelMW::setupStatusBar() TQColor ledColor=KBabelSettings::ledColor(); TQHBox* statusBox = new TQHBox(statusBar(),"statusBox"); statusBox->setSpacing(2); - new TQLabel(" "+i18n("Status: "),statusBox); + new TQLabel(" "+i18n("tqStatus: "),statusBox); _fuzzyLed = new KLed(ledColor,KLed::Off,KLed::Sunken,KLed::Rectangular ,statusBox); _fuzzyLed->setFixedSize(15,12); @@ -724,7 +724,7 @@ void KBabelMW::setupStatusBar() _errorLed->setFixedSize(15,12); new TQLabel(i18n("faulty")+" ",statusBox); - statusBox->setFixedWidth(statusBox->sizeHint().width()); + statusBox->setFixedWidth(statusBox->tqsizeHint().width()); statusBar()->addWidget(statusBox); } @@ -732,7 +732,7 @@ void KBabelMW::setupStatusBar() statusBar()->insertItem(i18n("RW"),ID_STATUS_READONLY); - statusBar()->insertItem(i18n("Line: %1 Col: %2").arg(1).arg(1) + statusBar()->insertItem(i18n("Line: %1 Col: %2").tqarg(1).tqarg(1) ,ID_STATUS_CURSOR); TQHBox* progressBox = new TQHBox(statusBar(),"progressBox"); @@ -743,7 +743,7 @@ void KBabelMW::setupStatusBar() progressBox->setStretchFactor(_progressBar,1); statusBar()->addWidget(progressBox,1); - statusBar()->setMinimumHeight(progressBox->sizeHint().height()); + statusBar()->setMinimumHeight(progressBox->tqsizeHint().height()); TQWhatsThis::add(statusBar(), i18n("<qt><p><b>Statusbar</b></p>\n\ @@ -996,10 +996,10 @@ void KBabelMW::wheelEvent(TQWheelEvent *e) void KBabelMW::openRecent(const KURL& url) { - KBabelView *view = KBabelView::viewForURL(url,TQString::null); + KBabelView *view = KBabelView::viewForURL(url,TQString()); if(view) { - KWin::activateWindow(view->topLevelWidget()->winId()); + KWin::activateWindow(view->tqtopLevelWidget()->winId()); return; } @@ -1008,7 +1008,7 @@ void KBabelMW::openRecent(const KURL& url) void KBabelMW::open(const KURL& url) { - open(url,TQString::null,false); + open(url,TQString(),false); } void KBabelMW::open(const KURL& url, const TQString package, bool newWindow) @@ -1019,7 +1019,7 @@ void KBabelMW::open(const KURL& url, const TQString package, bool newWindow) if(view) { kdDebug(KBABEL) << "there is a such view" << endl; - KWin::activateWindow(view->topLevelWidget()->winId()); + KWin::activateWindow(view->tqtopLevelWidget()->winId()); return; } @@ -1361,23 +1361,23 @@ void KBabelMW::faultyDisplayed(bool flag) void KBabelMW::displayedEntryChanged(const KBabel::DocPosition& pos) { - statusBar()->changeItem(i18n("Current: %1").arg(pos.item+1),ID_STATUS_CURRENT); + statusBar()->changeItem(i18n("Current: %1").tqarg(pos.item+1),ID_STATUS_CURRENT); _currentIndex = pos.item; } void KBabelMW::setNumberOfTotal(uint number) { - statusBar()->changeItem(i18n("Total: %1").arg(number),ID_STATUS_TOTAL); + statusBar()->changeItem(i18n("Total: %1").tqarg(number),ID_STATUS_TOTAL); } void KBabelMW::setNumberOfFuzzies(uint number) { - statusBar()->changeItem(i18n("Fuzzy: %1").arg(number),ID_STATUS_FUZZY); + statusBar()->changeItem(i18n("Fuzzy: %1").tqarg(number),ID_STATUS_FUZZY); } void KBabelMW::setNumberOfUntranslated(uint number) { - statusBar()->changeItem(i18n("Untranslated: %1").arg(number),ID_STATUS_UNTRANS); + statusBar()->changeItem(i18n("Untranslated: %1").tqarg(number),ID_STATUS_UNTRANS); } void KBabelMW::hasFuzzyAfterwards(bool flag) @@ -1566,7 +1566,7 @@ void KBabelMW::gettextHelp() if(!error.isEmpty()) { KMessageBox::sorry(this,i18n("An error occurred while " - "trying to open the gettext info page:\n%1").arg(error)); + "trying to open the gettext info page:\n%1").tqarg(error)); } } @@ -1602,7 +1602,7 @@ void KBabelMW::buildDictMenus() void KBabelMW::updateCursorPosition(int line, int col) { - statusBar()->changeItem(i18n("Line: %1 Col: %2").arg(line+1).arg(col+1) + statusBar()->changeItem(i18n("Line: %1 Col: %2").tqarg(line+1).tqarg(col+1) ,ID_STATUS_CURSOR); } @@ -1614,10 +1614,10 @@ KBabelMW *KBabelMW::winForURL(const KURL& url, TQString project) KBabelView *v = KBabelView::viewForURL(url,project); if(v) { - TQObject *p = v->parent(); + TQObject *p = v->tqparent(); while(p && !p->inherits("KBabelMW")) { - p = p->parent(); + p = p->tqparent(); } if(p) @@ -1634,10 +1634,10 @@ KBabelMW *KBabelMW::emptyWin(TQString project) KBabelView *v = KBabelView::emptyView(project); if(v) { - TQObject *p = v->parent(); + TQObject *p = v->tqparent(); while(p && !p->inherits("KBabelMW")) { - p = p->parent(); + p = p->tqparent(); } if(p) @@ -1668,7 +1668,7 @@ void KBabelMW::spellcheckDone( int result) TQString file = _toSpellcheck.first(); _toSpellcheck.pop_front(); if( m_view->isModified() ) fileSave(); - open(KURL( file ), TQString::null, false); + open(KURL( file ), TQString(), false); kdDebug(KBABEL) << "Starting another spellcheck" << endl; TQTimer::singleShot( 1, m_view, TQT_SLOT(spellcheckAllMulti())); } @@ -1710,7 +1710,7 @@ void KBabelMW::projectOpen() { oldproject = TQString(); } - const TQString file = KFileDialog::getOpenFileName(oldproject, TQString::null, this); + const TQString file = KFileDialog::getOpenFileName(oldproject, TQString(), this); if (file.isEmpty()) { return; @@ -1751,7 +1751,7 @@ void KBabelMW::projectOpen(const TQString& file) } else { - KMessageBox::error( this, i18n("Cannot open project file\n%1").arg(file) + KMessageBox::error( this, i18n("Cannot open project file\n%1").tqarg(file) , i18n("Project File Error")); _project = ProjectManager::open(KBabel::ProjectManager::defaultProjectName()); m_view->useProject(_project); diff --git a/kbabel/kbabel/kbabel.h b/kbabel/kbabel/kbabel.h index 10f57336..392f71ad 100644 --- a/kbabel/kbabel/kbabel.h +++ b/kbabel/kbabel/kbabel.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -82,6 +82,7 @@ namespace KBabel class KBabelMW : public KDockMainWindow { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor @@ -111,20 +112,20 @@ public: * @return A pointer to a KBabel, that has opened file URL or 0 if no * KBabel was found */ - static KBabelMW *winForURL(const KURL& url, TQString projectFile = TQString::null); + static KBabelMW *winForURL(const KURL& url, TQString projectFile = TQString()); /** * @return A pointer to a KBabel, that has opened no file URL or 0 if no * KBabel was found */ - static KBabelMW *emptyWin(TQString projectFile = TQString::null); + static KBabelMW *emptyWin(TQString projectFile = TQString()); public slots: void toggleEditMode(); protected: /** - * Overridden virtuals for Qt drag 'n drop (XDND) + * Overridden virtuals for TQt drag 'n drop (XDND) */ virtual void dragEnterEvent(TQDragEnterEvent *event); virtual void dropEvent(TQDropEvent *event); diff --git a/kbabel/kbabel/kbabeliface.h b/kbabel/kbabel/kbabeliface.h index 49d19f5c..854172b6 100644 --- a/kbabel/kbabel/kbabeliface.h +++ b/kbabel/kbabel/kbabeliface.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/kbabel/kbabelpref.cpp b/kbabel/kbabel/kbabelpref.cpp index 2592385e..2bc23b9d 100644 --- a/kbabel/kbabel/kbabelpref.cpp +++ b/kbabel/kbabel/kbabelpref.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/kbabel/kbabelpref.h b/kbabel/kbabel/kbabelpref.h index 6d72aaf1..827caa8e 100644 --- a/kbabel/kbabel/kbabelpref.h +++ b/kbabel/kbabel/kbabelpref.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -45,6 +45,7 @@ struct ModuleInfo; class KBabelPreferences : public KConfigDialog { Q_OBJECT + TQ_OBJECT public: KBabelPreferences(TQPtrList<ModuleInfo>); diff --git a/kbabel/kbabel/kbabelsplash.cpp b/kbabel/kbabel/kbabelsplash.cpp index 4166cffe..e5dcf563 100644 --- a/kbabel/kbabel/kbabelsplash.cpp +++ b/kbabel/kbabel/kbabelsplash.cpp @@ -15,11 +15,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -40,8 +40,8 @@ KBabelSplash* KBabelSplash::instance = 0; -KBabelSplash::KBabelSplash( TQWidget* parent, const char* name ) - : TQVBox( parent, name, WType_Dialog|WShowModal|WStyle_Customize|WStyle_NoBorder|WDestructiveClose ) +KBabelSplash::KBabelSplash( TQWidget* tqparent, const char* name ) + : TQVBox( tqparent, name, WType_Dialog|WShowModal|WStyle_Customize|WStyle_NoBorder|WDestructiveClose ) { setMargin( 0 ); setSpacing( 0 ); @@ -53,9 +53,9 @@ KBabelSplash::KBabelSplash( TQWidget* parent, const char* name ) picLabel->setFrameStyle(TQFrame::WinPanel | TQFrame::Raised); - // Set geometry, with support for Xinerama systems + // Set tqgeometry, with support for Xinerama systems TQRect r; - r.setSize(sizeHint()); + r.setSize(tqsizeHint()); int ps = TQApplication::desktop()->primaryScreen(); r.moveCenter( TQApplication::desktop()->screenGeometry(ps).center() ); setGeometry(r); diff --git a/kbabel/kbabel/kbabelsplash.h b/kbabel/kbabel/kbabelsplash.h index af23460b..24f2865a 100644 --- a/kbabel/kbabel/kbabelsplash.h +++ b/kbabel/kbabel/kbabelsplash.h @@ -15,11 +15,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -38,12 +38,13 @@ class TQPaintEvent; class TQString; -class KBabelSplash : public QVBox +class KBabelSplash : public TQVBox { Q_OBJECT + TQ_OBJECT public: - KBabelSplash( TQWidget* parent = 0, const char* name = 0 ); + KBabelSplash( TQWidget* tqparent = 0, const char* name = 0 ); ~KBabelSplash() { instance = 0; } static KBabelSplash* instance; diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp index ca41a7ad..0e685f0c 100644 --- a/kbabel/kbabel/kbabelview.cpp +++ b/kbabel/kbabel/kbabelview.cpp @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -115,11 +115,11 @@ using namespace KBabel; TQPtrList<KBabelView> *KBabelView::viewList = 0; -KBabelView::KBabelView(KBCatalog* catalog,KBabelMW *parent, Project::Ptr project) - : TQWidget(parent) +KBabelView::KBabelView(KBCatalog* catalog,KBabelMW *tqparent, Project::Ptr project) + : TQWidget(tqparent) , _redirectedBackSearch (false) , _project (project) - , m_mainwindow (parent) + , m_mainwindow (tqparent) , m_sourceview (0) { if(!viewList) @@ -307,7 +307,7 @@ void KBabelView::initDockWidgets() TQWidget *tempWidget=new TQWidget(this,"msgidWidget"); tempWidget->setMinimumSize(350,150); - TQVBoxLayout *layout=new TQVBoxLayout(tempWidget); + TQVBoxLayout *tqlayout=new TQVBoxLayout(tempWidget); msgidLabel = new HidingMsgEdit(2, this, 0, tempWidget,"msgidLabel"); msgidLabel->installEventFilter(this); @@ -328,16 +328,16 @@ void KBabelView::initDockWidgets() "and the behavior of KBabel and to Stephan Kulow, who always\n" "lends me a helping hand.\n\n" "Many good ideas, especially for the Catalog Manager, are taken\n" -"from KTranslator by Andrea Rizzi.").arg(VERSION).arg(2006)); +"from KTranslator by Andrea Rizzi.").tqarg(VERSION).tqarg(2006)); TQLabel *label=new TQLabel(msgidLabel,i18n("O&riginal string (msgid):"),tempWidget); - TQHBoxLayout* hb=new TQHBoxLayout(layout); + TQHBoxLayout* hb=new TQHBoxLayout(tqlayout); hb->addSpacing(KDialog::marginHint()); hb->addWidget(label); - layout->addWidget(msgidLabel); - layout->setStretchFactor(msgidLabel,1); + tqlayout->addWidget(msgidLabel); + tqlayout->setStretchFactor(msgidLabel,1); TQWhatsThis::add(tempWidget, i18n("<qt><p><b>Original String</b></p>\n\ @@ -382,7 +382,7 @@ of the currently displayed entry.</p></qt>")); tempWidget=new TQWidget(this,"msgstrWidget"); tempWidget->setMinimumSize(350,150); - layout=new TQVBoxLayout(tempWidget); + tqlayout=new TQVBoxLayout(tempWidget); // if undefined number of plural forms, use 1 int pf = _catalog->defaultNumberOfPluralForms(); @@ -395,7 +395,7 @@ of the currently displayed entry.</p></qt>")); label=new TQLabel(msgstrEdit,i18n("Trans&lated string (msgstr):"),tempWidget); - hb=new TQHBoxLayout(layout); + hb=new TQHBoxLayout(tqlayout); hb->setSpacing(KDialog::spacingHint()); hb->addSpacing(KDialog::marginHint()); @@ -404,7 +404,7 @@ of the currently displayed entry.</p></qt>")); if(! KBabelSettings::ledInStatusbar()) { - _fuzzyLed = new KLed(Qt::red,KLed::Off,KLed::Sunken,KLed::Rectangular + _fuzzyLed = new KLed(TQt::red,KLed::Off,KLed::Sunken,KLed::Rectangular ,tempWidget); _fuzzyLed->setFixedSize(15,12); label = new TQLabel(i18n("fuzzy"),tempWidget); @@ -413,7 +413,7 @@ of the currently displayed entry.</p></qt>")); hb->addSpacing(KDialog::spacingHint()); - _untransLed = new KLed(Qt::red,KLed::Off,KLed::Sunken,KLed::Rectangular + _untransLed = new KLed(TQt::red,KLed::Off,KLed::Sunken,KLed::Rectangular ,tempWidget); _untransLed->setFixedSize(15,12); label = new TQLabel(i18n("untranslated"),tempWidget); @@ -422,7 +422,7 @@ of the currently displayed entry.</p></qt>")); hb->addSpacing(KDialog::marginHint()); - _errorLed = new KLed(Qt::red,KLed::Off,KLed::Sunken,KLed::Rectangular + _errorLed = new KLed(TQt::red,KLed::Off,KLed::Sunken,KLed::Rectangular ,tempWidget); _errorLed->setFixedSize(15,12); label = new TQLabel(i18n("faulty"),tempWidget); @@ -434,7 +434,7 @@ of the currently displayed entry.</p></qt>")); hb->addStretch(1); // ### TODO: perhaps it should be moreprecise where the setting can be changed - TQString ledMsg=i18n("<qt><p><b>Status LEDs</b></p>\n" + TQString ledMsg=i18n("<qt><p><b>tqStatus LEDs</b></p>\n" "<p>These LEDs display the status of the currently displayed message.\n" "You can change their color in the preferences dialog section\n" "<b>Editor</b> on page <b>Appearance</b></p></qt>"); @@ -443,8 +443,8 @@ of the currently displayed entry.</p></qt>")); TQWhatsThis::add(_errorLed,ledMsg); } - layout->addWidget(msgstrEdit); - layout->setStretchFactor(msgstrEdit,1); + tqlayout->addWidget(msgstrEdit); + tqlayout->setStretchFactor(msgstrEdit,1); TQWhatsThis::add(tempWidget, i18n("<qt><p><b>Translation Editor</b></p>\n\ @@ -685,7 +685,7 @@ void KBabelView::readSettings(KConfig* config) if(KBabelSettings::autoUnsetFuzzy()) { connect(msgstrEdit,TQT_SIGNAL(textChanged()) - ,this,TQT_SLOT(autoRemoveFuzzyStatus())); + ,this,TQT_SLOT(autoRemoveFuzzytqStatus())); } setupAutoCheckTools(); @@ -788,7 +788,7 @@ void KBabelView::readProject(Project::Ptr project) { // turn off spellchecker msgstrEdit->setSpellChecker(0); - // invalidate the current settings, to make sure they are updated when needed + // tqinvalidate the current settings, to make sure they are updated when needed _spellcheckSettings.valid = false; } @@ -854,12 +854,12 @@ void KBabelView::updateSettings() } disconnect(msgstrEdit,TQT_SIGNAL(textChanged()) - ,this,TQT_SLOT(autoRemoveFuzzyStatus())); + ,this,TQT_SLOT(autoRemoveFuzzytqStatus())); if(KBabelSettings::autoUnsetFuzzy()) { connect(msgstrEdit,TQT_SIGNAL(textChanged()) - ,this,TQT_SLOT(autoRemoveFuzzyStatus())); + ,this,TQT_SLOT(autoRemoveFuzzytqStatus())); } msgstrEdit->setCleverEditing(KBabelSettings::cleverEditing()); @@ -931,7 +931,7 @@ void KBabelView::setupAutoCheckTools() TQValueList<KDataToolInfo>::Iterator it; for( it=tools.begin(); it!=tools.end() ; ++it ) { - if(KBabelSettings::autoCheckTools().contains((*it).service()->library()) ) + if(KBabelSettings::autoCheckTools().tqcontains((*it).service()->library()) ) { // maybe we can reuse the tools KDataTool* t = (*it).createTool(); @@ -1013,7 +1013,7 @@ void KBabelView::restoreSession(KConfig* config) if(!url.isEmpty()) { - open(KURL( url ), TQString::null, false,true); + open(KURL( url ), TQString(), false,true); } @@ -1116,7 +1116,7 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo cu.cleanPath(); if(checkIfModified && !url.isEmpty() && cu==url) { - KWin::activateWindow(topLevelWidget()->winId()); + KWin::activateWindow(tqtopLevelWidget()->winId()); return; } @@ -1155,12 +1155,12 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo return; } else { - KWin::activateWindow(v->topLevelWidget()->winId()); + KWin::activateWindow(v->tqtopLevelWidget()->winId()); return; } } - ConversionStatus stat=_catalog->openURL(url, package); + ConversiontqStatus stat=_catalog->openURL(url, package); switch(stat) { @@ -1180,14 +1180,14 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo { KMessageBox::error(this ,i18n("Error while trying to read file:\n %1\n" - "Maybe it is not a valid PO file.").arg(url.prettyURL())); + "Maybe it is not a valid PO file.").tqarg(url.prettyURL())); break; } case NO_ENTRY_ERROR: { KMessageBox::error(this ,i18n("Error while reading the file:\n %1\n" - "No entry found.").arg(url.prettyURL())); + "No entry found.").tqarg(url.prettyURL())); break; } case RECOVERED_PARSE_ERROR: @@ -1204,25 +1204,25 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo case NO_PERMISSIONS: { KMessageBox::error(this,i18n( - "You do not have permissions to read file:\n %1").arg(url.prettyURL())); + "You do not have permissions to read file:\n %1").tqarg(url.prettyURL())); break; } case NO_FILE: { KMessageBox::error(this,i18n( - "You have not specified a valid file:\n %1").arg(url.prettyURL())); + "You have not specified a valid file:\n %1").tqarg(url.prettyURL())); break; } case NO_PLUGIN: { KMessageBox::error(this,i18n( - "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").arg(url.prettyURL())); + "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").tqarg(url.prettyURL())); break; } case UNSUPPORTED_TYPE: { KMessageBox::error(this,i18n( - "The import plugin cannot handle this type of the file:\n %1").arg(url.prettyURL())); + "The import plugin cannot handle this type of the file:\n %1").tqarg(url.prettyURL())); break; } case STOPPED: @@ -1230,7 +1230,7 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo default: { KMessageBox::error(this,i18n( - "Error while trying to open file:\n %1").arg(url.prettyURL())); + "Error while trying to open file:\n %1").tqarg(url.prettyURL())); break; } @@ -1268,7 +1268,7 @@ void KBabelView::revertToSaved() } } - open(_catalog->currentURL(),TQString::null,false); + open(_catalog->currentURL(),TQString(),false); } void KBabelView::openTemplate(const KURL& openURL, const KURL& saveURL) @@ -1282,7 +1282,7 @@ void KBabelView::openTemplate(const KURL& openURL, const KURL& saveURL) setCursor(KCursor::waitCursor());*/ - ConversionStatus stat=_catalog->openURL(openURL,saveURL); + ConversiontqStatus stat=_catalog->openURL(openURL,saveURL); switch(stat) { @@ -1295,21 +1295,21 @@ void KBabelView::openTemplate(const KURL& openURL, const KURL& saveURL) // For a template, recoverable errors are disqualifying KMessageBox::sorry(this, i18n("There was an error while reading the file header of file:\n %1") - .arg(openURL.prettyURL())); + .tqarg(openURL.prettyURL())); break; } case PARSE_ERROR: { KMessageBox::error(this ,i18n("Error while trying to read file:\n %1\n" - "Maybe it is not a valid PO file.").arg(openURL.prettyURL())); + "Maybe it is not a valid PO file.").tqarg(openURL.prettyURL())); break; } case NO_ENTRY_ERROR: { KMessageBox::error(this ,i18n("Error while reading the file:\n %1\n" - "No entry found.").arg(openURL.prettyURL())); + "No entry found.").tqarg(openURL.prettyURL())); break; } case RECOVERED_PARSE_ERROR: @@ -1317,36 +1317,36 @@ void KBabelView::openTemplate(const KURL& openURL, const KURL& saveURL) // For a template, recoverable errors are disqualifying KMessageBox::sorry(this, i18n("Minor syntax errors were found while reading file:\n %1") - .arg(openURL.prettyURL())); + .tqarg(openURL.prettyURL())); break; } case NO_PERMISSIONS: { - KMessageBox::error(this,i18n("You do not have permissions to read file:\n %1").arg(openURL.prettyURL())); + KMessageBox::error(this,i18n("You do not have permissions to read file:\n %1").tqarg(openURL.prettyURL())); break; } case NO_FILE: { - KMessageBox::error(this,i18n("You have not specified a valid file:\n %1").arg(openURL.prettyURL())); + KMessageBox::error(this,i18n("You have not specified a valid file:\n %1").tqarg(openURL.prettyURL())); break; } case NO_PLUGIN: { KMessageBox::error(this,i18n( - "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").arg(openURL.prettyURL())); + "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").tqarg(openURL.prettyURL())); break; } case UNSUPPORTED_TYPE: { KMessageBox::error(this,i18n( - "The import plugin cannot handle this type of the file:\n %1").arg(openURL.prettyURL())); + "The import plugin cannot handle this type of the file:\n %1").tqarg(openURL.prettyURL())); break; } case STOPPED: break; default: { - KMessageBox::error(this,i18n("Error while trying to open file:\n %1").arg(openURL.prettyURL())); + KMessageBox::error(this,i18n("Error while trying to open file:\n %1").tqarg(openURL.prettyURL())); break; } @@ -1368,7 +1368,7 @@ bool KBabelView::saveFile(bool syntaxCheck) } else { - ConversionStatus stat=_catalog->saveFile(); + ConversiontqStatus stat=_catalog->saveFile(); int whatToDo = -1; @@ -1386,20 +1386,20 @@ bool KBabelView::saveFile(bool syntaxCheck) { whatToDo=KMessageBox::warningContinueCancel(this, i18n("You do not have permission to write to file:\n%1\n" - "Do you want to save to another file or cancel?").arg(_catalog->currentURL().prettyURL()), + "Do you want to save to another file or cancel?").tqarg(_catalog->currentURL().prettyURL()), i18n("Error"),KStdGuiItem::save()); break; } case NO_PLUGIN: { KMessageBox::error(this,i18n( - "KBabel cannot find a corresponding plugin for the MIME type of file:\n %1").arg(_catalog->currentURL().prettyURL())); + "KBabel cannot find a corresponding plugin for the MIME type of file:\n %1").tqarg(_catalog->currentURL().prettyURL())); break; } case UNSUPPORTED_TYPE: { KMessageBox::error(this,i18n( - "The export plugin cannot handle this type of file:\n %1").arg(_catalog->currentURL().prettyURL())); + "The export plugin cannot handle this type of file:\n %1").tqarg(_catalog->currentURL().prettyURL())); break; } case BUSY: @@ -1415,7 +1415,7 @@ bool KBabelView::saveFile(bool syntaxCheck) { whatToDo=KMessageBox::warningContinueCancel(this, i18n("An error occurred while trying to write to file:\n%1\n" - "Do you want to save to another file or cancel?").arg(_catalog->currentURL().prettyURL()), + "Do you want to save to another file or cancel?").tqarg(_catalog->currentURL().prettyURL()), i18n("Error"),KStdGuiItem::save()); break; } @@ -1448,8 +1448,8 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck) if (KIO::NetAccess::exists(url, false, this)) { - if(KMessageBox::warningContinueCancel(this,TQString("<qt>%1</qt>").arg(i18n("The file %1 already exists. " - "Do you want to overwrite it?").arg(url.prettyURL())),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Cancel) + if(KMessageBox::warningContinueCancel(this,TQString("<qt>%1</qt>").tqarg(i18n("The file %1 already exists. " + "Do you want to overwrite it?").tqarg(url.prettyURL())),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Cancel) { return false; } @@ -1458,7 +1458,7 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck) bool wasReadOnly=_catalog->isReadOnly(); - ConversionStatus stat=_catalog->saveFileAs(url,true); + ConversiontqStatus stat=_catalog->saveFileAs(url,true); // if the file was not saved sucessfully ask for saving to another file @@ -1474,30 +1474,30 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck) case NO_PERMISSIONS: { message=i18n("You do not have permission to write to file:\n%1\n" - "Do you want to save to another file or cancel?").arg(url.prettyURL()); + "Do you want to save to another file or cancel?").tqarg(url.prettyURL()); break; } case NO_FILE: { message=i18n("You have specified a folder:\n%1\n" - "Do you want to save to another file or cancel?").arg(url.prettyURL()); + "Do you want to save to another file or cancel?").tqarg(url.prettyURL()); break; } case NO_PLUGIN: { - message=i18n("KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").arg(url.prettyURL()); + message=i18n("KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").tqarg(url.prettyURL()); break; } case UNSUPPORTED_TYPE: { message=i18n( - "The export plugin cannot handle this type of the file:\n %1").arg(url.prettyURL()); + "The export plugin cannot handle this type of the file:\n %1").tqarg(url.prettyURL()); break; } default: { message=i18n("An error occurred while trying to write to file:\n%1\n" - "Do you want to save to another file or cancel?").arg(url.prettyURL()); + "Do you want to save to another file or cancel?").tqarg(url.prettyURL()); break; } } @@ -1518,7 +1518,7 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck) if (KIO::NetAccess::exists(url, false, this)) { if(KMessageBox::warningContinueCancel(this,i18n("The file %1 already exists.\n" - "Do you want to overwrite it?").arg(url.prettyURL()),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Continue) + "Do you want to overwrite it?").tqarg(url.prettyURL()),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Continue) { stat=_catalog->saveFileAs(url); if(stat!=OK) @@ -1625,7 +1625,7 @@ bool KBabelView::checkSyntax(bool msgOnlyAtError,bool question) bool returnCode=true; TQString output; - Msgfmt::Status result=_catalog->checkSyntax( output ); + Msgfmt::tqStatus result=_catalog->checkSyntax( output ); const TQStringList outputLines = TQStringList::split("\n",output); @@ -1831,20 +1831,20 @@ void KBabelView::updateEditor(int form, bool delay) if(KBabelSettings::autoUnsetFuzzy() && !msgstrEdit->isModified()) { - disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus())); + disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzytqStatus())); } msgidLabel->setText(_catalog->msgid(_currentIndex), _catalog->msgctxt(_currentIndex)); - msgidLabel->repaint(); + msgidLabel->tqrepaint(); msgstrEdit->setText(_catalog->msgstr(_currentIndex)); msgstrEdit->showForm( form ); - msgstrEdit->repaint(); + msgstrEdit->tqrepaint(); m_cataloglistview->setSelectedItem(_currentIndex); if(KBabelSettings::autoUnsetFuzzy() && _catalog->isFuzzy(_currentIndex)) { - connect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus())); + connect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzytqStatus())); } msgstrEdit->blockSignals(false); @@ -2034,7 +2034,7 @@ bool KBabelView::findNext_internal(DocPosition& pos, bool forReplace, bool gui) r = KMessageBox::questionYesNo(this, i18n("<qt>%n replacement made.<br>End of document reached.<br>Continue from the beginning?</qt>", "<qt>%n replacements made.<br>End of document reached.<br>Continue from the beginning?</qt>", - _replacesTotal), TQString::null, KStdGuiItem::cont(), KStdGuiItem::cancel()); + _replacesTotal), TQString(), KStdGuiItem::cont(), KStdGuiItem::cancel()); } else { r = KMessageBox::Yes; @@ -2042,7 +2042,7 @@ bool KBabelView::findNext_internal(DocPosition& pos, bool forReplace, bool gui) } else { r = KMessageBox::questionYesNo(this,i18n("End of document reached.\n" - "Continue from the beginning?"), TQString::null, KStdGuiItem::cont(), KStdGuiItem::cancel()); + "Continue from the beginning?"), TQString(), KStdGuiItem::cont(), KStdGuiItem::cancel()); } if(r == KMessageBox::Yes) { if(opts.inMsgid && !forReplace) @@ -2078,7 +2078,7 @@ bool KBabelView::findNext_internal(DocPosition& pos, bool forReplace, bool gui) if( opts.askForNextFile ) { int r = KMessageBox::questionYesNo(this,i18n("End of document reached.\n" - "Continue in the next file?"), TQString::null, KStdGuiItem::cont(), KStdGuiItem::cancel()); + "Continue in the next file?"), TQString(), KStdGuiItem::cont(), KStdGuiItem::cancel()); if( r != KMessageBox::Yes ) return false; } @@ -2219,7 +2219,7 @@ bool KBabelView::findPrev_internal(DocPosition& pos, bool forReplace, bool gui) r = KMessageBox::questionYesNo(this, i18n("<qt>%n replacement made.<br>Beginning of document reached.<br>Continue from the end?</qt>", "<qt>%n replacements made.<br>Beginning of document reached.<br>Continue from the end?</qt>", - _replacesTotal),TQString::null, KStdGuiItem::cont(), KStdGuiItem::cancel()); + _replacesTotal),TQString(), KStdGuiItem::cont(), KStdGuiItem::cancel()); } else { r = KMessageBox::Yes; @@ -2228,7 +2228,7 @@ bool KBabelView::findPrev_internal(DocPosition& pos, bool forReplace, bool gui) } else { r = KMessageBox::questionYesNo(this,i18n("Beginning of document reached.\n" - "Continue from the end?"), TQString::null, KStdGuiItem::cont(), KStdGuiItem::cancel()); + "Continue from the end?"), TQString(), KStdGuiItem::cont(), KStdGuiItem::cancel()); } if(r == KMessageBox::Yes) { pos.item = _catalog->numberOfEntries()-1; @@ -2331,7 +2331,7 @@ bool KBabelView::findPrev_internal(DocPosition& pos, bool forReplace, bool gui) } -void KBabelView::find() +void KBabelView::tqfind() { Part hadFocus; if(msgidLabel->hasFocus()) @@ -2425,7 +2425,7 @@ void KBabelView::find() } } -void KBabelView::replace() +void KBabelView::tqreplace() { _replacesTotal=0; _replaceLen=0; @@ -2518,7 +2518,7 @@ void KBabelView::replace() if(success) { if(!_replaceAskDialog) { _replaceAskDialog = new ReplaceDialog(this); - connect(_replaceAskDialog,TQT_SIGNAL(replace()),this,TQT_SLOT(replaceNext())); + connect(_replaceAskDialog,TQT_SIGNAL(tqreplace()),this,TQT_SLOT(replaceNext())); connect(_replaceAskDialog,TQT_SIGNAL(next()),this,TQT_SLOT(findNextReplace())); connect(_replaceAskDialog,TQT_SIGNAL(replaceAll()),this,TQT_SLOT(replaceAll())); } @@ -2749,7 +2749,7 @@ void KBabelView::replaceInFile(TQCString fileSource, KBabel::ReplaceOptions opti else { if(!_replaceAskDialog) { _replaceAskDialog = new ReplaceDialog(this); - connect(_replaceAskDialog,TQT_SIGNAL(replace()),this,TQT_SLOT(replaceNext())); + connect(_replaceAskDialog,TQT_SIGNAL(tqreplace()),this,TQT_SLOT(replaceNext())); connect(_replaceAskDialog,TQT_SIGNAL(next()),this,TQT_SLOT(findNextReplace())); connect(_replaceAskDialog,TQT_SIGNAL(replaceAll()),this,TQT_SLOT(replaceAll())); } @@ -2803,37 +2803,37 @@ void KBabelView::msgid2msgstr() TQString text = _catalog->msgid(_currentIndex).first(); // this is KDE specific: - if(text.find("_: NAME OF TRANSLATORS\\n")==0) + if(text.tqfind("_: NAME OF TRANSLATORS\\n")==0) { text=_catalog->identitySettings().authorLocalizedName; } - else if(text.find("_: EMAIL OF TRANSLATORS\\n")==0) + else if(text.tqfind("_: EMAIL OF TRANSLATORS\\n")==0) { text=_catalog->identitySettings().authorEmail; } - else if(_catalog->isGeneratedFromDocbook() && text.find("ROLES_OF_TRANSLATORS")==0) + else if(_catalog->isGeneratedFromDocbook() && text.tqfind("ROLES_OF_TRANSLATORS")==0) { text="<othercredit role=\\\"translator\\\">\n" "<firstname></firstname><surname></surname>\n" "<affiliation><address><email>"+_catalog->identitySettings().authorEmail+"</email></address>\n" "</affiliation><contrib></contrib></othercredit>"; } - else if(_catalog->isGeneratedFromDocbook() && text.find("CREDIT_FOR_TRANSLATORS")==0) + else if(_catalog->isGeneratedFromDocbook() && text.tqfind("CREDIT_FOR_TRANSLATORS")==0) { text="<para>"+_catalog->identitySettings().authorLocalizedName+"\n"+ "<email>"+_catalog->identitySettings().authorEmail+"</email></para>"; } - else if(text.contains(_catalog->miscSettings().singularPlural)) + else if(text.tqcontains(_catalog->miscSettings().singularPlural)) { - text.replace(_catalog->miscSettings().singularPlural,""); + text.tqreplace(_catalog->miscSettings().singularPlural,""); } // end of KDE specific part TQRegExp reg=_catalog->miscSettings().contextInfo; - if(text.contains(reg)) + if(text.tqcontains(reg)) { - text.replace(reg,""); + text.tqreplace(reg,""); } modifyMsgstrText(0,text,true); @@ -3159,7 +3159,7 @@ void KBabelView::forwardHistory() } } -void KBabelView::removeFuzzyStatus() +void KBabelView::removeFuzzytqStatus() { bool newState = !_catalog->isFuzzy(_currentIndex); _catalog->setFuzzy(_currentIndex,newState); @@ -3204,9 +3204,9 @@ void KBabelView::startSearch(bool delay) { TQString msg = _catalog->msgid(_currentIndex,true).first(); TQRegExp reg=_catalog->miscSettings().contextInfo; - if(msg.contains(reg)) + if(msg.tqcontains(reg)) { - msg.replace(reg,""); + msg.tqreplace(reg,""); } dictBox->setActiveModule(KBabelSettings::defaultModule()); @@ -3225,9 +3225,9 @@ void KBabelView::startSearch(const TQString module) // FIXME: should care about plural forms TQString msg = _catalog->msgid(_currentIndex,true).first(); TQRegExp reg=_catalog->miscSettings().contextInfo; - if(msg.contains(reg)) + if(msg.tqcontains(reg)) { - msg.replace(reg,""); + msg.tqreplace(reg,""); } dictBox->setActiveModule(module); @@ -3258,9 +3258,9 @@ void KBabelView::startSelectionSearch(const TQString module) // should care about plural forms TQString msg = _catalog->msgid(_currentIndex,true).first(); TQRegExp reg=_catalog->miscSettings().contextInfo; - if(msg.contains(reg)) + if(msg.tqcontains(reg)) { - msg.replace(reg,""); + msg.tqreplace(reg,""); } dictBox->startSearch(msg); @@ -3302,12 +3302,12 @@ void KBabelView::emitEntryState() TQPalette palette=msgstrEdit->palette(); palette.setColor( TQColorGroup::Text, red ); - if( _catalog->itemStatus(_currentIndex).contains("syntax error")) + if( _catalog->itemtqStatus(_currentIndex).tqcontains("syntax error")) { msgstrEdit->setCurrentColor( MsgMultiLineEdit::ErrorColor ); } else - if( !_catalog->itemStatus(_currentIndex).isEmpty() && KBabelSettings::autoCheckColorError()) + if( !_catalog->itemtqStatus(_currentIndex).isEmpty() && KBabelSettings::autoCheckColorError()) { msgstrEdit->setCurrentColor( MsgMultiLineEdit::ErrorColor ); } @@ -3332,12 +3332,12 @@ void KBabelView::checkUntranslated() emit signalUntranslatedInFront(_catalog->hasUntranslatedInFront(_currentIndex)); } -void KBabelView::autoRemoveFuzzyStatus() +void KBabelView::autoRemoveFuzzytqStatus() { // only at first text change remove fuzzy status - disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus())); + disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzytqStatus())); - //removeFuzzyStatus(); + //removeFuzzytqStatus(); } void KBabelView::toggleFuzzyLed(bool on) @@ -3446,7 +3446,7 @@ bool KBabelView::eventFilter( TQObject* object, TQEvent* event) { // This is a little workaround to use CTRL+ALT+Home, CTRL+ALT+End, Undo keys // to go to the first and the last entry. Because otherwise - // CTRL+Home and CTRL+End and Undo are caught by QTextEdit + // CTRL+Home and CTRL+End and Undo are caught by TQTextEdit TQKeyEvent *ke = (TQKeyEvent*)event; if(ke->key() == Key_Home && ke->state() == (AltButton | ControlButton)) @@ -3541,7 +3541,7 @@ void KBabelView::forwardMsgstrEditCmd(EditCommand* cmd) _catalog->applyBeginCommand(_currentIndex,Msgstr,this); - removeFuzzyStatus(); + removeFuzzytqStatus(); } cmd->setPart(Msgstr); @@ -3576,13 +3576,13 @@ void KBabelView::autoCheck(bool onlyWhenChanged) { if( !_autocheckTools.isEmpty() ) { - TQStringList oldStatus = _catalog->itemStatus(_currentIndex); + TQStringList oldtqStatus = _catalog->itemtqStatus(_currentIndex); - TQStringList status = _catalog->itemStatus( _currentIndex,true, _autocheckTools ); + TQStringList status = _catalog->itemtqStatus( _currentIndex,true, _autocheckTools ); // if there is more than one view, the status changes only in // one view, so we have to update always. - if(_catalog->isLastView() && onlyWhenChanged && oldStatus == status) + if(_catalog->isLastView() && onlyWhenChanged && oldtqStatus == status) return; if( !status.isEmpty() ) @@ -3598,8 +3598,8 @@ void KBabelView::autoCheck(bool onlyWhenChanged) else msg += ", "+locale->translate("what check found errors",(*it).utf8()); } - //i18n: translators: Status bar text that automatic checks have found some errors - emit signalChangeStatusbar(i18n("1 error: %1", "%n errors: %1", status.size ()).arg(msg)); + //i18n: translators: tqStatus bar text that automatic checks have found some errors + emit signalChangeStatusbar(i18n("1 error: %1", "%n errors: %1", status.size ()).tqarg(msg)); emit signalFaultyDisplayed(true); if(KBabelSettings::autoCheckColorError()) @@ -3611,7 +3611,7 @@ void KBabelView::autoCheck(bool onlyWhenChanged) { if(onlyWhenChanged) { - if(oldStatus != status && oldStatus.isEmpty() ) + if(oldtqStatus != status && oldtqStatus.isEmpty() ) { KNotifyClient::beep(); } @@ -3622,7 +3622,7 @@ void KBabelView::autoCheck(bool onlyWhenChanged) } } } - else if( _catalog->itemStatus(_currentIndex).isEmpty() ) + else if( _catalog->itemtqStatus(_currentIndex).isEmpty() ) { _catalog->removeFromErrorList(_currentIndex); @@ -3732,7 +3732,7 @@ void KBabelView::addSpellcheckWords( uint pos, TQString text, uint index, uint f } else if( c == '\\') { - if(pos+1 < textLength && spclChars.contains(text[pos+1]) ) + if(pos+1 < textLength && spclChars.tqcontains(text[pos+1]) ) { pos+=2; } @@ -3895,7 +3895,7 @@ void KBabelView::spellcheck() uint lastPercent=0; for(uint i=first; i <= last; i++) { - if(emitProgress && 100*i/ QMAX(total,1) > lastPercent) + if(emitProgress && 100*i/ TQMAX(total,1) > lastPercent) { lastPercent++; emit signalProgress(lastPercent); @@ -3981,9 +3981,9 @@ void KBabelView::spellStart(KSpell *) if(_spellcheckSettings.rememberIgnored) { TQString urlString = _spellcheckSettings.ignoreURL; - if(urlString.contains("@PACKAGE@")) + if(urlString.tqcontains("@PACKAGE@")) { - urlString.replace("@PACKAGE@",_catalog->packageName()); + urlString.tqreplace("@PACKAGE@",_catalog->packageName()); } // ### TODO: correctly set the URL; support for MostLocalURL KURL url(urlString); @@ -4004,7 +4004,7 @@ void KBabelView::spellStart(KSpell *) KMessageBox::sorry(this, i18n("Error opening the file that contains words " "to ignore during spell checking:\n" - "%1").arg(file.name())); + "%1").tqarg(file.name())); } } else @@ -4012,7 +4012,7 @@ void KBabelView::spellStart(KSpell *) KMessageBox::sorry(this, i18n("Only local files are allowed for saving " "ignored words to during spell checking:\n" - "%1").arg(urlString)); + "%1").tqarg(urlString)); } if(spell.ignoreList.count() > 0) @@ -4085,13 +4085,13 @@ bool KBabelView::markMisspelled(const TQString &orig, unsigned int pos) text=text.mid(begin,end-begin); TQChar accelMarker=_catalog->miscSettings().accelMarker; - if(text.contains(accelMarker)) + if(text.tqcontains(accelMarker)) { - text.replace(accelMarker,""); + text.tqreplace(accelMarker,""); } - if(text.contains('\n')) + if(text.tqcontains('\n')) { - text.replace("\n",""); + text.tqreplace("\n",""); } bool textOk=true; @@ -4099,8 +4099,8 @@ bool KBabelView::markMisspelled(const TQString &orig, unsigned int pos) { // if text and orig are not the same, // maybe it was a word with hyphens - int n=text.contains('-'); - n+=text.contains('\''); + int n=text.tqcontains('-'); + n+=text.tqcontains('\''); if( n > 0 ) { // re-get the original text since we replace some things above @@ -4113,8 +4113,8 @@ bool KBabelView::markMisspelled(const TQString &orig, unsigned int pos) while(!textFound && i <= n) { int lastPos=e+1; - e = text.find('-',lastPos); - int tmp = text.find('\'',lastPos); + e = text.tqfind('-',lastPos); + int tmp = text.tqfind('\'',lastPos); if(e < 0 && tmp > 0) { e=tmp; @@ -4127,13 +4127,13 @@ bool KBabelView::markMisspelled(const TQString &orig, unsigned int pos) if(e<0) e=text.length(); TQString w=text.mid(lastPos,e-lastPos); - if(w.contains(accelMarker)) + if(w.tqcontains(accelMarker)) { - w.replace(accelMarker,""); + w.tqreplace(accelMarker,""); } - if(text.contains('\n')) + if(text.tqcontains('\n')) { - text.replace("\n",""); + text.tqreplace("\n",""); } if( w == orig) { @@ -4225,15 +4225,15 @@ void KBabelView::spellCorrected(const TQString &orig, const TQString &word, unsi TQString marked=msgstrEdit->selectedText(); spell.origWords.append(marked); - if(marked.contains("\n") && !newWord.contains('\n')) + if(marked.tqcontains("\n") && !newWord.tqcontains('\n')) { TQString s1=newWord; - s1.replace(" ","\n"); + s1.tqreplace(" ","\n"); // if only a newline has been replaced with a white space if(s1==marked) { - newWord.replace(" "," \n"); + newWord.tqreplace(" "," \n"); } } @@ -4241,11 +4241,11 @@ void KBabelView::spellCorrected(const TQString &orig, const TQString &word, unsi // word has no accelerator, try to add the accelerator for // the same char else add in at the same position TQChar accelMarker=_catalog->miscSettings().accelMarker; - if(marked.contains(accelMarker) && !newWord.contains(accelMarker)) + if(marked.tqcontains(accelMarker) && !newWord.tqcontains(accelMarker)) { - int b=marked.find(accelMarker); + int b=marked.tqfind(accelMarker); TQChar accel=marked[b+1]; - int nb=newWord.find(accel,0,false); + int nb=newWord.tqfind(accel,0,false); if(nb>=0) { newWord.insert(nb,accelMarker); @@ -4379,7 +4379,7 @@ void KBabelView::spellCleanDone() // if the pointer is cleared, you have finished correcly if( !spell.kspell ) return; - KSpell::spellStatus status = spell.kspell->status(); + KSpell::spelltqStatus status = spell.kspell->status(); if(status == KSpell::Error || status == KSpell::Crashed) { @@ -4422,7 +4422,7 @@ void KBabelView::cancelSpellcheck() void KBabelView::spellAddIgnore(const TQString &word) { - if(!spell.ignoreList.contains(word)) + if(!spell.ignoreList.tqcontains(word)) { spell.newIgnoreList.append(word); } diff --git a/kbabel/kbabel/kbabelview.h b/kbabel/kbabel/kbabelview.h index be492548..8fecb9f0 100644 --- a/kbabel/kbabel/kbabelview.h +++ b/kbabel/kbabel/kbabelview.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -93,12 +93,13 @@ class TagListView; class KBabelView : public TQWidget, public KBabel::CatalogView { Q_OBJECT + TQ_OBJECT public: /** * Default constructor * @param buildLeds flag, if status leds should be created in editor */ - KBabelView(KBCatalog* catalog,KBabelMW *parent, KBabel::Project::Ptr project); + KBabelView(KBCatalog* catalog,KBabelMW *tqparent, KBabel::Project::Ptr project); /** * Destructor @@ -202,7 +203,7 @@ public slots: /** opens a filedialog and asks for an url */ void open(); - void open(const KURL& url, const TQString & package=TQString::null, bool checkModified=true, bool newView=false); + void open(const KURL& url, const TQString & package=TQString(), bool checkModified=true, bool newView=false); void setFilePackage(); void revertToSaved(); @@ -216,10 +217,10 @@ public slots: void textPaste(); bool findNext(); bool findPrev(); - void find(); + void tqfind(); void findInFile(TQCString fileSource, KBabel::FindOptions options); void replaceInFile(TQCString fileSource, KBabel::ReplaceOptions options); - void replace(); + void tqreplace(); void selectAll(); void deselectAll(); void clear(); @@ -267,7 +268,7 @@ public slots: void skipToTagFromTool(int index); void wordCount(); - void removeFuzzyStatus(); + void removeFuzzytqStatus(); /** opens the header editor for the po-file */ void editHeader(); @@ -450,7 +451,7 @@ protected slots: private slots: void msgstrPluralFormChanged (uint index); - void autoRemoveFuzzyStatus(); + void autoRemoveFuzzytqStatus(); /** connected to the catalog. it is called when a new file is opened*/ void newFileOpened(bool readOnly); @@ -469,13 +470,13 @@ private slots: */ void replaceNext(); /** - * called from a signal from ReplaceDialog to replace + * called from a signal from ReplaceDialog to tqreplace * all without asking anymore. */ void replaceAll(); /** * called from a signal from ReplaceDialog to go to next - * string to replace + * string to tqreplace */ void findNextReplace(); diff --git a/kbabel/kbabel/kbabelview2.cpp b/kbabel/kbabel/kbabelview2.cpp index 101674a3..7b700390 100644 --- a/kbabel/kbabel/kbabelview2.cpp +++ b/kbabel/kbabel/kbabelview2.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -203,7 +203,7 @@ void KBabelView::updateTags() { TQString s = *it; if( s.startsWith("&") ) s = "&"+s; - if(!tList.contains(s)) + if(!tList.tqcontains(s)) { _tagsMenu->insertItem(s,counter); tList.append(s); @@ -297,7 +297,7 @@ void KBabelView::modifyMsgstrText(const uint offset, const TQString& text, bool void KBabelView::insertTag(int n) { TQString tag = _tagsMenu->text(n); - if( tag.startsWith( "&&" ) ) tag = tag.remove(0,1); // replace && -> &. && is used for correct menu display + if( tag.startsWith( "&&" ) ) tag = tag.remove(0,1); // tqreplace && -> &. && is used for correct menu display modifyMsgstrText( msgstrEdit->currentIndex(), tag ); } @@ -331,10 +331,10 @@ void KBabelView::insertNextTagMsgid() if( _catalog->pluralForm( _currentIndex ) == KDESpecific ) { int pos = msgstrEdit->currentIndex(); - int currentFormBegin=s.findRev("\\n",pos); + int currentFormBegin=s.tqfindRev("\\n",pos); if( currentFormBegin == -1 ) currentFormBegin=0; else currentFormBegin+=3; // skip the newline - int currentFormEnd=s.find("\\n",pos); + int currentFormEnd=s.tqfind("\\n",pos); if( currentFormEnd == -1 ) currentFormEnd=s.length(); s=s.mid(currentFormBegin,currentFormEnd-currentFormBegin); @@ -382,7 +382,7 @@ void KBabelView::updateArgs() for(it=_args.begin(); it!=_args.end(); ++it) { TQString s = *it; - if(!tList.contains(s)) + if(!tList.tqcontains(s)) { _argsMenu->insertItem(s,counter); tList.append(s); @@ -427,10 +427,10 @@ void KBabelView::insertNextArg() if( _catalog->pluralForm( _currentIndex ) == KDESpecific ) { int pos = msgstrEdit->currentIndex(); - int currentFormBegin=s.findRev("\\n",pos); + int currentFormBegin=s.tqfindRev("\\n",pos); if( currentFormBegin == -1 ) currentFormBegin=0; else currentFormBegin+=3; // skip the newline - int currentFormEnd=s.find("\\n",pos); + int currentFormEnd=s.tqfind("\\n",pos); if( currentFormEnd == -1 ) currentFormEnd=s.length(); s=s.mid(currentFormBegin,currentFormEnd-currentFormBegin); @@ -537,7 +537,7 @@ void KBabelView::diffInternal(bool autoDf) KMessageBox::sorry(this ,i18n("An error occurred while trying to get the list " "of messages for this file from the database:\n" - "%1").arg(error)); + "%1").tqarg(error)); _diffing=false; _diffEnabled=false; @@ -709,7 +709,7 @@ bool KBabelView::openDiffFile(bool autoDiff) connect(&cat,TQT_SIGNAL(signalProgress(int)),this,TQT_SIGNAL(signalProgress(int))); emit signalResetProgressBar(i18n("loading file for diff"),100); - ConversionStatus stat = cat.openURL(url); + ConversiontqStatus stat = cat.openURL(url); emit signalClearProgressBar(); @@ -722,40 +722,40 @@ bool KBabelView::openDiffFile(bool autoDiff) { KMessageBox::sorry(this ,i18n("Error while trying to read file:\n %1\n" - "Maybe it is not a valid PO file.").arg(url.prettyURL())); + "Maybe it is not a valid PO file.").tqarg(url.prettyURL())); break; } case NO_PERMISSIONS: { KMessageBox::sorry(this,i18n( "You do not have permissions to read file:\n %1") - .arg(url.prettyURL())); + .tqarg(url.prettyURL())); break; } case NO_FILE: { KMessageBox::sorry(this,i18n( "You have not specified a valid file:\n %1") - .arg(url.prettyURL())); + .tqarg(url.prettyURL())); break; } case NO_PLUGIN: { KMessageBox::error(this,i18n( - "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").arg(url.prettyURL())); + "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").tqarg(url.prettyURL())); break; } case UNSUPPORTED_TYPE: { KMessageBox::error(this,i18n( - "The import plugin cannot handle this type of the file:\n %1").arg(url.prettyURL())); + "The import plugin cannot handle this type of the file:\n %1").tqarg(url.prettyURL())); break; } default: { KMessageBox::sorry(this,i18n( "Error while trying to open file:\n %1") - .arg(url.prettyURL())); + .tqarg(url.prettyURL())); break; } @@ -802,12 +802,12 @@ void KBabelView::showTryLaterMessageBox() "However, the string might be found " "in the files being searched at the moment.\n" "Please try later."), contents); - label2->setAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak ); - label2->setMinimumSize(label2->sizeHint()); + label2->tqsetAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::ExpandTabs | TQt::WordBreak ); + label2->setMinimumSize(label2->tqsizeHint()); lay->add( label2 ); lay->addStretch(1); - TQCheckBox *checkbox = new TQCheckBox(i18n("Do not show in this find/replace session again"), topcontents); + TQCheckBox *checkbox = new TQCheckBox(i18n("Do not show in this tqfind/replace session again"), topcontents); dialog->setMainWidget(topcontents); dialog->enableButtonSeparator(false); @@ -822,7 +822,7 @@ void KBabelView::showTryLaterMessageBox() void KBabelView::setFilePackage() { bool result=false; - TQString p = KInputDialog::getText(TQString::null, i18n("Enter new package for the current file:"),_catalog->package(),&result,this); + TQString p = KInputDialog::getText(TQString(), i18n("Enter new package for the current file:"),_catalog->package(),&result,this); if( result ) { _catalog->setPackage(p); @@ -904,10 +904,10 @@ void KBabelView::plural2msgstr() case KDESpecific: { pos = msgstrEdit->currentIndex(); - currentFormBegin=text.findRev("\\n",pos); + currentFormBegin=text.tqfindRev("\\n",pos); if( currentFormBegin == -1 ) currentFormBegin=0; else currentFormBegin+=3; // skip the newline - currentFormEnd=text.find("\\n",pos); + currentFormEnd=text.tqfind("\\n",pos); if( currentFormEnd == -1 ) currentFormEnd=text.length(); text=text.mid(currentFormBegin,currentFormEnd-currentFormBegin); @@ -1020,6 +1020,6 @@ void KBabelView::wordCount() KMessageBox::information( this , i18n("Total words: %1\n\n" "Words in untranslated messages: %2\n\n" -"Words in fuzzy messages: %3").arg(total).arg(untranslated).arg(fuzzy) +"Words in fuzzy messages: %3").tqarg(total).tqarg(untranslated).tqarg(fuzzy) , i18n("Word Count") ); } diff --git a/kbabel/kbabel/kbbookmarkhandler.cpp b/kbabel/kbabel/kbbookmarkhandler.cpp index 2685905b..4d3f0a37 100644 --- a/kbabel/kbabel/kbbookmarkhandler.cpp +++ b/kbabel/kbabel/kbbookmarkhandler.cpp @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -48,12 +48,12 @@ KBabelBookmark::KBabelBookmark(int msgindex, TQString msgtext) } // insert one '&' before every consecutive group of ampersands to keep the - // first of these from acting either as accelerator or mask in the menu + // first of these from acting either as accelerator or tqmask in the menu TQRegExp rx("&+"); - int pos = msgtext.find(rx); + int pos = msgtext.tqfind(rx); while (pos >= 0) { msgtext.insert(pos, '&'); - pos = msgtext.find(rx, pos + rx.matchedLength() + 1); + pos = msgtext.tqfind(rx, pos + rx.matchedLength() + 1); } _msgtext = msgtext; @@ -94,7 +94,7 @@ void KBabelBookmarkHandler::addBookmark(KBabelBookmark* b) // if it's okay then add the bookmark _list.append(b); - _menu->insertItem(TQString("#%1 - %2").arg(b->msgindex()).arg(b->msgtext()), + _menu->insertItem(TQString("#%1 - %2").tqarg(b->msgindex()).tqarg(b->msgtext()), this, TQT_SIGNAL(signalBookmarkSelected(int)), 0, b->msgindex()); } diff --git a/kbabel/kbabel/kbbookmarkhandler.h b/kbabel/kbabel/kbbookmarkhandler.h index 3f4987f2..5de46cb1 100644 --- a/kbabel/kbabel/kbbookmarkhandler.h +++ b/kbabel/kbabel/kbbookmarkhandler.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -85,9 +85,10 @@ class KBabelBookmark /** * Simple class for managing bookmarks in KBabel. */ -class KBabelBookmarkHandler : public QObject +class KBabelBookmarkHandler : public TQObject { Q_OBJECT + TQ_OBJECT public: /** diff --git a/kbabel/kbabel/kbcatalog.cpp b/kbabel/kbabel/kbcatalog.cpp index 4c4e269a..933df9de 100644 --- a/kbabel/kbabel/kbcatalog.cpp +++ b/kbabel/kbabel/kbcatalog.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -35,8 +35,8 @@ #include "headereditor.h" -KBCatalog::KBCatalog(TQString configFile, TQObject* parent, const char* name) - : KBabel::Catalog(parent,name,configFile) +KBCatalog::KBCatalog(TQString configFile, TQObject* tqparent, const char* name) + : KBabel::Catalog(tqparent,name,configFile) { _headerEditor=0; } diff --git a/kbabel/kbabel/kbcatalog.h b/kbabel/kbabel/kbcatalog.h index 2c2846d4..9911180b 100644 --- a/kbabel/kbabel/kbcatalog.h +++ b/kbabel/kbabel/kbcatalog.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -46,9 +46,10 @@ class HeaderEditor; class KBCatalog : public KBabel::Catalog { Q_OBJECT + TQ_OBJECT public: - KBCatalog(TQString configFile = TQString::null ,TQObject* parent=0, const char* name=0); + KBCatalog(TQString configFile = TQString() ,TQObject* tqparent=0, const char* name=0); virtual ~KBCatalog(); HeaderEditor* headerEditor(); diff --git a/kbabel/kbabel/kbcataloglistview.cpp b/kbabel/kbabel/kbcataloglistview.cpp index e04da3c2..40fb29e8 100644 --- a/kbabel/kbabel/kbcataloglistview.cpp +++ b/kbabel/kbabel/kbcataloglistview.cpp @@ -34,11 +34,11 @@ using namespace KBabel; -KBCatalogListView::KBCatalogListView(KBCatalog* catalog, TQWidget *parent, KBabel::Project::Ptr project) - : TQWidget(parent) +KBCatalogListView::KBCatalogListView(KBCatalog* catalog, TQWidget *tqparent, KBabel::Project::Ptr project) + : TQWidget(tqparent) { m_catalog= catalog; - TQVBoxLayout* layout=new TQVBoxLayout(this); + TQVBoxLayout* tqlayout=new TQVBoxLayout(this); m_listview = new KListView(this, "catalogListView"); m_listview->addColumn(i18n("Id")); @@ -49,8 +49,8 @@ KBCatalogListView::KBCatalogListView(KBCatalog* catalog, TQWidget *parent, KBabe m_listview->setAllColumnsShowFocus(true); m_listview->resize(this->size()); - layout->addWidget(m_listview); - layout->setStretchFactor(m_listview,1); + tqlayout->addWidget(m_listview); + tqlayout->setStretchFactor(m_listview,1); connect(m_listview,TQT_SIGNAL(selectionChanged(TQListViewItem *)), this,TQT_SLOT(selectionChanged(TQListViewItem *))); } @@ -63,7 +63,7 @@ KBCatalogListView::~KBCatalogListView() void KBCatalogListView::selectionChanged ( TQListViewItem * item) { DocPosition pos; - int number = m_items->find(reinterpret_cast<KBCatalogListViewItem*>(item)); + int number = m_items->tqfind(reinterpret_cast<KBCatalogListViewItem*>(item)); if(number<0) number = 0; pos.item=number; diff --git a/kbabel/kbabel/kbcataloglistview.h b/kbabel/kbabel/kbcataloglistview.h index c2c46bdf..53e7327a 100644 --- a/kbabel/kbabel/kbcataloglistview.h +++ b/kbabel/kbabel/kbcataloglistview.h @@ -50,8 +50,9 @@ class KListView; class KBCatalogListView : public TQWidget, public KBabel::CatalogView { Q_OBJECT + TQ_OBJECT public: - KBCatalogListView(KBCatalog* catalog, TQWidget *parent, KBabel::Project::Ptr project); + KBCatalogListView(KBCatalog* catalog, TQWidget *tqparent, KBabel::Project::Ptr project); ~KBCatalogListView(); diff --git a/kbabel/kbabel/kbcataloglistviewitem.cpp b/kbabel/kbabel/kbcataloglistviewitem.cpp index 4bbc3049..1889e518 100644 --- a/kbabel/kbabel/kbcataloglistviewitem.cpp +++ b/kbabel/kbabel/kbcataloglistviewitem.cpp @@ -23,8 +23,8 @@ #include "kbcataloglistviewitem.h" #include <assert.h> -KBCatalogListViewItem::KBCatalogListViewItem(KListView* lv, KListViewItem* parent, uint id, TQString msgid, TQString msgstr) - : Super(lv, parent, "","",""), m_id(id), m_msgid(msgid), m_msgstr(msgstr) +KBCatalogListViewItem::KBCatalogListViewItem(KListView* lv, KListViewItem* tqparent, uint id, TQString msgid, TQString msgstr) + : Super(lv, tqparent, "","",""), m_id(id), m_msgid(msgid), m_msgstr(msgstr) { setText(0,TQString::number(id)); } @@ -38,14 +38,14 @@ void KBCatalogListViewItem::setMsgId(const TQString& st) { m_msgid = st; setup(); - repaint(); + tqrepaint(); } void KBCatalogListViewItem::setMsgStr(const TQString& st) { m_msgstr = st; setup(); - repaint(); + tqrepaint(); } uint KBCatalogListViewItem::getId() @@ -57,7 +57,7 @@ void KBCatalogListViewItem::setId(const uint id) { m_id = id; setup(); - repaint(); + tqrepaint(); } TQString KBCatalogListViewItem::key ( int column, bool ascending ) const{ @@ -205,9 +205,9 @@ TQString KBCatalogListViewItem::formatMsg(const TQString str) { // TODO: Use KBHighlighting for this TQString tmp_msgid = str; - tmp_msgid = tmp_msgid.replace( "\\n", "<br>" ); - tmp_msgid = tmp_msgid.replace( "<", "<" ); - tmp_msgid = tmp_msgid.replace( ">", ">" ); + tmp_msgid = tmp_msgid.tqreplace( "\\n", "<br>" ); + tmp_msgid = tmp_msgid.tqreplace( "<", "<" ); + tmp_msgid = tmp_msgid.tqreplace( ">", ">" ); return tmp_msgid; } diff --git a/kbabel/kbabel/kbcataloglistviewitem.h b/kbabel/kbabel/kbcataloglistviewitem.h index 4a24c159..16353c70 100644 --- a/kbabel/kbabel/kbcataloglistviewitem.h +++ b/kbabel/kbabel/kbcataloglistviewitem.h @@ -34,7 +34,7 @@ class KBCatalogListViewItem : public KListViewItem { typedef KListViewItem Super; public: - KBCatalogListViewItem(KListView* lv, KListViewItem* parent, uint id, TQString msgid, TQString msgstr); + KBCatalogListViewItem(KListView* lv, KListViewItem* tqparent, uint id, TQString msgid, TQString msgstr); ~KBCatalogListViewItem(); diff --git a/kbabel/kbabel/kbcatalogview.cpp b/kbabel/kbabel/kbcatalogview.cpp index ae701c4e..fc7898f7 100644 --- a/kbabel/kbabel/kbcatalogview.cpp +++ b/kbabel/kbabel/kbcatalogview.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -36,8 +36,8 @@ using namespace KBabel; -KBCatalogView::KBCatalogView(KBCatalog* catalog, TQWidget* parent, Project::Ptr project) - : TQWidget (parent), KBabel::CatalogView () , _project (project) +KBCatalogView::KBCatalogView(KBCatalog* catalog, TQWidget* tqparent, Project::Ptr project) + : TQWidget (tqparent), KBabel::CatalogView () , _project (project) { if (catalog == 0) kdFatal(KBABEL) << "catalog==0" << endl; diff --git a/kbabel/kbabel/kbcatalogview.h b/kbabel/kbabel/kbcatalogview.h index 355e2a4c..33cf8904 100644 --- a/kbabel/kbabel/kbcatalogview.h +++ b/kbabel/kbabel/kbcatalogview.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -43,11 +43,12 @@ class KBCatalogView : public TQWidget, public KBabel::CatalogView { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - KBCatalogView(KBCatalog* catalog, TQWidget* parent, KBabel::Project::Ptr project); + KBCatalogView(KBCatalog* catalog, TQWidget* tqparent, KBabel::Project::Ptr project); /** * Destructor diff --git a/kbabel/kbabel/kbcharselect.cpp b/kbabel/kbabel/kbcharselect.cpp index 8dd87bcc..b2719386 100644 --- a/kbabel/kbabel/kbcharselect.cpp +++ b/kbabel/kbabel/kbcharselect.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -41,8 +41,8 @@ #include <tqspinbox.h> #include <tqscrollview.h> -KBCharSelect::KBCharSelect(TQWidget* parent,const char* name) - : TQVBox(parent,name) +KBCharSelect::KBCharSelect(TQWidget* tqparent,const char* name) + : TQVBox(tqparent,name) { setSpacing( KDialog::spacingHint() ); diff --git a/kbabel/kbabel/kbcharselect.h b/kbabel/kbabel/kbcharselect.h index 83de635d..a13071bf 100644 --- a/kbabel/kbabel/kbcharselect.h +++ b/kbabel/kbabel/kbcharselect.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -39,11 +39,12 @@ class KConfig; class KCharSelectTable; class TQSpinBox; -class KBCharSelect : public QVBox +class KBCharSelect : public TQVBox { Q_OBJECT + TQ_OBJECT public: - KBCharSelect(TQWidget* parent, const char* name=0); + KBCharSelect(TQWidget* tqparent, const char* name=0); void saveSettings(KConfig* config); void restoreSettings(KConfig* config); diff --git a/kbabel/kbabel/kbhighlighting.cpp b/kbabel/kbabel/kbhighlighting.cpp index 3d555d7b..f4109a34 100644 --- a/kbabel/kbabel/kbhighlighting.cpp +++ b/kbabel/kbabel/kbhighlighting.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -98,7 +98,7 @@ void KBabelHighlighter::highlight( ) // create a single line out of the text: remove "\n", so that we only // have to deal with one single line of text. TQString text = _edit->text( ); - text.replace( "\n", "" ); + text.tqreplace( "\n", "" ); TQRegExp rx; int pos; @@ -107,10 +107,10 @@ void KBabelHighlighter::highlight( ) { for ( uint i = 0; i < regexps.count( ); ++i ) { rx.setPattern( regexps[i] ); - pos = text.find( rx ); + pos = text.tqfind( rx ); while ( pos >= 0 ) { doHighlighting( (HighlightType)(i+1), pos, rx.matchedLength( ) ); - pos = text.find( rx, pos + rx.matchedLength( ) ); + pos = text.tqfind( rx, pos + rx.matchedLength( ) ); } } } @@ -223,7 +223,7 @@ void KBabelHighlighter::flushCurrentWord() currentPos += tags.matchedLength(); } - currentWord.replace ( tags, "" ); + currentWord.tqreplace ( tags, "" ); if (!currentWord.isEmpty()) { bool isPlainWord = true; @@ -251,7 +251,7 @@ bool KBabelHighlighter::isMisspelled(const TQString& wordRaw) // word first. TQString word = wordRaw; kdDebug(KBABEL) << "isampersand: checking (raw):" << word << endl; - word.replace("&", "" ); + word.tqreplace("&", "" ); kdDebug(KBABEL) << "isMisspelled: checking: " << word << endl; // Normally isMisspelled would look up a dictionary and return @@ -266,7 +266,7 @@ bool KBabelHighlighter::isMisspelled(const TQString& wordRaw) // there is no 'spelt correctly' signal so default to Okay kdDebug(KBABEL) << "Adding word " << word << endl; - dict.replace(word, Okay); + dict.tqreplace(word, Okay); mSpell->checkWord(word, false); return false; } @@ -275,7 +275,7 @@ void KBabelHighlighter::slotMisspelling(const TQString & originalword, const TQStringList & suggestions, unsigned int) { kdDebug(KBABEL) << "Misspelled " << originalword << ", " << suggestions << endl; - dict.replace( originalword, NotOkay ); + dict.tqreplace( originalword, NotOkay ); // this is slow but since kspell is async this will have to do for now highlight(); diff --git a/kbabel/kbabel/kbhighlighting.h b/kbabel/kbabel/kbhighlighting.h index 3f202d99..f028e029 100644 --- a/kbabel/kbabel/kbhighlighting.h +++ b/kbabel/kbabel/kbhighlighting.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -47,9 +47,10 @@ class TQColor; class TQString; class TQTextEdit; -class KBabelHighlighter : public QObject +class KBabelHighlighter : public TQObject { Q_OBJECT + TQ_OBJECT public: enum HighlightType { diff --git a/kbabel/kbabel/main.cpp b/kbabel/kbabel/main.cpp index 5758d563..5d771fdc 100644 --- a/kbabel/kbabel/main.cpp +++ b/kbabel/kbabel/main.cpp @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -187,7 +187,7 @@ int KBabelApp::newInstance() widget->show(); for (int i=0; i < args->count(); i++) { - widget->open( args->url(i) , TQString::null, i != 0 ); + widget->open( args->url(i) , TQString(), i != 0 ); } kdDebug () << "Resuming DCOP" << endl; @@ -242,7 +242,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int KBabelMW *kb = KBabelMW::winForURL(u,project); if(kb) { - KWin::activateWindow(kb->topLevelWidget()->winId()); + KWin::activateWindow(kb->tqtopLevelWidget()->winId()); } else { @@ -255,7 +255,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int if( mw->inherits("KBabelMW") && mw->winId() == window) { kb = static_cast<KBabelMW*>(mw); - KWin::activateWindow(kb->topLevelWidget()->winId()); + KWin::activateWindow(kb->tqtopLevelWidget()->winId()); kb->open(u, TQString::fromUtf8(package),newWindow); kdDebug () << "Resuming DCOP" << endl; @@ -272,7 +272,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int { // here, we don't care about "open in new window", because // it's empty - KWin::setActiveWindow(kb->topLevelWidget()->winId()); + KWin::setActiveWindow(kb->tqtopLevelWidget()->winId()); kb->projectOpen(projectFile); kb->open(u,TQString::fromUtf8(package),false); @@ -289,7 +289,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int if( mw->inherits("KBabelMW") && static_cast<KBabelMW*>(mw)->project()==project) { kb = static_cast<KBabelMW*>(mw); - KWin::activateWindow(kb->topLevelWidget()->winId()); + KWin::activateWindow(kb->tqtopLevelWidget()->winId()); kb->open(u, TQString::fromUtf8(package),newWindow); kdDebug () << "Resuming DCOP" << endl; @@ -305,7 +305,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int kb = new KBabelMW(project); kb->show(); } else kb = static_cast<KBabelMW*>(mw); - KWin::activateWindow(kb->topLevelWidget()->winId()); + KWin::activateWindow(kb->tqtopLevelWidget()->winId()); kb->open(u,TQString::fromUtf8(package),newWindow); } @@ -331,7 +331,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam KBabelMW *kb = KBabelMW::winForURL(u, project); if(kb) { - KWin::activateWindow(kb->topLevelWidget()->winId()); + KWin::activateWindow(kb->tqtopLevelWidget()->winId()); } else { @@ -342,7 +342,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam if(mw && mw->inherits("KBabelMW") && static_cast<KBabelMW*>(mw)->project()==project) { kb = static_cast<KBabelMW*>(mw); - KWin::activateWindow(kb->topLevelWidget()->winId()); + KWin::activateWindow(kb->tqtopLevelWidget()->winId()); kb->projectOpen(projectFile); kb->openTemplate(t,u,TQString::fromUtf8(package),newWindow); } @@ -350,7 +350,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam { kb = new KBabelMW(project); kb->show(); - KWin::activateWindow(kb->topLevelWidget()->winId()); + KWin::activateWindow(kb->tqtopLevelWidget()->winId()); kb->openTemplate(t,u,TQString::fromUtf8(package)); } } @@ -505,7 +505,7 @@ KBabelMW* KBabelInterface::findInstance( const KURL& url, const TQString& projec if(kb) { - KWin::activateWindow(kb->topLevelWidget()->winId()); + KWin::activateWindow(kb->tqtopLevelWidget()->winId()); } } @@ -555,7 +555,7 @@ int main(int argc, char **argv) about.addAuthor("Andrea Rizzi",I18N_NOOP("Wrote the dictionary plugin " "for searching in a database and some other code.") ,"rizzi@kde.org"); - about.addAuthor("Stanislav Visnovsky",I18N_NOOP("Current maintainer, porting to KDE3/Qt3.") + about.addAuthor("Stanislav Visnovsky",I18N_NOOP("Current maintainer, porting to KDE3/TQt3.") ,"visnovsky@kde.org"); about.addAuthor("Marco Wegner",I18N_NOOP("Bug fixes, KFilePlugin for PO files, CVS support, mailing files") ,"dubbleu@web.de"); @@ -578,7 +578,7 @@ int main(int argc, char **argv) about.addCredit("SuSE GmbH" ,I18N_NOOP("Sponsored development of KBabel for a while.") ,"suse@suse.de","http://www.suse.de"); - about.addCredit("Trolltech", I18N_NOOP("KBabel contains code from Qt"), 0, "http://www.trolltech.com"); + about.addCredit("Trolltech", I18N_NOOP("KBabel contains code from TQt"), 0, "http://www.trolltech.com"); about.addCredit("Eva Brucherseifer", I18N_NOOP("String distance algorithm implementation"), "eva@kde.org"); diff --git a/kbabel/kbabel/mymultilineedit.cpp b/kbabel/kbabel/mymultilineedit.cpp index 9b7913d1..29a8da78 100644 --- a/kbabel/kbabel/mymultilineedit.cpp +++ b/kbabel/kbabel/mymultilineedit.cpp @@ -25,11 +25,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -49,7 +49,7 @@ #include <tqclipboard.h> #include <tqapplication.h> #include <tqdragobject.h> -//#include <private/qrichtext_p.h> +//#include <private/tqrichtext_p.h> #include <tqpopupmenu.h> #include <kdebug.h> @@ -62,8 +62,8 @@ using namespace KBabel; -MyMultiLineEdit::MyMultiLineEdit(int ID, TQWidget* parent,const char* name) - :KTextEdit(parent,name), emitUndo(true), +MyMultiLineEdit::MyMultiLineEdit(int ID, TQWidget* tqparent,const char* name) + :KTextEdit(tqparent,name), emitUndo(true), _firstChangedLine(0), _lastChangedLine(0), _lastParagraph(0), @@ -75,7 +75,7 @@ MyMultiLineEdit::MyMultiLineEdit(int ID, TQWidget* parent,const char* name) { setUndoRedoEnabled(false); // we handle this ourselves setWordWrap( WidgetWidth ); - viewport()->setAcceptDrops( false ); // we need our parent to get drops + viewport()->setAcceptDrops( false ); // we need our tqparent to get drops connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT( onSelectionChanged() ) ); } @@ -120,7 +120,7 @@ void MyMultiLineEdit::processCommand(EditCommand* cmd, bool undo) TQPalette _visibleHighlight( palette() ); TQPalette _invisibleHighlight( palette() ); - TQColorGroup newcg( colorGroup() ); + TQColorGroup newcg( tqcolorGroup() ); newcg.setColor( TQColorGroup::HighlightedText, newcg.text() ); newcg.setColor( TQColorGroup::Highlight, newcg.base() ); if( hasFocus() ) _invisibleHighlight.setActive( newcg ); @@ -141,7 +141,7 @@ void MyMultiLineEdit::processCommand(EditCommand* cmd, bool undo) setCursorPosition( row, col ); _firstChangedLine=row; - if(delcmd->str.find("\n")>0 )_lastChangedLine=row+delcmd->str.contains("\n"); + if(delcmd->str.tqfind("\n")>0 )_lastChangedLine=row+delcmd->str.tqcontains("\n"); else _lastChangedLine=row; KTextEdit::insert( delcmd->str ); @@ -293,10 +293,10 @@ void MyMultiLineEdit::setText(const TQString& s) _lastParagraph=0; _lastParagraphOffset=0; // workaround, since insert does not interpret markup - setTextFormat( Qt::PlainText ); + setTextFormat( TQt::PlainText ); _firstChangedLine=_lastChangedLine=0; KTextEdit::setText(s); - setTextFormat( Qt::AutoText ); + setTextFormat( TQt::AutoText ); // now the number of lines is known, let's do highlight _lastChangedLine=paragraphs(); emit textChanged(); @@ -308,7 +308,7 @@ void MyMultiLineEdit::insertAt( const TQString & s, int line, int col, bool mark // it will invoke insert, don't need to send InsTextCmd KTextEdit::insertAt(s,line,col); - // code from QMultiLineEdit + // code from TQMultiLineEdit if( mark ) setSelection( line, col, line, col + s.length(), 0 ); // end of copied code @@ -355,14 +355,14 @@ void MyMultiLineEdit::insert( const TQString & text, bool indent, bool checkNewL emit signalUndoCmd( new EndCommand(-1,UndefPart)); } - int n=text.find("\n"); + int n=text.tqfind("\n"); if( n > 0 ) _lastChangedLine+=n; // setup palettes TQPalette _visibleHighlight( palette() ); TQPalette _invisibleHighlight( palette() ); - TQColorGroup newcg( colorGroup() ); + TQColorGroup newcg( tqcolorGroup() ); newcg.setColor( TQColorGroup::HighlightedText, newcg.text() ); newcg.setColor( TQColorGroup::Highlight, newcg.base() ); if( hasFocus() ) _invisibleHighlight.setActive( newcg ); @@ -546,8 +546,8 @@ void MyMultiLineEdit::offset2Pos(int offset, int ¶graph, int &index) const int MyMultiLineEdit::pos2Offset(uint paragraph, uint index) { - paragraph = QMAX( QMIN( (int)paragraph, paragraphs() - 1), 0 ); // Sanity check - index = QMAX( QMIN( (int)index, paragraphLength( paragraph )), 0 ); // Sanity check + paragraph = TQMAX( TQMIN( (int)paragraph, paragraphs() - 1), 0 ); // Sanity check + index = TQMAX( TQMIN( (int)index, paragraphLength( paragraph )), 0 ); // Sanity check { uint lastI; @@ -569,7 +569,7 @@ int MyMultiLineEdit::pos2Offset(uint paragraph, uint index) _lastParagraphOffset=tmp; _lastParagraph=paragraph; - tmp += QMIN( lastI, index ); + tmp += TQMIN( lastI, index ); return tmp; } @@ -592,27 +592,27 @@ void MyMultiLineEdit::setOverwriteMode( bool b ) } /*******************************************************************************/ -MsgMultiLineEdit::MsgMultiLineEdit(int ID, KSpell* spell, TQWidget* parent,const char* name) - :MyMultiLineEdit(ID, parent,name), +MsgMultiLineEdit::MsgMultiLineEdit(int ID, KSpell* spell, TQWidget* tqparent,const char* name) + :MyMultiLineEdit(ID, tqparent,name), _quotes(false), _cleverEditing(false), _highlightBg(false), _spacePoints(false), - _bgColor(colorGroup().base().dark(110)), + _bgColor(tqcolorGroup().base().dark(110)), _textColor(KGlobalSettings::textColor()), - _errorColor(Qt::red), + _errorColor(TQt::red), _currentColor(KGlobalSettings::textColor()), _whitespace(0), _hlSyntax(true), - _quoteColor(Qt::darkGreen), - _unquoteColor(Qt::red), - _cformatColor(Qt::blue), - _accelColor(Qt::darkMagenta), + _quoteColor(TQt::darkGreen), + _unquoteColor(TQt::red), + _cformatColor(TQt::blue), + _accelColor(TQt::darkMagenta), _showDiff(false), _diffUnderlineAdd(true), _diffStrikeOutDel(true), - _diffAddColor(Qt::darkGreen), - _diffDelColor(Qt::darkRed), + _diffAddColor(TQt::darkGreen), + _diffDelColor(TQt::darkRed), _currentUnicodeNumber(0), highlighter(0), _tagStartPara(0), _tagStartIndex(0), _tagEndPara(0), _tagEndIndex(0) @@ -661,7 +661,7 @@ void MsgMultiLineEdit::setText(const TQString& s) if(_showDiff) { diffPos.clear(); - int lines = s.contains('\n'); + int lines = s.tqcontains('\n'); diffPos.resize(lines+1); TQStringList lineList = TQStringList::split('\n',s,true); @@ -689,7 +689,7 @@ void MsgMultiLineEdit::setText(const TQString& s) } else { - addPos = (*it).find("<KBABELADD>",lastPos); + addPos = (*it).tqfind("<KBABELADD>",lastPos); } if(haveDel && multiline) @@ -698,7 +698,7 @@ void MsgMultiLineEdit::setText(const TQString& s) } else { - delPos = (*it).find("<KBABELDEL>",lastPos); + delPos = (*it).tqfind("<KBABELDEL>",lastPos); } if(delPos >= 0 && addPos >= 0) @@ -741,7 +741,7 @@ void MsgMultiLineEdit::setText(const TQString& s) (*it).remove(addPos,11); } - int endPos = (*it).find("</KBABELADD>",addPos); + int endPos = (*it).tqfind("</KBABELADD>",addPos); if(endPos < 0) { endPos = (*it).length(); @@ -768,7 +768,7 @@ void MsgMultiLineEdit::setText(const TQString& s) (*it).remove(delPos,11); } - int endPos = (*it).find("</KBABELDEL>",delPos); + int endPos = (*it).tqfind("</KBABELDEL>",delPos); if(endPos < 0) { endPos = (*it).length(); @@ -805,9 +805,9 @@ void MsgMultiLineEdit::setText(const TQString& s) } TQRegExp reg("</?KBABELADD>"); - str.replace(reg,""); + str.tqreplace(reg,""); reg.setPattern("</?KBABELDEL>"); - str.replace(reg,""); + str.tqreplace(reg,""); } MyMultiLineEdit::setText(str); @@ -882,10 +882,10 @@ void MsgMultiLineEdit::setFont(const TQFont& font) // we don't need to calculate a special offset for non-breaking space, since // they are very similar in size TQFontMetrics fm(font); - _wsOffsetX = QMAX(fm.width(' ')/2-2,1); - _wsOffsetY = QMAX(fm.height()/2-1,0); + _wsOffsetX = TQMAX(fm.width(' ')/2-2,1); + _wsOffsetY = TQMAX(fm.height()/2-1,0); - repaint(); + tqrepaint(); } void MsgMultiLineEdit::setDiffDisplayMode(bool addUnderline, bool delStrikeOut) @@ -910,7 +910,7 @@ void MsgMultiLineEdit::setDiffColors(const TQColor& addColor void MsgMultiLineEdit::setTextColor(const TQColor &color ) { TQPalette p( palette() ); - TQColorGroup newcg( colorGroup() ); + TQColorGroup newcg( tqcolorGroup() ); newcg.setColor( TQColorGroup::Text, color ); if( hasFocus() ) p.setActive( newcg ); else p.setInactive( newcg ); @@ -989,15 +989,15 @@ void MsgMultiLineEdit::paintSpacePoints() if ( paragraphRect( curpara ).top() > contentsY()+visibleHeight()) break; const TQString& s = text(curpara); - int i = s.find( " " ); + int i = s.tqfind( " " ); while( (i >= 0) && (i < (int)s.length()-1) ) // -1 because text will end by EOLN { - TQPixmap* pm = ( s.at(i).unicode() == 0x00A0U ) ? wsnb : ws; + TQPixmap* pm = ( s.at(i).tqunicode() == 0x00A0U ) ? wsnb : ws; TQRect r = mapToView( curpara, i ); r.moveBy( r.width()/2, (r.height() - fm.descent())/2 ); r.moveBy( -pm->rect().width()/2, -pm->rect().height()/2-1 ); - bitBlt(viewport(), r.topLeft(), pm, pm->rect(), Qt::CopyROP); - i = s.find( " ", i+1 ); + bitBlt(viewport(), r.topLeft(), pm, pm->rect(), TQt::CopyROP); + i = s.tqfind( " ", i+1 ); } ++curpara; } @@ -1015,7 +1015,7 @@ void MsgMultiLineEdit::paintSpacePoints() painter.drawText( TQPoint( 0, mapToView( curpara, 0 ).top()) + TQPoint(0, qs.height() + 4), "\""); // 4 = hardcoded margin in QT - painter.drawText( mapToView( curpara, QMAX( 0, + painter.drawText( mapToView( curpara, TQMAX( 0, ((int)text( curpara ).length())-1)).topRight() + TQPoint(0, qs.height() + 4), "\""); // 4 = hardcoded margin in QT } @@ -1025,7 +1025,7 @@ void MsgMultiLineEdit::paintSpacePoints() { if( paragraphs() == (int)diffPos.size() ) // sanity check { - painter.setRasterOp( Qt::AndROP ); + painter.setRasterOp( TQt::AndROP ); for( int curpara = paranum; curpara < paragraphs() ; curpara++ ) { r = paragraphRect(curpara); @@ -1141,10 +1141,10 @@ void MsgMultiLineEdit::paintSpacePoints() } } -void MsgMultiLineEdit::repaint() +void MsgMultiLineEdit::tqrepaint() { highlight(); - MyMultiLineEdit::repaint(); + MyMultiLineEdit::tqrepaint(); } void MsgMultiLineEdit::forceUpdate() @@ -1152,7 +1152,7 @@ void MsgMultiLineEdit::forceUpdate() _firstChangedLine=0; _lastChangedLine=paragraphs()-1; highlighter->highlight(); - MyMultiLineEdit::repaint(); + MyMultiLineEdit::tqrepaint(); } void MsgMultiLineEdit::ensureCursorVisible() @@ -1167,7 +1167,7 @@ void MsgMultiLineEdit::highlight() TQColor bg; if( _highlightBg ) bg = _bgColor; - else bg = colorGroup().base(); + else bg = tqcolorGroup().base(); for( int i = 0 ; i < paragraphs() ; i++ ) setParagraphBackgroundColor( i, bg ); @@ -1188,7 +1188,7 @@ void MsgMultiLineEdit::highlight() TQRegExp markup("(\\\\)|(\")|(\\\\[abfnrtv'\"\?\\\\])|(\\\\\\d+)|(\\\\x[\\dabcdef]+)" "|(%[\\ddioxXucsfeEgGphln]+)|(&[^\\s])|(&[\\w-]+;)"); - for( i = QMAX(_firstChangedLine,0) ; i < QMIN(_lastChangedLine+1,(uint)paragraphs()) ; i++ ) { + for( i = TQMAX(_firstChangedLine,0) ; i < TQMIN(_lastChangedLine+1,(uint)paragraphs()) ; i++ ) { TQString line=text(i); @@ -1252,7 +1252,7 @@ void MsgMultiLineEdit::highlight() { TQColor c; TQFont f; - VerticalAlignment v; + Qt::VerticalAlignment v; getFormat(_firstChangedLine-1, paragraphLength(_firstChangedLine-1)-1, &f, &c, &v); TQString l = text(_firstChangedLine-1); if( c==_tagColor && !l.endsWith(">") ) // hope _tagColor will be different than other colors @@ -1522,7 +1522,7 @@ void MsgMultiLineEdit::keyPressEvent(TQKeyEvent *e) { TQString spclChars="abfnrtv'\"?\\"; if(col < (int)str.length()-1 - && spclChars.contains(str.at(col+1))) + && spclChars.tqcontains(str.at(col+1))) { del(); } @@ -1548,7 +1548,7 @@ void MsgMultiLineEdit::keyPressEvent(TQKeyEvent *e) TQString str=text(row); TQString spclChars="abfnrtv'\"?\\"; - if(!str.isEmpty() && col > 0 && spclChars.contains(str.at(col-1))) + if(!str.isEmpty() && col > 0 && spclChars.tqcontains(str.at(col-1))) { if(col > 1 && str.at(col-2)=='\\' && !isMasked(&str,col-2)) { diff --git a/kbabel/kbabel/mymultilineedit.h b/kbabel/kbabel/mymultilineedit.h index 624e5e4c..10592b0c 100644 --- a/kbabel/kbabel/mymultilineedit.h +++ b/kbabel/kbabel/mymultilineedit.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -50,8 +50,9 @@ class TQPixmap; class MyMultiLineEdit : public KTextEdit { Q_OBJECT + TQ_OBJECT public: - MyMultiLineEdit(int ID,TQWidget* parent,const char* name=0); + MyMultiLineEdit(int ID,TQWidget* tqparent,const char* name=0); /** applies cmd to the displayed text, but does not emit @@ -129,7 +130,7 @@ protected: virtual TQPopupMenu *createPopupMenu(); virtual TQPopupMenu *createPopupMenu(const TQPoint &pos); - /* the parent handles this */ + /* the tqparent handles this */ virtual void wheelEvent(TQWheelEvent*); bool emitUndo; @@ -173,10 +174,11 @@ private: class MsgMultiLineEdit : public MyMultiLineEdit { Q_OBJECT + TQ_OBJECT public: enum TextColor { NormalColor, ErrorColor }; - MsgMultiLineEdit(int ID, KSpell* spell=0, TQWidget* parent=0,const char* name=0); + MsgMultiLineEdit(int ID, KSpell* spell=0, TQWidget* tqparent=0,const char* name=0); virtual ~MsgMultiLineEdit(); /** is displaying surrounding quotes enabled? */ @@ -227,7 +229,7 @@ public slots: /** * reimplemented to call highlight() */ - void repaint(); + void tqrepaint(); void forceUpdate(); void emittedTextChanged(); @@ -251,7 +253,7 @@ private: TQRect mapToView( int para, int index ); /** - * tests if the character in string str at position col is masked with + * tests if the character in string str at position col is tqmasked with * '\' by counting the number of '\' backwards */ static bool isMasked(TQString *str,uint col); diff --git a/kbabel/kbabel/searchpreferences.ui b/kbabel/kbabel/searchpreferences.ui index 5e002657..1581084d 100644 --- a/kbabel/kbabel/searchpreferences.ui +++ b/kbabel/kbabel/searchpreferences.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>SearchPreferences</class> <author>Stanislav Visnovsky</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SearchPreferences</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -17,7 +17,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame3</cstring> </property> @@ -31,7 +31,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_AutoSearch</cstring> </property> @@ -49,15 +49,15 @@ the popup menu that appears either when clicking in the toolbar pressed for a while.</p></qt></string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -68,7 +68,7 @@ in the toolbar pressed for a while.</p></qt></string> <cstring>_kcfg_DefaultModule</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>_kcfg_DefaultModule</cstring> </property> @@ -96,7 +96,7 @@ the desired dictionary from <b>Settings->Configure Dictionary</b> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>91</height> @@ -105,5 +105,5 @@ the desired dictionary from <b>Settings->Configure Dictionary</b> </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbabel/kbabel/sourceview.cpp b/kbabel/kbabel/sourceview.cpp index 00d8a3b2..bf61189f 100644 --- a/kbabel/kbabel/sourceview.cpp +++ b/kbabel/kbabel/sourceview.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -45,14 +45,14 @@ using namespace KBabel; -SourceView::SourceView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project) - : KBCatalogView(catalog,parent,project) +SourceView::SourceView(KBCatalog* catalog,TQWidget *tqparent, Project::Ptr project) + : KBCatalogView(catalog,tqparent,project) { - TQVBoxLayout* layout = new TQVBoxLayout( this ); - layout->setResizeMode( TQLayout::Minimum ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + tqlayout->setResizeMode( TQLayout::Minimum ); _contextView = new SourceContext (this, project); - layout->addWidget (_contextView); + tqlayout->addWidget (_contextView); connect(_catalog, TQT_SIGNAL(signalFileOpened(bool)), this, TQT_SLOT(setDisabled(bool))); } diff --git a/kbabel/kbabel/sourceview.h b/kbabel/kbabel/sourceview.h index a12ca767..c17c49cc 100644 --- a/kbabel/kbabel/sourceview.h +++ b/kbabel/kbabel/sourceview.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -40,11 +40,12 @@ class SourceContext; class SourceView : public KBCatalogView { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - SourceView(KBCatalog* catalog,TQWidget *parent, KBabel::Project::Ptr project); + SourceView(KBCatalog* catalog,TQWidget *tqparent, KBabel::Project::Ptr project); public slots: virtual void updateView(); diff --git a/kbabel/kbabel/spelldlg.cpp b/kbabel/kbabel/spelldlg.cpp index de9f2ce6..fc53b6e0 100644 --- a/kbabel/kbabel/spelldlg.cpp +++ b/kbabel/kbabel/spelldlg.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -40,8 +40,8 @@ #include <kglobal.h> #include <klocale.h> -SpellDlg::SpellDlg(bool haveMarkedText,TQWidget *parent,const char *name) - : KDialogBase(parent,name,true,i18n("Caption of dialog","Spelling") +SpellDlg::SpellDlg(bool haveMarkedText,TQWidget *tqparent,const char *name) + : KDialogBase(tqparent,name,true,i18n("Caption of dialog","Spelling") , Ok|Cancel) { setButtonOK(KGuiItem(i18n("&Spell Check"),"spellcheck")); diff --git a/kbabel/kbabel/spelldlg.h b/kbabel/kbabel/spelldlg.h index e12fc515..be182d7e 100644 --- a/kbabel/kbabel/spelldlg.h +++ b/kbabel/kbabel/spelldlg.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -41,9 +41,10 @@ class SpellDlgWidget; class SpellDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - SpellDlg(bool haveMarkedText, TQWidget* parent, const char *name=0); + SpellDlg(bool haveMarkedText, TQWidget* tqparent, const char *name=0); ~SpellDlg(); bool all() const; diff --git a/kbabel/kbabel/spelldlgwidget.ui b/kbabel/kbabel/spelldlgwidget.ui index fe5a5d0b..539b36e3 100644 --- a/kbabel/kbabel/spelldlgwidget.ui +++ b/kbabel/kbabel/spelldlgwidget.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>SpellDlgWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SpellDlgWidget</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -33,7 +33,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>allBtn</cstring> </property> @@ -44,7 +44,7 @@ <string>Spell check all translated messages of this file.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>currentBtn</cstring> </property> @@ -58,7 +58,7 @@ <string>Spell check only the current message.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>beginCurrentMsgBtn</cstring> </property> @@ -66,7 +66,7 @@ <string>Fro&m beginning of current message to end of file</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>beginBtn</cstring> </property> @@ -77,7 +77,7 @@ <string>Spell check all text from the beginning of the file to the current cursor position.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>endBtn</cstring> </property> @@ -88,7 +88,7 @@ <string>Spell check all text from the current cursor position to the end of the file.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>markedBtn</cstring> </property> @@ -101,7 +101,7 @@ </widget> </vbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>defaultBtn</cstring> </property> @@ -122,5 +122,5 @@ <tabstop>endBtn</tabstop> <tabstop>defaultBtn</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbabel/kbabel/taglistview.cpp b/kbabel/kbabel/taglistview.cpp index 476c2ed7..51a37d49 100644 --- a/kbabel/kbabel/taglistview.cpp +++ b/kbabel/kbabel/taglistview.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -44,15 +44,15 @@ using namespace KBabel; -TagListView::TagListView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project) - : KBCatalogView(catalog,parent,project) +TagListView::TagListView(KBCatalog* catalog,TQWidget *tqparent, Project::Ptr project) + : KBCatalogView(catalog,tqparent,project) { - TQVBoxLayout* layout = new TQVBoxLayout( this ); - layout->setResizeMode( TQLayout::Minimum ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + tqlayout->setResizeMode( TQLayout::Minimum ); _tagBox = new KListBox (this, "taglist textview"); - layout->addWidget (_tagBox); + tqlayout->addWidget (_tagBox); connect(_tagBox,TQT_SIGNAL(selected(const TQString&)) , this, TQT_SIGNAL(signalTagSelected(const TQString&))); diff --git a/kbabel/kbabel/taglistview.h b/kbabel/kbabel/taglistview.h index d4361a23..d2d21308 100644 --- a/kbabel/kbabel/taglistview.h +++ b/kbabel/kbabel/taglistview.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -40,11 +40,12 @@ class KListBox; class TagListView : public KBCatalogView { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - TagListView(KBCatalog* catalog,TQWidget *parent, KBabel::Project::Ptr project); + TagListView(KBCatalog* catalog,TQWidget *tqparent, KBabel::Project::Ptr project); public slots: virtual void updateView(); |