diff options
Diffstat (limited to 'kbabel/kbabeldict')
27 files changed, 116 insertions, 116 deletions
diff --git a/kbabel/kbabeldict/dictchooser.cpp b/kbabel/kbabeldict/dictchooser.cpp index d3b8df63..d0353d04 100644 --- a/kbabel/kbabeldict/dictchooser.cpp +++ b/kbabel/kbabeldict/dictchooser.cpp @@ -36,7 +36,7 @@ #include "resources.h" #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <kconfig.h> #include <klistbox.h> @@ -52,18 +52,18 @@ DictChooser::DictChooser(KBabelDictBox*b, TQStringList selected tempConfig.setAutoDelete(true); dictList = box->moduleInfos(); - TQGridLayout *tqlayout = new TQGridLayout(this); - tqlayout->setSpacing(KDialog::spacingHint()); + TQGridLayout *layout = new TQGridLayout(this); + layout->setSpacing(KDialog::spacingHint()); TQLabel *label = new TQLabel(i18n("dictionary to not use","Do not use:"),this); - tqlayout->addWidget(label,0,0); + layout->addWidget(label,0,0); label = new TQLabel(i18n("dictionary to use","Use:"),this); - tqlayout->addWidget(label,0,2); + layout->addWidget(label,0,2); unselectedBox = new KListBox(this,"unselectedBox"); - tqlayout->addWidget(unselectedBox,1,0); + layout->addWidget(unselectedBox,1,0); TQVBoxLayout *bLayout = new TQVBoxLayout(); @@ -74,10 +74,10 @@ DictChooser::DictChooser(KBabelDictBox*b, TQStringList selected unselectBtn->setEnabled(false); bLayout->addWidget(unselectBtn); bLayout->addStretch(); - tqlayout->addLayout(bLayout,1,1); + layout->addLayout(bLayout,1,1); selectedBox = new KListBox(this,"selectedBox"); - tqlayout->addWidget(selectedBox,1,2); + layout->addWidget(selectedBox,1,2); bLayout = new TQVBoxLayout(); @@ -90,7 +90,7 @@ DictChooser::DictChooser(KBabelDictBox*b, TQStringList selected configureBtn = new TQPushButton(i18n("Con&figure..."), this); bLayout->addWidget(configureBtn); bLayout->addStretch(); - tqlayout->addLayout(bLayout,1,3); + layout->addLayout(bLayout,1,3); dictList.setAutoDelete(true); diff --git a/kbabel/kbabeldict/dictionarymenu.cpp b/kbabel/kbabeldict/dictionarymenu.cpp index d850f9a6..759468c9 100644 --- a/kbabel/kbabeldict/dictionarymenu.cpp +++ b/kbabel/kbabeldict/dictionarymenu.cpp @@ -112,11 +112,11 @@ void DictionaryMenu::add(const TQString& n, const TQString& moduleId TQString keyString=key; if(keyString.contains("%1")) { - keyString=key.tqarg(accel2id.count()+1); + keyString=key.arg(accel2id.count()+1); } KShortcut k(keyString); - KAction* dictionaryAction = new KAction( name, k, dictionaryMapper, TQT_SLOT(map()), actionCollection, key.tqarg(moduleId).utf8() ); + KAction* dictionaryAction = new KAction( name, k, dictionaryMapper, TQT_SLOT(map()), actionCollection, key.arg(moduleId).utf8() ); uint id = maxId++; dictionaryAction->plug(popup,id); diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp index de0f747f..7e49402b 100644 --- a/kbabel/kbabeldict/kbabeldictbox.cpp +++ b/kbabel/kbabeldict/kbabeldictbox.cpp @@ -58,14 +58,14 @@ #include <ktrader.h> #include <twin.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqdir.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpopupmenu.h> #include <tqpushbutton.h> -#include <tqtextview.h> -#include <tqstylesheet.h> +#include <textview.h> +#include <stylesheet.h> #include <tqtoolbutton.h> #include <tqwhatsthis.h> #include <tqtimer.h> @@ -324,10 +324,10 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl ) mainLayout->addLayout(hbox); totalResultsLabel->setNum(100000); - totalResultsLabel->setFixedSize(totalResultsLabel->tqsizeHint()); + totalResultsLabel->setFixedSize(totalResultsLabel->sizeHint()); totalResultsLabel->setNum(0); currentLabel->setNum(100000); - currentLabel->setFixedSize(currentLabel->tqsizeHint()); + currentLabel->setFixedSize(currentLabel->sizeHint()); currentLabel->setNum(0); setRMBMenu(new TQPopupMenu(this)); @@ -1007,7 +1007,7 @@ void KBabelDictBox::showResult(TQListViewItem *item) if(!info->filePath.isEmpty()) { rmbPopup->changeItem(editFileIndex - ,i18n("Edit File %1").tqarg(info->location)); + ,i18n("Edit File %1").arg(info->location)); rmbPopup->setItemEnabled(editFileIndex,true); } else @@ -1182,7 +1182,7 @@ void KBabelDictBox::nextInfo() if(!info->filePath.isEmpty()) { rmbPopup->changeItem(editFileIndex - ,i18n("Edit File %1").tqarg(info->location)); + ,i18n("Edit File %1").arg(info->location)); rmbPopup->setItemEnabled(editFileIndex,true); } else @@ -1255,7 +1255,7 @@ void KBabelDictBox::about() if(aboutData->bugAddress() != "submit@bugs.kde.org") { text += "\n" + i18n("Send bugs to %1") - .tqarg(aboutData->bugAddress()) +"\n"; + .arg(aboutData->bugAddress()) +"\n"; } TQLabel *label = new TQLabel(text,0); @@ -1410,7 +1410,7 @@ void KBabelDictBox::copy() } else { - TQClipboard *cb = KApplication::tqclipboard(); + TQClipboard *cb = KApplication::clipboard(); cb->setText(translation()); } } @@ -1502,7 +1502,7 @@ void KBabelDictBox::configure(const TQString& id, bool modal) { if(e->id() == id) { - TQString caption = i18n("Configure Dictionary %1").tqarg(e->name()); + TQString caption = i18n("Configure Dictionary %1").arg(e->name()); KDialogBase *dialog = new KDialogBase(this,"prefDialog" , modal, caption , KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel| @@ -1696,7 +1696,7 @@ void KBabelDictBox::editFile() { KMessageBox::sorry(this ,i18n("There was an error starting KBabel:\n%1") - .tqarg(error)); + .arg(error)); return; } } diff --git a/kbabel/kbabeldict/kbabeldictview.cpp b/kbabel/kbabeldict/kbabeldictview.cpp index 18bb20ac..d8dc90f9 100644 --- a/kbabel/kbabeldict/kbabeldictview.cpp +++ b/kbabel/kbabeldict/kbabeldictview.cpp @@ -41,7 +41,7 @@ #include <tqgroupbox.h> #include <tqhbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqptrlist.h> #include <tqpushbutton.h> #include <tqstringlist.h> diff --git a/kbabel/kbabeldict/kbabelsplash.cpp b/kbabel/kbabeldict/kbabelsplash.cpp index a62cec5f..56c5e3a8 100644 --- a/kbabel/kbabeldict/kbabelsplash.cpp +++ b/kbabel/kbabeldict/kbabelsplash.cpp @@ -53,9 +53,9 @@ KBabelSplash::KBabelSplash( TQWidget* parent, const char* name ) picLabel->setFrameStyle(TQFrame::WinPanel | TQFrame::Raised); - // Set tqgeometry, with support for Xinerama systems + // Set geometry, with support for Xinerama systems TQRect r; - r.setSize(tqsizeHint()); + r.setSize(sizeHint()); int ps = TQApplication::desktop()->primaryScreen(); r.moveCenter( TQApplication::desktop()->screenGeometry(ps).center() ); setGeometry(r); diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp index 4c79bacd..a3b20183 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp @@ -28,7 +28,7 @@ * your version. * */ -#include <tqtextedit.h> +#include <textedit.h> #include <tqprogressdialog.h> #include <tqinputdialog.h> @@ -474,7 +474,7 @@ KDBSearchEngine::messagesForFilter (const SearchFilter * filter, if (count % step == 0) { emit progress (100 * count / totalRecord); - kapp->tqprocessEvents (100); + kapp->processEvents (100); } if (stopNow) { @@ -582,7 +582,7 @@ KDBSearchEngine::repeat () if (count % step == 0) { emit progress (100 * count / totalRecord); - kapp->tqprocessEvents (100); + kapp->processEvents (100); } if (stopNow) { @@ -755,7 +755,7 @@ KDBSearchEngine::startSearchNow (int searchmode) step = 100; emit progress (0); - kapp->tqprocessEvents (100); + kapp->processEvents (100); if (stopNow) { stopNow = false; @@ -775,7 +775,7 @@ KDBSearchEngine::startSearchNow (int searchmode) { emit progress (100 * count / /*TQMAX( */ totalprogress /*,1) */ ); - kapp->tqprocessEvents (100); + kapp->processEvents (100); if (stopNow) { @@ -1715,7 +1715,7 @@ TQValueList < KeyAndScore > KDBSearchEngine::searchWords (TQString phrase, { emit progress (100 * count / totalprogress); - kapp->tqprocessEvents (100); + kapp->processEvents (100); } if (stopNow) { diff --git a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp index 95ec19dd..699e3530 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp @@ -703,7 +703,7 @@ DataBaseManager::cursorGet (uint32 flags) else { kdDebug (KBABEL_SEARCH) << TQString ("...cursor getting...%1"). - tqarg (ret) << endl; + arg (ret) << endl; return DataBaseItem (); } @@ -782,7 +782,7 @@ DataBaseManager::createDataBase (TQString directory, rename (filename.local8Bit (), filename.local8Bit () + ",old"); -//kdDebug(0) << TQString("Creating %1").tqarg(filename) << endl; +//kdDebug(0) << TQString("Creating %1").arg(filename) << endl; iAmOk = true; @@ -861,7 +861,7 @@ DataBaseManager::createDataBase (TQString directory, loadInfo (); else kdDebug (KBABEL_SEARCH) << TQString ("I am NOT ok : %1"). - tqarg (ret) << endl; + arg (ret) << endl; //THIS IS WRONG, rewrite the error handling. return iAmOk; @@ -889,7 +889,7 @@ DataBaseManager::getCatalogInfo (int n) return InfoItem (); } -// kdDebug(0) << TQString("Trad %1").tqarg(ret) << endl; +// kdDebug(0) << TQString("Trad %1").arg(ret) << endl; InfoItem it ((char *) data.data, language); //free(data.data); // Read docu for this!!!! @@ -1324,7 +1324,7 @@ DataBaseManager::appendKey (TQString _key) else ret = *(uint32 *) key.data; -//kdDebug(0) << TQString("Append result %1,err = %1").tqarg(ret).tqarg(err) << endl; +//kdDebug(0) << TQString("Append result %1,err = %1").arg(ret).arg(err) << endl; free (data.data); @@ -1353,7 +1353,7 @@ DataBaseManager::getKey (uint32 n) return TQString::fromUtf8 ((char *) data.data); -// kdDebug(0) << TQString("Trad %1").tqarg(ret) << endl; +// kdDebug(0) << TQString("Trad %1").arg(ret) << endl; } diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp index 2969a9df..47bc8fa9 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp @@ -57,7 +57,7 @@ if (!called) { pb=true; count=0;} called=true; -kdDebug(0) << TQString("cat: %1, %2").tqarg(pathName).tqarg(pattern) << endl; +kdDebug(0) << TQString("cat: %1, %2").arg(pathName).arg(pattern) << endl; if(pb) {emit patternStarted(); @@ -128,7 +128,7 @@ emit fileLoading(0); KURL u(fileName); -ConversiontqStatus rr=catalog->openURL(u); +ConversionStatus rr=catalog->openURL(u); if(rr != OK && rr !=RECOVERED_PARSE_ERROR ) { delete catalog; @@ -149,7 +149,7 @@ tot=catalog->numberOfEntries(); bool fuzzy; bool untra; -//kdDebug(0) << TQString("Tot: %1").tqarg(tot) << endl; +//kdDebug(0) << TQString("Tot: %1").arg(tot) << endl; for (i=0;i<tot;i++) //Skip header = ???? { @@ -159,7 +159,7 @@ for (i=0;i<tot;i++) //Skip header = ???? { emit fileProgress(100*i/tot); emit added(count); - kapp->tqprocessEvents(100); + kapp->processEvents(100); } fuzzy=catalog->isFuzzy(i); diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui b/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui index b457bf74..7833bef3 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui +++ b/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui @@ -179,7 +179,7 @@ It also substitutes groups of more than one space character with only one space <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -245,7 +245,7 @@ It also substitutes groups of more than one space character with only one space <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -262,7 +262,7 @@ It also substitutes groups of more than one space character with only one space <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -332,7 +332,7 @@ It also substitutes groups of more than one space character with only one space <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -384,7 +384,7 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -415,7 +415,7 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -487,7 +487,7 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="text"> <string>[A-Za-z0-9_%</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> diff --git a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp index a2c8c289..23ac1cd5 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp @@ -3,7 +3,7 @@ #include <tqspinbox.h> #include <tqcheckbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <kfiledialog.h> #include <kurlrequester.h> @@ -17,15 +17,15 @@ PreferencesWidget::PreferencesWidget(TQWidget *parent, const char* name) : PrefWidget(parent,name) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); // TQLabel *label = new TQLabel(i18n("Settings for KDE database search engine"),this); -// tqlayout->addWidget(label); +// layout->addWidget(label); dbpw = new DBSearchEnginePref(this); dbpw->dirInput->setMode(KFile::Directory | KFile::LocalOnly); - tqlayout->addWidget(dbpw); - resize(TQSize(200,200).expandedTo(tqminimumSizeHint())); + layout->addWidget(dbpw); + resize(TQSize(200,200).expandedTo(minimumSizeHint())); // connect(dbpw->browseTB_3,TQT_SIGNAL(clicked()),TQT_SLOT(browse1())); @@ -99,12 +99,12 @@ TQString defaultDir; void PreferencesWidget::setName(TQString n) { -dbpw->filenameLB->setText(i18n("Scanning file: %1").tqarg(n)); +dbpw->filenameLB->setText(i18n("Scanning file: %1").arg(n)); } void PreferencesWidget::setEntries(int i) { -dbpw->entriesLB->setText(i18n("Entries added: %1").tqarg(i)); +dbpw->entriesLB->setText(i18n("Entries added: %1").arg(i)); } diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp index 23f0b7d2..923d9897 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp @@ -138,7 +138,7 @@ if (!called) { pb=true; count=0;} called=true; -kdDebug(0) << TQString("Scanning: %1, %2").tqarg(pathName).tqarg(pattern) << endl; +kdDebug(0) << TQString("Scanning: %1, %2").arg(pathName).arg(pattern) << endl; if(pb) { @@ -212,7 +212,7 @@ emit fileLoading(0); bool error; -ConversiontqStatus rr=catalog->openURL(u); +ConversionStatus rr=catalog->openURL(u); if(rr != OK && rr !=RECOVERED_PARSE_ERROR ) { delete catalog; diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui index 285319e5..685e86bd 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui @@ -109,7 +109,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -147,7 +147,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -380,7 +380,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -496,7 +496,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -669,7 +669,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui b/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui index 64a74b8a..e3ef3776 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui @@ -182,7 +182,7 @@ It also substitutes groups of more than one space character with only one space <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -248,7 +248,7 @@ It also substitutes groups of more than one space character with only one space <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -265,7 +265,7 @@ It also substitutes groups of more than one space character with only one space <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -335,7 +335,7 @@ It also substitutes groups of more than one space character with only one space <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -387,7 +387,7 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -418,7 +418,7 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -490,7 +490,7 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="text"> <string>[A-Za-z0-9_%</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp index ff767436..995f3b05 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp @@ -3,7 +3,7 @@ #include <tqspinbox.h> #include <tqcheckbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <kfiledialog.h> #include <kurlrequester.h> @@ -18,14 +18,14 @@ KDB2PreferencesWidget::KDB2PreferencesWidget(TQWidget *parent, const char* name) : PrefWidget(parent,name) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); // TQLabel *label = new TQLabel(i18n("Settings for KDE Database Search Engine"),this); -// tqlayout->addWidget(label); +// layout->addWidget(label); dbpw = new DBSearchEnginePrefWidget(this); dbpw->dbDirectory->setMode(KFile::Directory | KFile::LocalOnly); dbpw->show(); - tqlayout->addWidget(dbpw); + layout->addWidget(dbpw); setMinimumSize(300,300); standard(); diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui b/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui index 39e1f2ac..a34953df 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui +++ b/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -72,7 +72,7 @@ </rect> </property> <property name="text"> - <string>tqStatus: </string> + <string>Status: </string> </property> </widget> <widget class="KLineEdit"> diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp index 9025d716..9fc74519 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp +++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp @@ -39,7 +39,7 @@ #include <tqregexp.h> #include <tqtimer.h> -#include <tqstylesheet.h> +#include <stylesheet.h> #include "poauxiliary.h" #include "preferenceswidget.h" @@ -182,7 +182,7 @@ bool PoAuxiliary::startSearch(const TQString& t, uint pluralForm, const SearchFi clearResults(); - kapp->tqprocessEvents(100); + kapp->processEvents(100); text.replace("\n",""); @@ -255,7 +255,7 @@ bool PoAuxiliary::startSearchInTranslation(const TQString& text) clearResults(); - kapp->tqprocessEvents(100); + kapp->processEvents(100); Entry *entry = msgstrDict[text]; if(entry) @@ -393,7 +393,7 @@ void PoAuxiliary::loadAuxiliary() { TQString dir=directory(editedFile,number); TQString s("@DIR%1@"); - path.replace(s.tqarg(number),dir); + path.replace(s.arg(number),dir); pos+=dir.length(); } @@ -427,7 +427,7 @@ void PoAuxiliary::loadAuxiliary() connect(catalog, TQT_SIGNAL(signalProgress(int)) , this, TQT_SIGNAL(progress(int))); - ConversiontqStatus stat = catalog->openURL(u); + ConversionStatus stat = catalog->openURL(u); if( stat != OK && stat != RECOVERED_PARSE_ERROR) { kdDebug(KBABEL_SEARCH) << "error while opening file " << u.prettyURL() << endl; @@ -436,7 +436,7 @@ void PoAuxiliary::loadAuxiliary() { error = true; errorMsg = i18n("Error while trying to open file for PO Auxiliary module:\n%1") - .tqarg(u.prettyURL()); + .arg(u.prettyURL()); emit hasError(errorMsg); } } @@ -455,7 +455,7 @@ void PoAuxiliary::loadAuxiliary() if( (100*(i+1))%total < 100 ) { emit progress((100*(i+1))/total); - kapp->tqprocessEvents(100); + kapp->processEvents(100); } Entry *e = new Entry; diff --git a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp index 873c07b6..930af5aa 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp @@ -32,7 +32,7 @@ **************************************************************************** */ #include <tqcheckbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <kfiledialog.h> #include <tqpushbutton.h> @@ -47,10 +47,10 @@ AuxiliaryPreferencesWidget::AuxiliaryPreferencesWidget(TQWidget *parent, const c : PrefWidget(parent,name) , changed(false) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); prefWidget = new PWidget(this); - tqlayout->addWidget(prefWidget); + layout->addWidget(prefWidget); connect(prefWidget->urlInput->lineEdit(),TQT_SIGNAL(textChanged(const TQString&)) diff --git a/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui b/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui index b91f98e5..f345eebb 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui +++ b/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui @@ -7,7 +7,7 @@ <cstring>PWidget</cstring> </property> <property stdset="1"> - <name>tqgeometry</name> + <name>geometry</name> <rect> <x>0</x> <y>0</y> @@ -92,14 +92,14 @@ The following variables will be replaced in the path if available: <enum>Expanding</enum> </property> <property> - <name>tqsizeHint</name> + <name>sizeHint</name> <size> <width>20</width> <height>20</height> </size> </property> <property> - <name>tqsizeHint</name> + <name>sizeHint</name> <size> <width>20</width> <height>20</height> diff --git a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp index e6565e54..d346bcf5 100644 --- a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp @@ -79,7 +79,7 @@ bool CompendiumData::load(KURL url) emit progressStarts(i18n("Loading PO compendium")); connect(_catalog, TQT_SIGNAL(signalProgress(int)), this, TQT_SIGNAL(progress(int))); - ConversiontqStatus stat=_catalog->openURL(url); + ConversionStatus stat=_catalog->openURL(url); disconnect(_catalog, TQT_SIGNAL(signalProgress(int)) , this, TQT_SIGNAL(progress(int))); @@ -91,7 +91,7 @@ bool CompendiumData::load(KURL url) _error = true; _errorMsg = i18n("Error while trying to read file for PO Compendium module:\n%1") - .tqarg(url.prettyURL()); + .arg(url.prettyURL()); emit progressEnds(); @@ -109,7 +109,7 @@ bool CompendiumData::load(KURL url) if( (100*(i+1))%total < 100 ) { emit progress((100*(i+1))/total); - kapp->tqprocessEvents(100); + kapp->processEvents(100); } // FIXME: shoudl care about plural forms diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp index 60de6a4f..fb9171ed 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp @@ -42,7 +42,7 @@ #include <kio/netaccess.h> #include <tqregexp.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqtimer.h> #include "resources.h" @@ -369,7 +369,7 @@ bool PoCompendium::searchWords(const TQString& searchStr, uint pluralForm, TQPtr emit progress( (50*checkCounter+1)/catalogInfo.total); } - kapp->tqprocessEvents(100); + kapp->processEvents(100); TQString origStr = data->catalog()->msgid(*it).first(); origStr = CompendiumData::simplify(origStr); @@ -537,7 +537,7 @@ bool PoCompendium::searchNGram(const TQString& searchStr, uint pluralForm, TQPtr continue; } - kapp->tqprocessEvents(100); + kapp->processEvents(100); TQString origStr = data->catalog()->msgid(i).first(); origStr = CompendiumData::simplify(origStr); diff --git a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp index 74321121..0c4064fc 100644 --- a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp @@ -32,7 +32,7 @@ **************************************************************************** */ #include <tqcheckbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <kfiledialog.h> #include <tqpushbutton.h> @@ -48,10 +48,10 @@ CompendiumPreferencesWidget::CompendiumPreferencesWidget(TQWidget *parent, const : PrefWidget(parent,name) , changed(false) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); prefWidget = new CompendiumPWidget(this); - tqlayout->addWidget(prefWidget); + layout->addWidget(prefWidget); connect(prefWidget->caseBtn, TQT_SIGNAL(toggled(bool)) , this, TQT_SLOT(setChanged())); diff --git a/kbabel/kbabeldict/modules/pocompendium/pwidget.ui b/kbabel/kbabeldict/modules/pocompendium/pwidget.ui index f9558dc3..db8de91e 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pwidget.ui +++ b/kbabel/kbabeldict/modules/pocompendium/pwidget.ui @@ -8,7 +8,7 @@ <cstring>PWidget</cstring> </property> <property stdset="1"> - <name>tqgeometry</name> + <name>geometry</name> <rect> <x>0</x> <y>0</y> @@ -236,14 +236,14 @@ <enum>Expanding</enum> </property> <property> - <name>tqsizeHint</name> + <name>sizeHint</name> <size> <width>20</width> <height>20</height> </size> </property> <property> - <name>tqsizeHint</name> + <name>sizeHint</name> <size> <width>20</width> <height>20</height> diff --git a/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp b/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp index 7aed4474..380b8908 100644 --- a/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp @@ -34,7 +34,7 @@ **************************************************************************** */ #include <tqcheckbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <kfiledialog.h> #include <tqpushbutton.h> @@ -50,10 +50,10 @@ TmxCompendiumPreferencesWidget::TmxCompendiumPreferencesWidget(TQWidget *parent, : PrefWidget(parent,name) , changed(false) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); prefWidget = new TmxCompendiumPWidget(this); - tqlayout->addWidget(prefWidget); + layout->addWidget(prefWidget); connect(prefWidget->caseBtn, TQT_SIGNAL(toggled(bool)) , this, TQT_SLOT(setChanged())); diff --git a/kbabel/kbabeldict/modules/tmx/pwidget.ui b/kbabel/kbabeldict/modules/tmx/pwidget.ui index 9d0d4281..875e744f 100644 --- a/kbabel/kbabeldict/modules/tmx/pwidget.ui +++ b/kbabel/kbabeldict/modules/tmx/pwidget.ui @@ -171,7 +171,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp index 9163d7cb..965b7a27 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp @@ -41,7 +41,7 @@ #include <kinstance.h> #include <kio/netaccess.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqtimer.h> #include "tmxcompendiumdata.h" @@ -337,7 +337,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea emit progress( (100*(checkCounter+1))/data->numberOfEntries()); } - kapp->tqprocessEvents(100); + kapp->processEvents(100); TQString origStr = data->msgid(*it); origStr = TmxCompendiumData::simplify(origStr); @@ -484,7 +484,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea continue; } - kapp->tqprocessEvents(100); + kapp->processEvents(100); if(i >= data->numberOfEntries()) { diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp index 8646806e..0c186b57 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp @@ -117,7 +117,7 @@ bool TmxCompendiumData::load(const KURL& url, const TQString& language) _errorMsg = i18n("Error while trying to read file for TMX Compendium module:\n" "%1\n" "Reason: %2") - .tqarg(url.prettyURL()).tqarg(_errorMsg); + .arg(url.prettyURL()).arg(_errorMsg); kdDebug(KBABEL_SEARCH) << "Error: " << _errorMsg << endl; @@ -146,7 +146,7 @@ bool TmxCompendiumData::load(const KURL& url, const TQString& language) if( (100*(i+1))%total < 100 ) { emit progress((100*(i+1))/total); - kapp->tqprocessEvents(100); + kapp->processEvents(100); } TQDomNodeList tuvTags = tuTags.item(i).toElement().elementsByTagName("tuv"); diff --git a/kbabel/kbabeldict/searchengine.h b/kbabel/kbabeldict/searchengine.h index c5b28ad5..cafebd1f 100644 --- a/kbabel/kbabeldict/searchengine.h +++ b/kbabel/kbabeldict/searchengine.h @@ -91,7 +91,7 @@ public: TQString projectContext; /** - * tqStatus of the translation, for example "approved", "spellchecked", "unknown" + * Status of the translation, for example "approved", "spellchecked", "unknown" */ TQString status; @@ -173,7 +173,7 @@ public: , _translators() , _projectKeywords() , _projectContexts() - , _translationtqStatus() + , _translationStatus() {} virtual ~SearchFilter() {} @@ -213,10 +213,10 @@ public: void setProjectContext( const TQStringList& projectContexts) { _projectContexts = projectContexts; } /** - * tqStatus of the translation, for example "approved", "spellchecked", "unknown" + * Status of the translation, for example "approved", "spellchecked", "unknown" */ - void settqStatus( const TQString& translationtqStatus) { _translationtqStatus = translationtqStatus; } - void settqStatus( const TQStringList& translationStati) { _translationtqStatus = translationStati; } + void setStatus( const TQString& translationStatus) { _translationStatus = translationStatus; } + void setStatus( const TQStringList& translationStati) { _translationStatus = translationStati; } /** * The key method of the class - check, if the argument @@ -232,7 +232,7 @@ private: TQStringList _translators; TQStringList _projectKeywords ; TQStringList _projectContexts; - TQStringList _translationtqStatus; + TQStringList _translationStatus; }; /** |