diff options
Diffstat (limited to 'khelpcenter/htmlsearch')
| -rw-r--r-- | khelpcenter/htmlsearch/htmlsearch.cpp | 54 | ||||
| -rw-r--r-- | khelpcenter/htmlsearch/htmlsearch.desktop | 223 | ||||
| -rw-r--r-- | khelpcenter/htmlsearch/htmlsearch.h | 4 | ||||
| -rw-r--r-- | khelpcenter/htmlsearch/kcmhtmlsearch.cpp | 54 | ||||
| -rw-r--r-- | khelpcenter/htmlsearch/kcmhtmlsearch.h | 2 | ||||
| -rw-r--r-- | khelpcenter/htmlsearch/klangcombo.cpp | 2 | ||||
| -rw-r--r-- | khelpcenter/htmlsearch/klangcombo.h | 2 | ||||
| -rw-r--r-- | khelpcenter/htmlsearch/ktagcombobox.cpp | 16 | ||||
| -rw-r--r-- | khelpcenter/htmlsearch/ktagcombobox.h | 2 | ||||
| -rw-r--r-- | khelpcenter/htmlsearch/progressdialog.cpp | 2 | ||||
| -rw-r--r-- | khelpcenter/htmlsearch/progressdialog.h | 2 |
11 files changed, 71 insertions, 292 deletions
diff --git a/khelpcenter/htmlsearch/htmlsearch.cpp b/khelpcenter/htmlsearch/htmlsearch.cpp index 5fd0f4640..0a9c78b69 100644 --- a/khelpcenter/htmlsearch/htmlsearch.cpp +++ b/khelpcenter/htmlsearch/htmlsearch.cpp @@ -4,8 +4,8 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <kstandarddirs.h> -#include <kprocess.h> +#include <tdestandarddirs.h> +#include <tdeprocess.h> #include <tdelocale.h> #include <tdeconfig.h> @@ -22,7 +22,7 @@ HTMLSearch::HTMLSearch() TQString HTMLSearch::dataPath(const TQString& _lang) { - return kapp->dirs()->saveLocation("data", TQString("khelpcenter/%1").arg(_lang)); + return tdeApp->dirs()->saveLocation("data", TQString("khelpcenter/%1").arg(_lang)); } @@ -56,7 +56,7 @@ void HTMLSearch::scanDir(const TQString& dir) if (*it != "." && *it != "..") { scanDir(dir + *it + "/"); - kapp->processEvents(); + tdeApp->processEvents(); } } @@ -74,7 +74,7 @@ bool HTMLSearch::saveFilesList(const TQString& _lang) // add KDE help dirs if (config->readBoolEntry("KDE", true)) - dirs = kapp->dirs()->findDirs("html", _lang + "/"); + dirs = tdeApp->dirs()->findDirs("html", _lang + "/"); kdDebug() << "got " << dirs.count() << " dirs\n"; // TODO: Man and Info!! @@ -232,7 +232,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent) // create progress dialog progress = new ProgressDialog(parent); progress->show(); - kapp->processEvents(); + tdeApp->processEvents(); // create files list ---------------------------------------------- if (!saveFilesList(_lang)) @@ -243,7 +243,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent) // run htdig ------------------------------------------------------ TDEConfig *config = new TDEConfig("khelpcenterrc", true); TDEConfigGroupSaver saver(config, "htdig"); - TQString exe = config->readPathEntry("htdig", kapp->dirs()->findExe("htdig")); + TQString exe = config->readPathEntry("htdig", tdeApp->dirs()->findExe("htdig")); if (exe.isEmpty()) { @@ -276,11 +276,11 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent) kdDebug() << "Running htdig" << endl; - connect(_proc, TQT_SIGNAL(receivedStdout(TDEProcess *,char*,int)), - this, TQT_SLOT(htdigStdout(TDEProcess *,char*,int))); + connect(_proc, TQ_SIGNAL(receivedStdout(TDEProcess *,char*,int)), + this, TQ_SLOT(htdigStdout(TDEProcess *,char*,int))); - connect(_proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(htdigExited(TDEProcess *))); + connect(_proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(htdigExited(TDEProcess *))); _htdigRunning = true; @@ -310,7 +310,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent) // execute htdig _proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout ); - kapp->enter_loop(); + tdeApp->enter_loop(); if (!_proc->normalExit() || _proc->exitStatus() != 0) { @@ -322,13 +322,13 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent) // _filesDigged += CHUNK_SIZE; progress->setFilesDigged(_filesDigged); - kapp->processEvents(); + tdeApp->processEvents(); } progress->setState(2); // run htmerge ----------------------------------------------------- - exe = config->readPathEntry("htmerge", kapp->dirs()->findExe("htmerge")); + exe = config->readPathEntry("htmerge", tdeApp->dirs()->findExe("htmerge")); if (exe.isEmpty()) { delete config; @@ -340,14 +340,14 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent) kdDebug() << "Running htmerge" << endl; - connect(_proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(htmergeExited(TDEProcess *))); + connect(_proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(htmergeExited(TDEProcess *))); _htmergeRunning = true; _proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); - kapp->enter_loop(); + tdeApp->enter_loop(); if (!_proc->normalExit() || _proc->exitStatus() != 0) { @@ -360,7 +360,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent) delete _proc; progress->setState(3); - kapp->processEvents(); + tdeApp->processEvents(); delete progress; delete config; @@ -393,7 +393,7 @@ void HTMLSearch::htdigExited(TDEProcess *p) { kdDebug() << "htdig terminated " << p->exitStatus() << endl; _htdigRunning = false; - kapp->exit_loop(); + tdeApp->exit_loop(); } @@ -401,7 +401,7 @@ void HTMLSearch::htmergeExited(TDEProcess *) { kdDebug() << "htmerge terminated" << endl; _htmergeRunning = false; - kapp->exit_loop(); + tdeApp->exit_loop(); } @@ -415,7 +415,7 @@ void HTMLSearch::htsearchExited(TDEProcess *) { kdDebug() << "htsearch terminated" << endl; _htsearchRunning = false; - kapp->exit_loop(); + tdeApp->exit_loop(); } @@ -432,7 +432,7 @@ TQString HTMLSearch::search(TQString _lang, TQString words, TQString method, int // run htsearch ---------------------------------------------------- TDEConfig *config = new TDEConfig("khelpcenterrc", true); TDEConfigGroupSaver saver(config, "htdig"); - TQString exe = config->readPathEntry("htsearch", kapp->dirs()->findExe("htsearch")); + TQString exe = config->readPathEntry("htsearch", tdeApp->dirs()->findExe("htsearch")); if (exe.isEmpty()) { delete config; @@ -444,17 +444,17 @@ TQString HTMLSearch::search(TQString _lang, TQString words, TQString method, int kdDebug() << "Running htsearch" << endl; - connect(_proc, TQT_SIGNAL(receivedStdout(TDEProcess *,char*,int)), - this, TQT_SLOT(htsearchStdout(TDEProcess *,char*,int))); - connect(_proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(htsearchExited(TDEProcess *))); + connect(_proc, TQ_SIGNAL(receivedStdout(TDEProcess *,char*,int)), + this, TQ_SLOT(htsearchStdout(TDEProcess *,char*,int))); + connect(_proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(htsearchExited(TDEProcess *))); _htsearchRunning = true; _searchResult = ""; _proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); - kapp->enter_loop(); + tdeApp->enter_loop(); if (!_proc->normalExit() || _proc->exitStatus() != 0) { diff --git a/khelpcenter/htmlsearch/htmlsearch.desktop b/khelpcenter/htmlsearch/htmlsearch.desktop index e0c339bbe..ce5c66608 100644 --- a/khelpcenter/htmlsearch/htmlsearch.desktop +++ b/khelpcenter/htmlsearch/htmlsearch.desktop @@ -10,230 +10,9 @@ X-TDE-FactoryName=htmlsearch X-TDE-ControlModuleType=User Name=Index -Name[af]=Indeks -Name[ar]=الفهرس -Name[az]=İndeks -Name[be]=Індэкс -Name[bg]=Индекс -Name[bn]=সূচি -Name[br]=Meneger -Name[bs]=Indeks -Name[ca]=Índex -Name[cs]=Rejstřík -Name[csb]=Indeks -Name[cy]=Mynegai -Name[da]=Indeks -Name[de]=Stichwortverzeichnis -Name[el]=Ευρετήριο -Name[eo]=Indekso -Name[es]=Índice -Name[et]=Indeks -Name[eu]=Indizea -Name[fa]=نمایه -Name[fi]=Hakemisto -Name[fy]=Yndeks -Name[ga]=Innéacs -Name[gl]=Índice -Name[he]=אינדקס -Name[hi]=सूची -Name[hr]=Indeks -Name[hu]=Keresési index -Name[id]=Indeks -Name[is]=Yfirlit -Name[it]=Indice -Name[ja]=インデックス -Name[ka]=ინდექსი -Name[kk]=Индекс -Name[km]=លិបិក្រម -Name[ko]=찾아보기 -Name[lo]=ດັດສະນີ -Name[lt]=Rodyklė -Name[lv]=Indekss -Name[mk]=Индекс -Name[mn]=Товчоон -Name[ms]=Indeks -Name[mt]=Indiċi -Name[nb]=Indeks -Name[ne]=अनुक्रमणिका -Name[nn]=Indeks -Name[nso]=Palo ya Bangwadi -Name[pa]=ਤਤਕਰਾ -Name[pl]=Indeks -Name[pt]=Índice -Name[pt_BR]=Índice -Name[ru]=Индекс -Name[rw]=Umubarendanga -Name[se]=Indeaksa -Name[sk]=Katalóg -Name[sl]=Indeks -Name[sr]=Индекс -Name[sr@Latn]=Indeks -Name[ss]=Indzikimba -Name[ta]=பொருளடக்கம் -Name[te]=సూచిక -Name[tg]=Феҳрист -Name[th]=ดัชนี -Name[tr]=İndeks -Name[tt]=İsemlek -Name[uk]=Індекс -Name[uz]=Indeks -Name[uz@cyrillic]=Индекс -Name[ven]=Mafhelelo a bugu -Name[vi]=Danh mục -Name[wa]=Indecse -Name[xh]=Isalathiso -Name[zh_CN]=索引 -Name[zh_TW]=索引 -Name[zu]=Uhlelo lokuqukethwe Comment=Index generation -Comment[af]=Indeks genereering -Comment[ar]=توليد الفهارس -Comment[az]=İndeks yaratma -Comment[be]=Стварэнне індэксу -Comment[bg]=Създаване на индекс -Comment[bn]=সূচি উত্পাদন -Comment[br]=Genel ar meneger -Comment[bs]=Pravljenje indeksa -Comment[ca]=Generació de l'índex -Comment[cs]=Vytvoření rejstříku -Comment[csb]=Generowanié indeksu -Comment[cy]=Cynhyrchu mynegai -Comment[da]=Indeksgenerering -Comment[de]=Erstellung des Stichwortverzeichnisses -Comment[el]=Δημιουργία περιεχομένων -Comment[eo]=Indekskreado -Comment[es]=Generación del índice -Comment[et]=Indeksi tekitamine -Comment[eu]=Indizea sortu -Comment[fa]=تولید نمایه -Comment[fi]=Hakemiston luonti -Comment[fr]=Génération d'index -Comment[fy]=Yndeksgeneraasje -Comment[gl]=Xeración de Índices -Comment[he]=יצירת אינדקס -Comment[hi]=सूची बनाएँ -Comment[hr]=Generiranje indeksa -Comment[hu]=Index létrehozása -Comment[id]=Pembuatan Index -Comment[is]=Yfirlitsgerð -Comment[it]=Generazione dell'indice -Comment[ja]=インデックスを生成 -Comment[ka]=ინდექსის შექმნა -Comment[kk]=Индексті құру -Comment[km]=ការបង្កើតលិបិក្រម -Comment[ko]=찾아보기 생성 -Comment[lo]=ສ້າງດັດສະນີ -Comment[lt]=Rodyklės generavimas -Comment[lv]=Indeksa ģenerēšana -Comment[mk]=Генерирање на индекс -Comment[mn]=Товчоон үүсгэх -Comment[ms]=Penjanaan indeks -Comment[mt]=Ġenerazzjoni tal-Indiċi -Comment[nb]=Indekslaging -Comment[nds]=Index maken -Comment[ne]=अनुक्रमणिका उत्पादन -Comment[nl]=Indexgeneratie -Comment[nn]=Indekslaging -Comment[nso]=Thlagiso ya Palo ya Bangwadi -Comment[oc]=Generacion de l'index -Comment[pa]=ਤਤਕਰਾ ਬਣਾਓ -Comment[pl]=Generowanie indeksu -Comment[pt]=Geração de índices -Comment[pt_BR]=Geração de índice -Comment[ro]=Generează indexul -Comment[ru]=Создание индекса -Comment[rw]=Irema ry'Umubarendanga -Comment[se]=Indeaksaráhkadeapmi -Comment[sk]=Generovanie katalógu -Comment[sl]=Ustvarjanje indeksa -Comment[sr]=Генерисање индекса -Comment[sr@Latn]=Generisanje indeksa -Comment[sv]=Indexskapare -Comment[ta]=பொருளடக்க இயக்கம் -Comment[te]=సూచిక ను తయారుచెయుట -Comment[tg]=Эҷоди феҳрист -Comment[th]=สร้างดัชนี -Comment[tr]=İndeks oluşturma -Comment[tt]=İsemlek ürçetü -Comment[uk]=Утворення індексу -Comment[uz]=Indeksni yaratish -Comment[uz@cyrillic]=Индексни яратиш -Comment[ven]=Murafho wa Index -Comment[vi]=Tạo danh mục -Comment[wa]=Ahiver l' indecse -Comment[xh]=Ulwenziwo Lwesalathiso -Comment[zh_CN]=索引生成 -Comment[zh_TW]=產生索引 -Comment[zu]=Ukugaywa kohlelo lokuqukethwe Keywords=Help;HTML;Search;Index;htdig;htsearch;htmerge;Scope;Language; -Keywords[ar]=مساعدة;HTML;بحث;فهرس;htdig;htsearch;htmerge;Scope;اللغة; -Keywords[az]=Yardım;HTML;Axtar;İndeks;htdig;htmerge;Dil; -Keywords[be]=Дапамога;Даведка;Пошук;Індэкс;Мова;Help;HTML;Search;Index;htdig;htsearch;htmerge;Scope;Language; -Keywords[bg]=помощ; индекс; търсене; обхват; език; Help; HTML; Search; Index; htdig; htsearch; htmerge; Scope; Language; -Keywords[ca]=Ajuda;HTML;Cerca;Índex;htdig;htsearch;htmerge;Scope;Llengua; -Keywords[cs]=Nápověda;HTML;Hledat;Index;htdig;htsearch;htmerge;Rejstřík;Jazyk;Rozsah; -Keywords[csb]=pòmòc;HTML;szëkôj;szëkba;indeks;htdig;htsearch;htmerge;òbjim;jãzëk; -Keywords[cy]=Cymorth;HTML;Chwilio;Mynegai;htdig;htsearch;htmerge;Amrediad;Iaith ; -Keywords[da]=Hjælp;HTML;Søg;Indeks;htdig;htsearch;htmerge;Scope;Sprog; -Keywords[de]=Hilfe;HTML;Suche;Index;Stichwortverzeichnis;htdig;Sprachen; -Keywords[el]=Βοήθεια;HTML;Αναζήτηση;Ευρετήριο;htdig;htsearch;htmerge;Scope;Γλώσσα; -Keywords[eo]=helpo;HTML;serĉo;indekso;htdig;htsearch;htmerge;areo;lingvo; -Keywords[es]=Ayuda;HTML;Búsqueda;Índice;htdig;htsearch;htmerge;Ámbito;Idioma; -Keywords[et]=abi;HTML;otsing;indeks;htdig;htsearch;htmerge;skoop;keel; -Keywords[eu]=Laguntza;HTML;Bilatu;Indizea;htdig;htsearch;htmerge;Scope;Hizkuntza; -Keywords[fa]=کمک، زنگام، جستجو، نمایه، htdig، htsearch، htmerge، دامنه، زبان; -Keywords[fi]=Ohje;HTML;Etsi;Indeksi;htdig;htsearch;htmerge;Kieli; -Keywords[fr]=aide;HTML;recherche;index;htdig;htsearch;htmerge;pays;langue; -Keywords[fy]=help;html;zoeken;sykje;yndeks;htdig;htsearch;htmerge;scope;taal; -Keywords[ga]=Cabhair;HTML;Cuardach;Innéacs;htdig;htsearch;htmerge;Scóip;Teanga; -Keywords[gl]=Axuda;HTML;Procura;Índice;htdig;htsearch;htmerge;Scope;Lingua; -Keywords[he]=עזרה;HTML;חיפוש;אינדקס;htdig;htsearch;htmerge;טווח;שפה;Help;Search;Index;htdig;htsearch;htmerge;Scope;Language; -Keywords[hi]=मदद;एचटीएमएल;खोज;तालिका;एचटीडिक;एचटीसर्च;एचटीमर्ज;स्कोप;भाषा; -Keywords[hr]=Help;HTML;Search;Index;htdig;htsearch;htmerge;Scope;Language;Pomoć;Pretraživanje;Traži;Pretraga;Indeks;Opseg;Raspon;Jezik; -Keywords[hu]=segítség;HTML;keresés;index;htdig;htsearch;htmerge;érvényességi kör;nyelv; -Keywords[id]=Bantuan;HTML;Cari;Indeks;htdig;htsearch;htmerge;Scope;Language; -Keywords[is]=Hjálp;HTML;leit;yfirlit;htdig;svæði;tungumál; -Keywords[it]=aiuto;HTML;cerca;indice;htdig;htsearch;htmerge;scope;lingua; -Keywords[ja]=ヘルプ;HTML;検索;インデックス;htdig;htsearch;htmerge;スコープ;言語; -Keywords[km]=ជំនួយ;HTML;ស្វែងរក;លិបិក្រម;htdig;htsearch;htmerge;វិសាលភាព;ភាសា; -Keywords[lo]=ຊ່ວຍເຫລືອ;HTML;ຄົ້ນຫາດັດສະນີ;htdig;htsearch;htmerge;Scope;ພາສາ; -Keywords[lt]=Pagalba;HTML;Paieška;Sąrašas;htdig;htsearch;htmerge;Sritis;Kalba; -Keywords[lv]=Palīdzība;HTML;Meklēt;Indekss;htdig;htsearch;htmerge;Mērķis;Valoda; -Keywords[mk]=Help;HTML;Search;Index;htdig;htsearch;htmerge;Scope;Language; Помош;Пребарувај;Индекс;Опфат;Јазик; -Keywords[mn]=Тусламж;HTML;Хайх;Товчоо;Товчоон;htdig;Хэлүүд; -Keywords[mt]=Help;HTML;Search;Index;htdig;htsearch;htmerge;Scope;Language;Għajnuna;Fittex;Indiċi; -Keywords[nb]=Hjelp;HTML;Søk;Indeks;htdig;htsearch;htmerge;språk; -Keywords[nds]=Hülp;HTML;Söken;Index;htdig;htsearch;htmerge;Scope;Spraak; -Keywords[ne]=मद्दत;HTML; खोजी; अनुक्रमणिका;htdig;htsearch;htmerge; क्षेत्र; भाषा; -Keywords[nl]=help;html;zoeken;index;htdig;htsearch;htmerge;scope;taal; -Keywords[nn]=hjelp;HTML;søk;indeks;htdig;htmerge;område;språk; -Keywords[nso]=Thuso;HTML;Nyako;Palo ya Bangwadi;htdig;htnyako;htmerge;Scope;Leleme; -Keywords[pa]=ਸਹਾਇਤਾ;HTML;Index;htdig;htsearch;htmerge;Scope;ਭਾਸ਼ਾ;ਖੋਜ; -Keywords[pl]=pomoc;HTML;szukaj;indeks;htdig;htsearch;htmerge;zakres;język; -Keywords[pt]=ajuda;html;procura;índice;htdig;htsearch;htmerge;âmbito;língua; -Keywords[pt_BR]=Ajuda;HTML;Procurar;Índice;htdig;htsearch;htmerge;escopo;idioma; -Keywords[ro]=ajutor;HTML;căutare;index;htdig;htsearch;htmerge;domeniu;limbaj; -Keywords[rw]=Ifashayobora;HTML;Ishakisha;htgucukura;htgushakisha;htgukomatanya;Igishushanyombonera;Ururimi; -Keywords[se]=veahkki;HTML;ohcan;indeaksa;indeksa;htdig;htmerge;gaska;giella; -Keywords[sk]=Pomoc;HTML;Hľadať;Katalóg;Index;htdig;htsearch;htmerge;rozsah;jazyk;Pomocník; -Keywords[sl]=Pomoč;HTML;iskanje;indeks;htdig;htsearch;htmerge;doseg;jezik; -Keywords[sr]=Help;HTML;Search;Index;htdig;htsearch;htmerge;Scope;Language;помоћ;претрага;индекс;језик;опсег; -Keywords[sr@Latn]=Help;HTML;Search;Index;htdig;htsearch;htmerge;Scope;Language;pomoć;pretraga;indeks;jezik;opseg; -Keywords[sv]=Hjälp;HTML;Sök;Index;htdig;htsearch;htmerge;Omfång;Språk; -Keywords[ta]=உதவி;HTML;தேடு;பொருளடக்கம்;htdig;htதேடு;htகல;வரையெல்லை;மொழி; -Keywords[te]=సహాయం;హెచ్ టి ఎంఎల్;అన్వెషణ; సూచిక; హెచ్ టి డిగ్;హెచ్ టి అన్వెషణ;హెచ్ టి కలుపు; లక్ష్యము; భాష.; -Keywords[th]=ช่วยเหลือ;HTML;ค้นหา;ดัชนี;htdig;htsearch;htmerge;Scope;ภาษา; -Keywords[tr]=Yardım;HTML;Ara;İndeks;htdig;htmerge;Dil; -Keywords[uk]=довідка;HTML;пошук;індекс;htdig;контекст;мова;htsearch;htmerge; -Keywords[uz]=Yordam;HTML;Qidirish;Indeks;htdig;htsearch;htmerge;Til; -Keywords[uz@cyrillic]=Ёрдам;HTML;Қидириш;Индекс;htdig;htsearch;htmerge;Тил; -Keywords[ven]=Thuso;HTML;Toda;Mafhelelo;bwa ha ht;toda ha ht;thanganyo ya ht;zwaphanda;luambo; -Keywords[vi]=Trợ giúp;HTML;Tìm kiếm;danh sách;htdig;htsearch;htmerge;Phạm vi;Ngôn ngữ; -Keywords[wa]=Aide;Aidance;HTML;Trover;Indecse;htdig;htsearch;htmerge;Scope;Lingaedje; -Keywords[xh]=Uncedo;HTML;Phendla;Isalathiso;htdig;htsearch;htmerge;Scope;Ulwimi; -Keywords[zh_CN]=Help;HTML;Search;Index;htdig;htsearch;htmerge;Scope;Language;帮助;查找;索引;范围;语言; -Keywords[zh_TW]=Help;HTML;Search;Index;htdig;htsearch;htmerge;Scope;Language;求助;搜尋;索引;語言; -Keywords[zu]=Usizo;HTML;Usesho;Uhlelo lokuqukethwe;htdig;htsearch;htmerge; Indawo elinganiselwe;Ulimi; + Categories=Qt;TDE;X-TDE-settings-system; diff --git a/khelpcenter/htmlsearch/htmlsearch.h b/khelpcenter/htmlsearch/htmlsearch.h index 37d9bf39f..e0c533f81 100644 --- a/khelpcenter/htmlsearch/htmlsearch.h +++ b/khelpcenter/htmlsearch/htmlsearch.h @@ -16,9 +16,9 @@ class TDEProcess; class ProgressDialog; -class HTMLSearch : public QObject +class HTMLSearch : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp index 3db9c9895..d130f9dbd 100644 --- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp +++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp @@ -19,14 +19,14 @@ */ #include <tqlayout.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kurllabel.h> #include <tdeapplication.h> #include <tqcheckbox.h> #include <tqwhatsthis.h> #include <tdefiledialog.h> -#include <kprocess.h> +#include <tdeprocess.h> #include "klangcombo.h" #include <kurlrequester.h> #include <klineedit.h> @@ -60,8 +60,8 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name) url->setText(i18n("ht://dig home page")); url->setAlignment(TQLabel::AlignHCenter); grid->addMultiCellWidget(url, 2,2, 0, 1); - connect(url, TQT_SIGNAL(leftClickedURL(const TQString&)), - this, TQT_SLOT(urlClicked(const TQString&))); + connect(url, TQ_SIGNAL(leftClickedURL(const TQString&)), + this, TQ_SLOT(urlClicked(const TQString&))); gb = new TQGroupBox(i18n("Program Locations"), this); @@ -74,7 +74,7 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name) l->setBuddy( htdigBin ); grid->addWidget(l, 1,0); grid->addWidget(htdigBin, 1,1); - connect(htdigBin->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(configChanged())); + connect(htdigBin->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(configChanged())); TQString wtstr = i18n( "Enter the path to your htdig program here, e.g. /usr/local/bin/htdig" ); TQWhatsThis::add( htdigBin, wtstr ); TQWhatsThis::add( l, wtstr ); @@ -84,7 +84,7 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name) l->setBuddy( htsearchBin ); grid->addWidget(l, 2,0); grid->addWidget(htsearchBin, 2,1); - connect(htsearchBin->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(configChanged())); + connect(htsearchBin->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(configChanged())); wtstr = i18n( "Enter the path to your htsearch program here, e.g. /usr/local/bin/htsearch" ); TQWhatsThis::add( htsearchBin, wtstr ); TQWhatsThis::add( l, wtstr ); @@ -94,7 +94,7 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name) l->setBuddy( htmergeBin ); grid->addWidget(l, 3,0); grid->addWidget(htmergeBin, 3,1); - connect(htmergeBin->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(configChanged())); + connect(htmergeBin->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(configChanged())); wtstr = i18n( "Enter the path to your htmerge program here, e.g. /usr/local/bin/htmerge" ); TQWhatsThis::add( htmergeBin, wtstr ); TQWhatsThis::add( l, wtstr ); @@ -110,17 +110,17 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name) indexKDE = new TQCheckBox(i18n("&TDE help"), gb); vvbox->addWidget(indexKDE); - connect(indexKDE, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(indexKDE, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); indexMan = new TQCheckBox(i18n("&Man pages"), gb); vvbox->addWidget(indexMan); indexMan->setEnabled(false), - connect(indexMan, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(indexMan, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); indexInfo = new TQCheckBox(i18n("&Info pages"), gb); vvbox->addWidget(indexInfo); indexInfo->setEnabled(false); - connect(indexInfo, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(indexInfo, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); gb = new TQGroupBox(i18n("Additional Search Paths"), this); hbox->addWidget(gb); @@ -159,12 +159,12 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name) TQWhatsThis::add( runButton, i18n( "Click this button to generate the index for the fulltext search." ) ); runButton->setFixedSize(runButton->sizeHint()); vbox->addWidget(runButton, AlignRight); - connect(runButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(generateIndex())); + connect(runButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(generateIndex())); - connect(addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addClicked())); - connect(delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(delClicked())); - connect(searchPaths, TQT_SIGNAL(highlighted(const TQString &)), - this, TQT_SLOT(pathSelected(const TQString &))); + connect(addButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addClicked())); + connect(delButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(delClicked())); + connect(searchPaths, TQ_SIGNAL(highlighted(const TQString &)), + this, TQ_SLOT(pathSelected(const TQString &))); checkButtons(); @@ -184,7 +184,7 @@ void TDEHTMLSearchConfig::loadLanguages() for (TQStringList::ConstIterator it = langs.begin(); it != langs.end(); ++it) { - KSimpleConfig entry(*it); + TDESimpleConfig entry(*it); entry.setGroup(TQString::fromLatin1("KCM Locale")); TQString name = entry.readEntry(TQString::fromLatin1("Name"), TDEGlobal::locale()->translate("without name")); @@ -256,9 +256,9 @@ void TDEHTMLSearchConfig::load() TDEConfig *config = new TDEConfig("khelpcenterrc", true); config->setGroup("htdig"); - htdigBin->lineEdit()->setText(config->readPathEntry("htdig", kapp->dirs()->findExe("htdig"))); - htsearchBin->lineEdit()->setText(config->readPathEntry("htsearch", kapp->dirs()->findExe("htsearch"))); - htmergeBin->lineEdit()->setText(config->readPathEntry("htmerge", kapp->dirs()->findExe("htmerge"))); + htdigBin->lineEdit()->setText(config->readPathEntry("htdig", tdeApp->dirs()->findExe("htdig"))); + htsearchBin->lineEdit()->setText(config->readPathEntry("htsearch", tdeApp->dirs()->findExe("htsearch"))); + htmergeBin->lineEdit()->setText(config->readPathEntry("htmerge", tdeApp->dirs()->findExe("htmerge"))); config->setGroup("Scope"); indexKDE->setChecked(config->readBoolEntry("KDE", true)); @@ -310,9 +310,9 @@ void TDEHTMLSearchConfig::save() void TDEHTMLSearchConfig::defaults() { - htdigBin->lineEdit()->setText(kapp->dirs()->findExe("htdig")); - htsearchBin->lineEdit()->setText(kapp->dirs()->findExe("htsearch")); - htmergeBin->lineEdit()->setText(kapp->dirs()->findExe("htmerge")); + htdigBin->lineEdit()->setText(tdeApp->dirs()->findExe("htdig")); + htsearchBin->lineEdit()->setText(tdeApp->dirs()->findExe("htsearch")); + htmergeBin->lineEdit()->setText(tdeApp->dirs()->findExe("htmerge")); indexKDE->setChecked(true); indexMan->setChecked(false); @@ -328,7 +328,7 @@ void TDEHTMLSearchConfig::defaults() void TDEHTMLSearchConfig::urlClicked(const TQString &url) { - kapp->invokeBrowser(url); + tdeApp->invokeBrowser(url); } @@ -336,7 +336,7 @@ void TDEHTMLSearchConfig::generateIndex() { save(); - TQString exe = kapp->dirs()->findExe("tdehtmlindex"); + TQString exe = tdeApp->dirs()->findExe("tdehtmlindex"); if (exe.isEmpty()) return; @@ -345,8 +345,8 @@ void TDEHTMLSearchConfig::generateIndex() indexProc = new TDEProcess; *indexProc << exe << "--lang" << language->currentTag(); - connect(indexProc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(indexTerminated(TDEProcess *))); + connect(indexProc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(indexTerminated(TDEProcess *))); runButton->setEnabled(false); @@ -362,7 +362,7 @@ void TDEHTMLSearchConfig::indexTerminated(TDEProcess *) extern "C" { - KDE_EXPORT TDECModule *create_htmlsearch(TQWidget *parent, const char *name) + TDE_EXPORT TDECModule *create_htmlsearch(TQWidget *parent, const char *name) { TDEGlobal::locale()->insertCatalogue("kcmhtmlsearch"); return new TDEHTMLSearchConfig(parent, name); diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.h b/khelpcenter/htmlsearch/kcmhtmlsearch.h index 28445437a..72ae1c396 100644 --- a/khelpcenter/htmlsearch/kcmhtmlsearch.h +++ b/khelpcenter/htmlsearch/kcmhtmlsearch.h @@ -35,7 +35,7 @@ class KURLRequester; class TDEHTMLSearchConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: diff --git a/khelpcenter/htmlsearch/klangcombo.cpp b/khelpcenter/htmlsearch/klangcombo.cpp index 308109d12..a53a1b01f 100644 --- a/khelpcenter/htmlsearch/klangcombo.cpp +++ b/khelpcenter/htmlsearch/klangcombo.cpp @@ -23,7 +23,7 @@ #include <tqiconset.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "klangcombo.h" #include "klangcombo.moc" diff --git a/khelpcenter/htmlsearch/klangcombo.h b/khelpcenter/htmlsearch/klangcombo.h index 4ca6e2f3b..7b07fee03 100644 --- a/khelpcenter/htmlsearch/klangcombo.h +++ b/khelpcenter/htmlsearch/klangcombo.h @@ -34,7 +34,7 @@ */ class KLanguageCombo : public KTagComboBox { - Q_OBJECT + TQ_OBJECT public: KLanguageCombo(TQWidget *parent=0, const char *name=0); diff --git a/khelpcenter/htmlsearch/ktagcombobox.cpp b/khelpcenter/htmlsearch/ktagcombobox.cpp index b3c70915c..be9975d7a 100644 --- a/khelpcenter/htmlsearch/ktagcombobox.cpp +++ b/khelpcenter/htmlsearch/ktagcombobox.cpp @@ -98,10 +98,10 @@ void KTagComboBox::clear() delete old_popup; old_popup = popup; popup = new TQPopupMenu(this); - connect( popup, TQT_SIGNAL(activated(int)), - TQT_SLOT(internalActivate(int)) ); - connect( popup, TQT_SIGNAL(highlighted(int)), - TQT_SLOT(internalHighlight(int)) ); + connect( popup, TQ_SIGNAL(activated(int)), + TQ_SLOT(internalActivate(int)) ); + connect( popup, TQ_SIGNAL(highlighted(int)), + TQ_SLOT(internalHighlight(int)) ); } int KTagComboBox::count() const @@ -176,10 +176,10 @@ void KTagComboBox::insertSubmenu(const TQString &text, const TQString &tag, cons checkInsertPos(pi, text, index); pi->insertItem(text, p, count(), index); tags->append(tag); - connect( p, TQT_SIGNAL(activated(int)), - TQT_SLOT(internalActivate(int)) ); - connect( p, TQT_SIGNAL(highlighted(int)), - TQT_SLOT(internalHighlight(int)) ); + connect( p, TQ_SIGNAL(activated(int)), + TQ_SLOT(internalActivate(int)) ); + connect( p, TQ_SIGNAL(highlighted(int)), + TQ_SLOT(internalHighlight(int)) ); } void KTagComboBox::paintEvent( TQPaintEvent * ev) diff --git a/khelpcenter/htmlsearch/ktagcombobox.h b/khelpcenter/htmlsearch/ktagcombobox.h index df58120ce..c28336f21 100644 --- a/khelpcenter/htmlsearch/ktagcombobox.h +++ b/khelpcenter/htmlsearch/ktagcombobox.h @@ -37,7 +37,7 @@ class TQPopupMenu; */ class KTagComboBox : public QComboBox { - Q_OBJECT + TQ_OBJECT public: KTagComboBox(TQWidget *parent=0, const char *name=0); diff --git a/khelpcenter/htmlsearch/progressdialog.cpp b/khelpcenter/htmlsearch/progressdialog.cpp index 33a783127..a289d3f7c 100644 --- a/khelpcenter/htmlsearch/progressdialog.cpp +++ b/khelpcenter/htmlsearch/progressdialog.cpp @@ -4,7 +4,7 @@ #include <tdelocale.h> #include <kprogress.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "progressdialog.moc" diff --git a/khelpcenter/htmlsearch/progressdialog.h b/khelpcenter/htmlsearch/progressdialog.h index 9ab5660d9..f39a0d83e 100644 --- a/khelpcenter/htmlsearch/progressdialog.h +++ b/khelpcenter/htmlsearch/progressdialog.h @@ -12,7 +12,7 @@ class KProgress; class ProgressDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: |