diff options
Diffstat (limited to 'kbabel/kbabeldict/modules')
21 files changed, 217 insertions, 217 deletions
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp index 5423bca9..9fee3217 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp @@ -39,7 +39,7 @@ #include <tdemessagebox.h> #include <tdefiledialog.h> #include <kurlrequester.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "tdeapplication.h" #include "KDBSearchEngine.h" @@ -82,8 +82,8 @@ SearchEngine (parent, name) dbOpened = false; dbname = ""; lasterror = i18n ("No error"); - connect (this, TQT_SIGNAL (hasError (const TQString &)), - TQT_SLOT (setLastError (const TQString &))); + connect (this, TQ_SIGNAL (hasError (const TQString &)), + TQ_SLOT (setLastError (const TQString &))); IAmReady = true; // I don't know if it is a good idea, no DB loaded!!! @@ -91,8 +91,8 @@ SearchEngine (parent, name) searching = false; stopNow = false; - norm = false; // Normalize white space = FALSE - comm = true; // Remove Comments = TRUE + norm = false; // Normalize white space = false + comm = true; // Remove Comments = true } @@ -474,7 +474,7 @@ KDBSearchEngine::messagesForFilter (const SearchFilter * filter, if (count % step == 0) { emit progress (100 * count / totalRecord); - kapp->processEvents (100); + tdeApp->processEvents (100); } if (stopNow) { @@ -548,9 +548,9 @@ KDBSearchEngine::repeat () new TQProgressDialog (i18n ("Looking for repetitions"), i18n ("Stop"), 100); - connect (this, TQT_SIGNAL (progress (int)), pd, TQT_SLOT (setProgress (int))); - connect (this, TQT_SIGNAL (finished ()), pd, TQT_SLOT (close ())); - connect (pd, TQT_SIGNAL (cancelled ()), this, TQT_SLOT (stopSearch ())); + connect (this, TQ_SIGNAL (progress (int)), pd, TQ_SLOT (setProgress (int))); + connect (this, TQ_SIGNAL (finished ()), pd, TQ_SLOT (close ())); + connect (pd, TQ_SIGNAL (cancelled ()), this, TQ_SLOT (stopSearch ())); TQString txt = "// %1 repetitions, %2 translation(s)\ni18n(\"%3\");\n"; @@ -582,7 +582,7 @@ KDBSearchEngine::repeat () if (count % step == 0) { emit progress (100 * count / totalRecord); - kapp->processEvents (100); + tdeApp->processEvents (100); } if (stopNow) { @@ -755,7 +755,7 @@ KDBSearchEngine::startSearchNow (int searchmode) step = 100; emit progress (0); - kapp->processEvents (100); + tdeApp->processEvents (100); if (stopNow) { stopNow = false; @@ -775,7 +775,7 @@ KDBSearchEngine::startSearchNow (int searchmode) { emit progress (100 * count / /*TQMAX( */ totalprogress /*,1) */ ); - kapp->processEvents (100); + tdeApp->processEvents (100); if (stopNow) { @@ -1208,15 +1208,15 @@ KDBSearchEngine::preferencesWidget (TQWidget * parent) pw = new PreferencesWidget (parent); setSettings (); - connect (pw, TQT_SIGNAL (restoreNow ()), this, TQT_SLOT (setSettings ())); - connect (pw, TQT_SIGNAL (applyNow ()), this, TQT_SLOT (updateSettings ())); - connect (pw, TQT_SIGNAL (destroyed ()), this, TQT_SLOT (prefDestr ())); - connect (pw->dbpw->scanPB_2, TQT_SIGNAL (clicked ()), this, TQT_SLOT (scan ())); - connect (pw->dbpw->scanrecPB, TQT_SIGNAL (clicked ()), this, - TQT_SLOT (scanRecur ())); - connect (pw->dbpw->scanFilePB, TQT_SIGNAL (clicked ()), this, - TQT_SLOT (scanFile ())); - connect (pw->dbpw->repeatPB, TQT_SIGNAL (clicked ()), this, TQT_SLOT (repeat ())); + connect (pw, TQ_SIGNAL (restoreNow ()), this, TQ_SLOT (setSettings ())); + connect (pw, TQ_SIGNAL (applyNow ()), this, TQ_SLOT (updateSettings ())); + connect (pw, TQ_SIGNAL (destroyed ()), this, TQ_SLOT (prefDestr ())); + connect (pw->dbpw->scanPB_2, TQ_SIGNAL (clicked ()), this, TQ_SLOT (scan ())); + connect (pw->dbpw->scanrecPB, TQ_SIGNAL (clicked ()), this, + TQ_SLOT (scanRecur ())); + connect (pw->dbpw->scanFilePB, TQ_SIGNAL (clicked ()), this, + TQ_SLOT (scanFile ())); + connect (pw->dbpw->repeatPB, TQ_SIGNAL (clicked ()), this, TQ_SLOT (repeat ())); return pw; @@ -1246,32 +1246,32 @@ KDBSearchEngine::scanRecur () } if (pw) { - connect (sca, TQT_SIGNAL (patternProgress (int)), pw->dbpw->totalPB, - TQT_SLOT (setProgress (int))); - connect (sca, TQT_SIGNAL (fileLoading (int)), pw->dbpw->loadingPB, - TQT_SLOT (setProgress (int))); - connect (sca, TQT_SIGNAL (fileProgress (int)), pw->dbpw->processPB, - TQT_SLOT (setProgress (int))); + connect (sca, TQ_SIGNAL (patternProgress (int)), pw->dbpw->totalPB, + TQ_SLOT (setProgress (int))); + connect (sca, TQ_SIGNAL (fileLoading (int)), pw->dbpw->loadingPB, + TQ_SLOT (setProgress (int))); + connect (sca, TQ_SIGNAL (fileProgress (int)), pw->dbpw->processPB, + TQ_SLOT (setProgress (int))); } - connect (sca, TQT_SIGNAL (patternProgress (int)), TQT_SIGNAL (progress (int))); //Kbabel progress bar + connect (sca, TQ_SIGNAL (patternProgress (int)), TQ_SIGNAL (progress (int))); //Kbabel progress bar - connect (sca, TQT_SIGNAL (added (int)), pw, TQT_SLOT (setEntries (int))); - connect (sca, TQT_SIGNAL (filename (TQString)), pw, TQT_SLOT (setName (TQString))); + connect (sca, TQ_SIGNAL (added (int)), pw, TQ_SLOT (setEntries (int))); + connect (sca, TQ_SIGNAL (filename (TQString)), pw, TQ_SLOT (setName (TQString))); progressStarts (i18n ("Scanning folder %1").arg (cvsdir)); - connect (sca, TQT_SIGNAL (patternFinished ()), TQT_SIGNAL (progressEnds ())); + connect (sca, TQ_SIGNAL (patternFinished ()), TQ_SIGNAL (progressEnds ())); sca->scanPattern (cvsdir, "*.po", true); - disconnect (this, TQT_SIGNAL (progress (int))); -//disconnect(TQT_SIGNAL(patternStarted()),this,TQT_SIGNAL(started()) ); - disconnect (this, TQT_SIGNAL (progressEnds ())); + disconnect (this, TQ_SIGNAL (progress (int))); +//disconnect(TQ_SIGNAL(patternStarted()),this,TQ_SIGNAL(started()) ); + disconnect (this, TQ_SIGNAL (progressEnds ())); if (pw) { - disconnect (pw->dbpw->totalPB, TQT_SLOT (setProgress (int))); - disconnect (pw->dbpw->loadingPB, TQT_SLOT (setProgress (int))); - disconnect (pw->dbpw->processPB, TQT_SLOT (setProgress (int))); + disconnect (pw->dbpw->totalPB, TQ_SLOT (setProgress (int))); + disconnect (pw->dbpw->loadingPB, TQ_SLOT (setProgress (int))); + disconnect (pw->dbpw->processPB, TQ_SLOT (setProgress (int))); } totalRecord = dm->count (); @@ -1304,32 +1304,32 @@ KDBSearchEngine::scan () } if (pw) { - connect (sca, TQT_SIGNAL (patternProgress (int)), pw->dbpw->totalPB, - TQT_SLOT (setProgress (int))); - connect (sca, TQT_SIGNAL (fileLoading (int)), pw->dbpw->loadingPB, - TQT_SLOT (setProgress (int))); - connect (sca, TQT_SIGNAL (fileProgress (int)), pw->dbpw->processPB, - TQT_SLOT (setProgress (int))); + connect (sca, TQ_SIGNAL (patternProgress (int)), pw->dbpw->totalPB, + TQ_SLOT (setProgress (int))); + connect (sca, TQ_SIGNAL (fileLoading (int)), pw->dbpw->loadingPB, + TQ_SLOT (setProgress (int))); + connect (sca, TQ_SIGNAL (fileProgress (int)), pw->dbpw->processPB, + TQ_SLOT (setProgress (int))); } - connect (sca, TQT_SIGNAL (patternProgress (int)), TQT_SIGNAL (progress (int))); + connect (sca, TQ_SIGNAL (patternProgress (int)), TQ_SIGNAL (progress (int))); progressStarts (i18n ("Scanning folder %1").arg (cvsdir)); - connect (sca, TQT_SIGNAL (patternFinished ()), TQT_SIGNAL (progressEnds ())); + connect (sca, TQ_SIGNAL (patternFinished ()), TQ_SIGNAL (progressEnds ())); - connect (sca, TQT_SIGNAL (added (int)), pw, TQT_SLOT (setEntries (int))); - connect (sca, TQT_SIGNAL (filename (TQString)), pw, TQT_SLOT (setName (TQString))); + connect (sca, TQ_SIGNAL (added (int)), pw, TQ_SLOT (setEntries (int))); + connect (sca, TQ_SIGNAL (filename (TQString)), pw, TQ_SLOT (setName (TQString))); sca->scanPattern (cvsdir, "*.po", false); - disconnect (this, TQT_SIGNAL (progress (int))); -//disconnect(TQT_SIGNAL(patternStarted()),this,TQT_SIGNAL(started()) ); - disconnect (this, TQT_SIGNAL (progressEnds ())); + disconnect (this, TQ_SIGNAL (progress (int))); +//disconnect(TQ_SIGNAL(patternStarted()),this,TQ_SIGNAL(started()) ); + disconnect (this, TQ_SIGNAL (progressEnds ())); if (pw) { - disconnect (pw->dbpw->totalPB, TQT_SLOT (setProgress (int))); - disconnect (pw->dbpw->loadingPB, TQT_SLOT (setProgress (int))); - disconnect (pw->dbpw->processPB, TQT_SLOT (setProgress (int))); + disconnect (pw->dbpw->totalPB, TQ_SLOT (setProgress (int))); + disconnect (pw->dbpw->loadingPB, TQ_SLOT (setProgress (int))); + disconnect (pw->dbpw->processPB, TQ_SLOT (setProgress (int))); } totalRecord = dm->count (); @@ -1363,31 +1363,31 @@ KDBSearchEngine::scanFile () } if (pw) { - connect (sca, TQT_SIGNAL (fileLoading (int)), pw->dbpw->loadingPB, - TQT_SLOT (setProgress (int))); - connect (sca, TQT_SIGNAL (fileProgress (int)), pw->dbpw->processPB, - TQT_SLOT (setProgress (int))); + connect (sca, TQ_SIGNAL (fileLoading (int)), pw->dbpw->loadingPB, + TQ_SLOT (setProgress (int))); + connect (sca, TQ_SIGNAL (fileProgress (int)), pw->dbpw->processPB, + TQ_SLOT (setProgress (int))); } - connect (sca, TQT_SIGNAL (fileProgress (int)), TQT_SIGNAL (progress (int))); + connect (sca, TQ_SIGNAL (fileProgress (int)), TQ_SIGNAL (progress (int))); progressStarts (i18n ("Scanning file %1").arg (directory (cvsdir, 0))); - connect (sca, TQT_SIGNAL (fileFinished ()), TQT_SIGNAL (progressEnds ())); + connect (sca, TQ_SIGNAL (fileFinished ()), TQ_SIGNAL (progressEnds ())); - connect (sca, TQT_SIGNAL (added (int)), pw, TQT_SLOT (setEntries (int))); - connect (sca, TQT_SIGNAL (filename (TQString)), pw, TQT_SLOT (setName (TQString))); + connect (sca, TQ_SIGNAL (added (int)), pw, TQ_SLOT (setEntries (int))); + connect (sca, TQ_SIGNAL (filename (TQString)), pw, TQ_SLOT (setName (TQString))); sca->scanFile (cvsdir); - sca->disconnect (TQT_SIGNAL (fileProgress (int)), this, - TQT_SIGNAL (progress (int))); -//disconnect(TQT_SIGNAL(patternStarted()),this,TQT_SIGNAL(started()) ); - sca->disconnect (TQT_SIGNAL (fileFinished ()), this, - TQT_SIGNAL (progressEnds ())); + sca->disconnect (TQ_SIGNAL (fileProgress (int)), this, + TQ_SIGNAL (progress (int))); +//disconnect(TQ_SIGNAL(patternStarted()),this,TQ_SIGNAL(started()) ); + sca->disconnect (TQ_SIGNAL (fileFinished ()), this, + TQ_SIGNAL (progressEnds ())); if (pw) { - disconnect (pw->dbpw->loadingPB, TQT_SLOT (setProgress (int))); - disconnect (pw->dbpw->processPB, TQT_SLOT (setProgress (int))); + disconnect (pw->dbpw->loadingPB, TQ_SLOT (setProgress (int))); + disconnect (pw->dbpw->processPB, TQ_SLOT (setProgress (int))); } totalRecord = dm->count (); @@ -1715,7 +1715,7 @@ TQValueList < KeyAndScore > KDBSearchEngine::searchWords (TQString phrase, { emit progress (100 * count / totalprogress); - kapp->processEvents (100); + tdeApp->processEvents (100); } if (stopNow) { diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp index 183b1e4d..8ea17024 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp @@ -121,7 +121,7 @@ Catalog * catalog=new Catalog(this,"ScanPoCatalog"); TQString location=fileName.right(fileName.length()-fileName.findRev("/")-1); -connect(catalog,TQT_SIGNAL(signalProgress(int)),this,TQT_SIGNAL(fileLoading(int))); +connect(catalog,TQ_SIGNAL(signalProgress(int)),this,TQ_SIGNAL(fileLoading(int))); emit filename(location); emit fileProgress(0); emit fileLoading(0); @@ -159,7 +159,7 @@ for (i=0;i<tot;i++) //Skip header = ???? { emit fileProgress(100*i/tot); emit added(count); - kapp->processEvents(100); + tdeApp->processEvents(100); } fuzzy=catalog->isFuzzy(i); diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp b/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp index 2273a9c4..6b51da7b 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp @@ -1,6 +1,6 @@ #include <tdelocale.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaboutdata.h> #include <kdebug.h> @@ -10,7 +10,7 @@ extern "C" { - KDE_EXPORT void *init_kbabeldict_dbsearchengine() + TDE_EXPORT void *init_kbabeldict_dbsearchengine() { return new DbSeFactory; } diff --git a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp index e87294e4..1c82c47a 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp @@ -9,7 +9,7 @@ #include <kurlrequester.h> #include <tqtoolbutton.h> #include <klineedit.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "dbseprefwidget.h" #include "preferenceswidget.h" @@ -27,7 +27,7 @@ PreferencesWidget::PreferencesWidget(TQWidget *parent, const char* name) layout->addWidget(dbpw); resize(TQSize(200,200).expandedTo(minimumSizeHint())); -// connect(dbpw->browseTB_3,TQT_SIGNAL(clicked()),TQT_SLOT(browse1())); +// connect(dbpw->browseTB_3,TQ_SIGNAL(clicked()),TQ_SLOT(browse1())); emit restoreNow(); //Fill with actual params. diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp index 2d564267..1399cc6f 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp @@ -39,7 +39,7 @@ #include <kurlrequester.h> #include <tqcheckbox.h> #include <knuminput.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <tqmap.h> @@ -55,7 +55,7 @@ KDBSearchEngine2::KDBSearchEngine2(TQObject *parent,const char*name) di=0; //Database Interface is not yet initialized - connect(this,TQT_SIGNAL(hasError(TQString)),TQT_SLOT(setLastError(TQString))); + connect(this,TQ_SIGNAL(hasError(TQString)),TQ_SLOT(setLastError(TQString))); searching=false; // i'm not searching iAmReady=true; //there are no reason to say I'm not ready. @@ -134,8 +134,8 @@ bool KDBSearchEngine2::startSearch(TQString str) strategy.addAlgorithm(&wbyw); - connect(&strategy,TQT_SIGNAL(newResult(QueryResult)),this,TQT_SLOT(receiveResult(QueryResult))); - strategy.exec(searchingString); disconnect(&strategy,TQT_SIGNAL(newResult(QueryResult)),this,TQT_SLOT(receiveResult(QueryResult))); + connect(&strategy,TQ_SIGNAL(newResult(QueryResult)),this,TQ_SLOT(receiveResult(QueryResult))); + strategy.exec(searchingString); disconnect(&strategy,TQ_SIGNAL(newResult(QueryResult)),this,TQ_SLOT(receiveResult(QueryResult))); kdDebug(0) << "End of search for " << searchingString << endl; @@ -230,7 +230,7 @@ bool KDBSearchEngine2::init() else { di = new DataBaseInterface(dbDirectory,&settings); - connect(di,TQT_SIGNAL(newResult(QueryResult)),this,TQT_SLOT(receiveResult(QueryResult))); + connect(di,TQ_SIGNAL(newResult(QueryResult)),this,TQ_SLOT(receiveResult(QueryResult))); //FIXME: what wbout ready() if(!di->mainOk()) return false; //check if the main DB is OK. @@ -261,16 +261,16 @@ PrefWidget * KDBSearchEngine2::preferencesWidget(TQWidget *parent) pw = new KDB2PreferencesWidget(parent); kdDebug(0) << "new KDB2 preferences widget" << endl; setSettings(); - connect(pw,TQT_SIGNAL(restoreNow()),this,TQT_SLOT(setSettings())); - connect(pw,TQT_SIGNAL(applyNow()),this,TQT_SLOT(updateSettings())); - connect(pw,TQT_SIGNAL(destroyed()),this,TQT_SLOT(prefDestr())); + connect(pw,TQ_SIGNAL(restoreNow()),this,TQ_SLOT(setSettings())); + connect(pw,TQ_SIGNAL(applyNow()),this,TQ_SLOT(updateSettings())); + connect(pw,TQ_SIGNAL(destroyed()),this,TQ_SLOT(prefDestr())); - connect(pw->dbpw->scanAll,TQT_SIGNAL(clicked()),this,TQT_SLOT(scanAllPressed())); - connect(pw->dbpw->scanSource,TQT_SIGNAL(clicked()),this,TQT_SLOT(scanNowPressed())); - connect(pw->dbpw->addSource,TQT_SIGNAL(clicked()),this,TQT_SLOT(addSource())); - connect(pw->dbpw->editSource,TQT_SIGNAL(clicked()),this,TQT_SLOT(editSource())); - connect(pw->dbpw->removeSource,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeSource())); + connect(pw->dbpw->scanAll,TQ_SIGNAL(clicked()),this,TQ_SLOT(scanAllPressed())); + connect(pw->dbpw->scanSource,TQ_SIGNAL(clicked()),this,TQ_SLOT(scanNowPressed())); + connect(pw->dbpw->addSource,TQ_SIGNAL(clicked()),this,TQ_SLOT(addSource())); + connect(pw->dbpw->editSource,TQ_SIGNAL(clicked()),this,TQ_SLOT(editSource())); + connect(pw->dbpw->removeSource,TQ_SIGNAL(clicked()),this,TQ_SLOT(removeSource())); return pw; diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.cpp index 466b68e5..fc3fd048 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.cpp @@ -42,12 +42,12 @@ DataBaseInterface::ResultList GenericSearchAlgorithm::exec(const TQString& query uint countResults=0; for(TQValueList<AbstractSearchAlgorithm *>::iterator algoit = algoChain.begin(); algoit!=algoChain.end() && countResults < maxResults; algoit++) { - connect(*algoit,TQT_SIGNAL(newResult(QueryResult)),this,TQT_SIGNAL(newResult(QueryResult))); + connect(*algoit,TQ_SIGNAL(newResult(QueryResult)),this,TQ_SIGNAL(newResult(QueryResult))); kdDebug(0) << "Algo pointer" << (*algoit) << endl; res+=(*algoit)->exec(query); countResults=res.count(); kdDebug(0) << "Count = " << countResults << endl; - disconnect(*algoit,TQT_SIGNAL(newResult(QueryResult)),this,TQT_SIGNAL(newResult(QueryResult))); + disconnect(*algoit,TQ_SIGNAL(newResult(QueryResult)),this,TQ_SIGNAL(newResult(QueryResult))); } return res; } diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp index aa64a4b0..862e7db3 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp @@ -172,7 +172,7 @@ DataBaseInterface::MainEntry DataBaseInterface::get(const TQString& query,Search //int r= main->get(&k,&d); // kdDebug(0) << "MAINDB->GET returned: " << r << endl; - if(counter%5==0) kapp->processEvents(100); + if(counter%5==0) tdeApp->processEvents(100); // kdDebug(0) << "events processed" << endl; return qMakePair(k,d); @@ -726,7 +726,7 @@ DataBaseInterface::MainEntry DataBaseInterface::getSentence( const TQString & qu DBItemMainKey k(query); DBItemMainData d; sentence->get(&k,&d); - if(counter%5==0) kapp->processEvents(100); + if(counter%5==0) tdeApp->processEvents(100); return qMakePair(k,d); } diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp index 2fe4ae98..9ae67fde 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp @@ -205,7 +205,7 @@ Catalog * catalog=new Catalog(this,"ScanPoCatalog"); TQString pretty=u.prettyURL(); TQString location=pretty.right(pretty.length()-pretty.findRev("/")-1); -connect(catalog,TQT_SIGNAL(signalProgress(int)),this,TQT_SIGNAL(fileLoading(int))); +connect(catalog,TQ_SIGNAL(signalProgress(int)),this,TQ_SIGNAL(fileLoading(int))); emit filename(location); emit fileProgress(0); emit fileLoading(0); @@ -243,7 +243,7 @@ for (i=0;i<tot;i++) //Skip header = ???? { emit fileProgress(100*i/tot); emit added(count); - kapp->processEvents(100); + tdeApp->processEvents(100); } fuzzy=catalog->isFuzzy(i); diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp index ad2aa0dd..a51001ae 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp @@ -1,6 +1,6 @@ #include <tdelocale.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaboutdata.h> #include <kdebug.h> @@ -10,7 +10,7 @@ extern "C" { - KDE_EXPORT void *init_kbabeldict_dbsearchengine2() + TDE_EXPORT void *init_kbabeldict_dbsearchengine2() // void *init_libdbsearchengine2() { return new DbSe2Factory; diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp index 0b332eef..a4301d88 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp @@ -9,7 +9,7 @@ #include <kurlrequester.h> #include <tqtoolbutton.h> #include <klineedit.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <knuminput.h> #include "dbse2.h" @@ -30,7 +30,7 @@ KDB2PreferencesWidget::KDB2PreferencesWidget(TQWidget *parent, const char* name) standard(); -// connect(dbpw->browseTB_3,TQT_SIGNAL(clicked()),TQT_SLOT(browse1())); +// connect(dbpw->browseTB_3,TQ_SIGNAL(clicked()),TQ_SLOT(browse1())); emit restoreNow(); //Fill with actual params. diff --git a/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp b/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp index 8d706b99..5dce4c5e 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp +++ b/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp @@ -33,7 +33,7 @@ #include <tdelocale.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaboutdata.h> #include <kdebug.h> @@ -43,7 +43,7 @@ extern "C" { - KDE_EXPORT void *init_kbabeldict_poauxiliary() + TDE_EXPORT void *init_kbabeldict_poauxiliary() { return new PaFactory; } diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp index 815e025f..60f2f699 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp +++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp @@ -35,7 +35,7 @@ #include <tdecmdlineargs.h> #include <kdebug.h> #include <tdeglobal.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tqregexp.h> #include <tqtimer.h> @@ -64,7 +64,7 @@ PoAuxiliary::PoAuxiliary(TQObject *parent, const char *name) ignoreFuzzy=true; loadTimer = new TQTimer(this); - connect(loadTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(loadAuxiliary())); + connect(loadTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(loadAuxiliary())); msgidDict.setAutoDelete(true); } @@ -127,9 +127,9 @@ void PoAuxiliary::readSettings(TDEConfigBase *config) PrefWidget *PoAuxiliary::preferencesWidget(TQWidget *parent) { prefWidget = new AuxiliaryPreferencesWidget(parent,"pocompendium_prefwidget"); - connect(prefWidget, TQT_SIGNAL(applySettings()), this, TQT_SLOT(applySettings())); - connect(prefWidget, TQT_SIGNAL(restoreSettings()) - , this, TQT_SLOT(restoreSettings())); + connect(prefWidget, TQ_SIGNAL(applySettings()), this, TQ_SLOT(applySettings())); + connect(prefWidget, TQ_SIGNAL(restoreSettings()) + , this, TQ_SLOT(restoreSettings())); restoreSettings(); @@ -182,7 +182,7 @@ bool PoAuxiliary::startSearch(const TQString& t, uint pluralForm, const SearchFi clearResults(); - kapp->processEvents(100); + tdeApp->processEvents(100); text.replace("\n",""); @@ -255,7 +255,7 @@ bool PoAuxiliary::startSearchInTranslation(const TQString& text) clearResults(); - kapp->processEvents(100); + tdeApp->processEvents(100); Entry *entry = msgstrDict[text]; if(entry) @@ -424,8 +424,8 @@ void PoAuxiliary::loadAuxiliary() } emit progressStarts(i18n("Loading PO auxiliary")); - connect(catalog, TQT_SIGNAL(signalProgress(int)) - , this, TQT_SIGNAL(progress(int))); + connect(catalog, TQ_SIGNAL(signalProgress(int)) + , this, TQ_SIGNAL(progress(int))); ConversionStatus stat = catalog->openURL(u); if( stat != OK && stat != RECOVERED_PARSE_ERROR) @@ -455,7 +455,7 @@ void PoAuxiliary::loadAuxiliary() if( (100*(i+1))%total < 100 ) { emit progress((100*(i+1))/total); - kapp->processEvents(100); + tdeApp->processEvents(100); } Entry *e = new Entry; @@ -476,8 +476,8 @@ void PoAuxiliary::loadAuxiliary() auxTranslator = catalog->lastTranslator(); } - disconnect(catalog, TQT_SIGNAL(signalProgress(int)) - , this, TQT_SIGNAL(progress(int))); + disconnect(catalog, TQ_SIGNAL(signalProgress(int)) + , this, TQ_SIGNAL(progress(int))); emit progressEnds(); diff --git a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp index 378b1830..ddf63616 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp @@ -53,8 +53,8 @@ AuxiliaryPreferencesWidget::AuxiliaryPreferencesWidget(TQWidget *parent, const c layout->addWidget(prefWidget); - connect(prefWidget->urlInput->lineEdit(),TQT_SIGNAL(textChanged(const TQString&)) - , this, TQT_SLOT(setChanged())); + connect(prefWidget->urlInput->lineEdit(),TQ_SIGNAL(textChanged(const TQString&)) + , this, TQ_SLOT(setChanged())); } AuxiliaryPreferencesWidget::~AuxiliaryPreferencesWidget() diff --git a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp index 22598cbf..33bd2981 100644 --- a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp @@ -77,12 +77,12 @@ bool CompendiumData::load(KURL url) emit progressStarts(i18n("Loading PO compendium")); - connect(_catalog, TQT_SIGNAL(signalProgress(int)), this, TQT_SIGNAL(progress(int))); + connect(_catalog, TQ_SIGNAL(signalProgress(int)), this, TQ_SIGNAL(progress(int))); ConversionStatus stat=_catalog->openURL(url); - disconnect(_catalog, TQT_SIGNAL(signalProgress(int)) - , this, TQT_SIGNAL(progress(int))); + disconnect(_catalog, TQ_SIGNAL(signalProgress(int)) + , this, TQ_SIGNAL(progress(int))); if( stat!= OK && stat != RECOVERED_PARSE_ERROR) @@ -109,7 +109,7 @@ bool CompendiumData::load(KURL url) if( (100*(i+1))%total < 100 ) { emit progress((100*(i+1))/total); - kapp->processEvents(100); + tdeApp->processEvents(100); } // FIXME: shoudl care about plural forms diff --git a/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp b/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp index 936a5a5a..fff60355 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp @@ -33,7 +33,7 @@ #include <tdelocale.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaboutdata.h> #include <kdebug.h> @@ -43,7 +43,7 @@ extern "C" { - KDE_EXPORT void *init_kbabeldict_pocompendium() + TDE_EXPORT void *init_kbabeldict_pocompendium() { return new PcFactory; } diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp index 9d1f6440..eab0231b 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp @@ -38,7 +38,7 @@ #include <kstaticdeleter.h> #include <kdebug.h> #include <tdeglobal.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeio/netaccess.h> #include <tqregexp.h> @@ -88,7 +88,7 @@ PoCompendium::PoCompendium(TQObject *parent, const char *name) loadTimer = new TQTimer(this); - connect(loadTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(slotLoadCompendium())); + connect(loadTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(slotLoadCompendium())); } PoCompendium::~PoCompendium() @@ -164,9 +164,9 @@ PrefWidget *PoCompendium::preferencesWidget(TQWidget *parent) { prefWidget = new CompendiumPreferencesWidget(parent,"pocompendium_prefwidget"); kdDebug(KBABEL_SEARCH) << "PreferencesWidget is " << prefWidget << endl; - connect(prefWidget, TQT_SIGNAL(applySettings()), this, TQT_SLOT(applySettings())); - connect(prefWidget, TQT_SIGNAL(restoreSettings()) - , this, TQT_SLOT(restoreSettings())); + connect(prefWidget, TQ_SIGNAL(applySettings()), this, TQ_SLOT(applySettings())); + connect(prefWidget, TQ_SIGNAL(restoreSettings()) + , this, TQ_SLOT(restoreSettings())); restoreSettings(); @@ -369,7 +369,7 @@ bool PoCompendium::searchWords(const TQString& searchStr, uint pluralForm, TQPtr emit progress( (50*checkCounter+1)/catalogInfo.total); } - kapp->processEvents(100); + tdeApp->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->processEvents(100); + tdeApp->processEvents(100); TQString origStr = data->catalog()->msgid(i).first(); origStr = CompendiumData::simplify(origStr); @@ -828,7 +828,7 @@ void PoCompendium::slotLoadCompendium() } else { - connect(data, TQT_SIGNAL(progressEnds()), this, TQT_SLOT(recheckData())); + connect(data, TQ_SIGNAL(progressEnds()), this, TQ_SLOT(recheckData())); } } else @@ -847,7 +847,7 @@ void PoCompendium::recheckData() { if(data) { - disconnect(data, TQT_SIGNAL(progressEnds()), this, TQT_SLOT(recheckData())); + disconnect(data, TQ_SIGNAL(progressEnds()), this, TQ_SLOT(recheckData())); error = data->hasErrors(); errorMsg = data->errorMsg(); @@ -1153,14 +1153,14 @@ void PoCompendium::unregisterData() { if(data) { - disconnect(data, TQT_SIGNAL(progressStarts(const TQString&)), this - , TQT_SIGNAL(progressStarts(const TQString&))); - disconnect(data, TQT_SIGNAL(progressEnds()), this , TQT_SIGNAL(progressEnds())); - disconnect(data, TQT_SIGNAL(progress(int)), this , TQT_SIGNAL(progress(int))); + disconnect(data, TQ_SIGNAL(progressStarts(const TQString&)), this + , TQ_SIGNAL(progressStarts(const TQString&))); + disconnect(data, TQ_SIGNAL(progressEnds()), this , TQ_SIGNAL(progressEnds())); + disconnect(data, TQ_SIGNAL(progress(int)), this , TQ_SIGNAL(progress(int))); if(data->active()) { - disconnect(data,TQT_SIGNAL(progressEnds()),this,TQT_SLOT(recheckData())); + disconnect(data,TQ_SIGNAL(progressEnds()),this,TQ_SLOT(recheckData())); } if(data->unregisterObject(this)) @@ -1171,7 +1171,7 @@ void PoCompendium::unregisterData() } else { - connect(data,TQT_SIGNAL(progressEnds()),this,TQT_SLOT(removeData())); + connect(data,TQ_SIGNAL(progressEnds()),this,TQ_SLOT(removeData())); } } @@ -1195,11 +1195,11 @@ void PoCompendium::registerData() emit progressStarts(i18n("Loading PO compendium")); } - connect(data, TQT_SIGNAL( + connect(data, TQ_SIGNAL( progressStarts(const TQString&)), this - , TQT_SIGNAL(progressStarts(const TQString&))); - connect(data, TQT_SIGNAL(progressEnds()), this , TQT_SIGNAL(progressEnds())); - connect(data, TQT_SIGNAL(progress(int)), this , TQT_SIGNAL(progress(int))); + , TQ_SIGNAL(progressStarts(const TQString&))); + connect(data, TQ_SIGNAL(progressEnds()), this , TQ_SIGNAL(progressEnds())); + connect(data, TQ_SIGNAL(progress(int)), this , TQ_SIGNAL(progress(int))); } void PoCompendium::removeData() diff --git a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp index 4ecb2886..d152e3b1 100644 --- a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp @@ -53,36 +53,36 @@ CompendiumPreferencesWidget::CompendiumPreferencesWidget(TQWidget *parent, const prefWidget = new CompendiumPWidget(this); layout->addWidget(prefWidget); - connect(prefWidget->caseBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->equalBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->ngramBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->isContainedBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->containsBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->fuzzyBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->hasWordBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->wholeBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); + connect(prefWidget->caseBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->equalBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->ngramBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->isContainedBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->containsBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->fuzzyBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->hasWordBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->wholeBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); - connect(prefWidget->urlInput->lineEdit(),TQT_SIGNAL(textChanged(const TQString&)) - , this, TQT_SLOT(setChanged())); - - connect(prefWidget->equalBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(equalBtnToggled(bool))); - connect(prefWidget->ngramBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(ngramBtnToggled(bool))); - connect(prefWidget->isContainedBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(isContainedBtnToggled(bool))); - connect(prefWidget->containsBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(containsBtnToggled(bool))); - connect(prefWidget->hasWordBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(hasWordBtnToggled(bool))); + connect(prefWidget->urlInput->lineEdit(),TQ_SIGNAL(textChanged(const TQString&)) + , this, TQ_SLOT(setChanged())); + + connect(prefWidget->equalBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(equalBtnToggled(bool))); + connect(prefWidget->ngramBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(ngramBtnToggled(bool))); + connect(prefWidget->isContainedBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(isContainedBtnToggled(bool))); + connect(prefWidget->containsBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(containsBtnToggled(bool))); + connect(prefWidget->hasWordBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(hasWordBtnToggled(bool))); TQString whatsthis=i18n("<qt><p><b>Parameters</b></p>" diff --git a/kbabel/kbabeldict/modules/tmx/pc_factory.cpp b/kbabel/kbabeldict/modules/tmx/pc_factory.cpp index 6a522d4c..1ff113f6 100644 --- a/kbabel/kbabeldict/modules/tmx/pc_factory.cpp +++ b/kbabel/kbabeldict/modules/tmx/pc_factory.cpp @@ -33,7 +33,7 @@ #include <tdelocale.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaboutdata.h> #include <kdebug.h> @@ -43,7 +43,7 @@ extern "C" { - KDE_EXPORT void *init_kbabeldict_tmxcompendium() + TDE_EXPORT void *init_kbabeldict_tmxcompendium() { return new PcFactory; } diff --git a/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp b/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp index 9b4cde15..a4ba2cb4 100644 --- a/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp @@ -55,34 +55,34 @@ TmxCompendiumPreferencesWidget::TmxCompendiumPreferencesWidget(TQWidget *parent, prefWidget = new TmxCompendiumPWidget(this); layout->addWidget(prefWidget); - connect(prefWidget->caseBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->equalBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->ngramBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->isContainedBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->containsBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->hasWordBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->wholeBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); + connect(prefWidget->caseBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->equalBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->ngramBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->isContainedBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->containsBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->hasWordBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->wholeBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); - connect(prefWidget->urlInput->lineEdit(),TQT_SIGNAL(textChanged(const TQString&)) - , this, TQT_SLOT(setChanged())); - - connect(prefWidget->equalBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(equalBtnToggled(bool))); - connect(prefWidget->ngramBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(ngramBtnToggled(bool))); - connect(prefWidget->isContainedBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(isContainedBtnToggled(bool))); - connect(prefWidget->containsBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(containsBtnToggled(bool))); - connect(prefWidget->hasWordBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(hasWordBtnToggled(bool))); + connect(prefWidget->urlInput->lineEdit(),TQ_SIGNAL(textChanged(const TQString&)) + , this, TQ_SLOT(setChanged())); + + connect(prefWidget->equalBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(equalBtnToggled(bool))); + connect(prefWidget->ngramBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(ngramBtnToggled(bool))); + connect(prefWidget->isContainedBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(isContainedBtnToggled(bool))); + connect(prefWidget->containsBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(containsBtnToggled(bool))); + connect(prefWidget->hasWordBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(hasWordBtnToggled(bool))); TQString whatsthis=i18n("<qt><p><b>Parameters</b></p>" diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp index 6ce92e84..1f19a4cd 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp @@ -38,7 +38,7 @@ #include <kstaticdeleter.h> #include <kdebug.h> #include <tdeglobal.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeio/netaccess.h> #include <tqtextstream.h> @@ -82,7 +82,7 @@ TmxCompendium::TmxCompendium(TQObject *parent, const char *name) loadTimer = new TQTimer(this); - connect(loadTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(slotLoadCompendium())); + connect(loadTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(slotLoadCompendium())); } TmxCompendium::~TmxCompendium() @@ -155,9 +155,9 @@ void TmxCompendium::readSettings(TDEConfigBase *config) PrefWidget *TmxCompendium::preferencesWidget(TQWidget *parent) { prefWidget = new TmxCompendiumPreferencesWidget(parent,"tmxcompendium_prefwidget"); - connect(prefWidget, TQT_SIGNAL(applySettings()), this, TQT_SLOT(applySettings())); - connect(prefWidget, TQT_SIGNAL(restoreSettings()) - , this, TQT_SLOT(restoreSettings())); + connect(prefWidget, TQ_SIGNAL(applySettings()), this, TQ_SLOT(applySettings())); + connect(prefWidget, TQ_SIGNAL(restoreSettings()) + , this, TQ_SLOT(restoreSettings())); restoreSettings(); @@ -337,7 +337,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea emit progress( (100*(checkCounter+1))/data->numberOfEntries()); } - kapp->processEvents(100); + tdeApp->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->processEvents(100); + tdeApp->processEvents(100); if(i >= data->numberOfEntries()) { @@ -718,7 +718,7 @@ void TmxCompendium::slotLoadCompendium() } else { - connect(data, TQT_SIGNAL(progressEnds()), this, TQT_SLOT(recheckData())); + connect(data, TQ_SIGNAL(progressEnds()), this, TQ_SLOT(recheckData())); } } else @@ -737,7 +737,7 @@ void TmxCompendium::recheckData() { if(data) { - disconnect(data, TQT_SIGNAL(progressEnds()), this, TQT_SLOT(recheckData())); + disconnect(data, TQ_SIGNAL(progressEnds()), this, TQ_SLOT(recheckData())); error = data->hasErrors(); errorMsg = data->errorMsg(); @@ -915,14 +915,14 @@ void TmxCompendium::unregisterData() { if(data) { - disconnect(data, TQT_SIGNAL(progressStarts(const TQString&)), this - , TQT_SIGNAL(progressStarts(const TQString&))); - disconnect(data, TQT_SIGNAL(progressEnds()), this , TQT_SIGNAL(progressEnds())); - disconnect(data, TQT_SIGNAL(progress(int)), this , TQT_SIGNAL(progress(int))); + disconnect(data, TQ_SIGNAL(progressStarts(const TQString&)), this + , TQ_SIGNAL(progressStarts(const TQString&))); + disconnect(data, TQ_SIGNAL(progressEnds()), this , TQ_SIGNAL(progressEnds())); + disconnect(data, TQ_SIGNAL(progress(int)), this , TQ_SIGNAL(progress(int))); if(data->active()) { - disconnect(data,TQT_SIGNAL(progressEnds()),this,TQT_SLOT(recheckData())); + disconnect(data,TQ_SIGNAL(progressEnds()),this,TQ_SLOT(recheckData())); } if(data->unregisterObject(this)) @@ -933,7 +933,7 @@ void TmxCompendium::unregisterData() } else { - connect(data,TQT_SIGNAL(progressEnds()),this,TQT_SLOT(removeData())); + connect(data,TQ_SIGNAL(progressEnds()),this,TQ_SLOT(removeData())); } } @@ -957,10 +957,10 @@ void TmxCompendium::registerData() emit progressStarts(i18n("Loading PO compendium")); } - connect(data, TQT_SIGNAL(progressStarts(const TQString&)), this - , TQT_SIGNAL(progressStarts(const TQString&))); - connect(data, TQT_SIGNAL(progressEnds()), this , TQT_SIGNAL(progressEnds())); - connect(data, TQT_SIGNAL(progress(int)), this , TQT_SIGNAL(progress(int))); + connect(data, TQ_SIGNAL(progressStarts(const TQString&)), this + , TQ_SIGNAL(progressStarts(const TQString&))); + connect(data, TQ_SIGNAL(progressEnds()), this , TQ_SIGNAL(progressEnds())); + connect(data, TQ_SIGNAL(progress(int)), this , TQ_SIGNAL(progress(int))); } void TmxCompendium::removeData() diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp index 17a9ec15..85902961 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp @@ -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->processEvents(100); + tdeApp->processEvents(100); } TQDomNodeList tuvTags = tuTags.item(i).toElement().elementsByTagName("tuv"); |