From 91064f3b1d93fb0449e588f70552f050b4033e9f Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 5 May 2011 17:16:35 +0000 Subject: Port gtk-qt-engine to TQt4 This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/gtk-qt-engine@1230499 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kcm_gtk/kcmgtk.cpp | 306 ++++++++++++++++++++++++++--------------------------- 1 file changed, 153 insertions(+), 153 deletions(-) (limited to 'kcm_gtk/kcmgtk.cpp') diff --git a/kcm_gtk/kcmgtk.cpp b/kcm_gtk/kcmgtk.cpp index 036836d..3c0860b 100644 --- a/kcm_gtk/kcmgtk.cpp +++ b/kcm_gtk/kcmgtk.cpp @@ -18,35 +18,35 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include +#include #include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include +#include #include #include #include #include -#include -#include +#include +#include #include -#include -#include +#include +#include #include #include @@ -56,19 +56,19 @@ #include "kcmgtk.h" #include "mozillaprofile.h" -const QString KcmGtk::GTK_RC_FILE(".gtkrc-2.0-kde-kde4"); -const QString KcmGtk::KDE_RC_DIR(KGlobal::dirs()->localkdedir() + "/env/"); -const QString KcmGtk::GTK_QT_RC_FILE("gtk-qt-engine.rc.sh"); +const TQString KcmGtk::GTK_RC_FILE(".gtkrc-2.0-kde-kde4"); +const TQString KcmGtk::KDE_RC_DIR(KGlobal::dirs()->localkdedir() + "/env/"); +const TQString KcmGtk::GTK_TQT_RC_FILE("gtk-qt-engine.rc.sh"); -/*typedef KGenericFactory KcmGtkFactory; +/*typedef KGenericFactory KcmGtkFactory; K_EXPORT_COMPONENT_FACTORY( kcm_gtk, KcmGtkFactory("gtk"))*/ extern "C" { - KCModule *create_kcmgtk( QWidget * parent, const char * name ) + KCModule *create_kcmgtk( TQWidget * tqparent, const char * name ) { KGlobal::locale()->insertCatalogue( "gtkqtengine" ); - return new KcmGtk( parent, "kcmgtk" ); + return new KcmGtk( tqparent, "kcmgtk" ); } } @@ -77,21 +77,21 @@ GtkRcParser::GtkRcParser() { } -void GtkRcParser::parse(QString fileName) +void GtkRcParser::parse(TQString fileName) { - QFile file(fileName); + TQFile file(fileName); file.open(IO_ReadOnly); - QTextStream stream(&file); + TQTextStream stream(&file); - QRegExp includeRe("include\\s*\"([^\"]*)\""); - QRegExp fontRe("font_name\\s*=\\s*\"([^\"]*)\""); - QRegExp keyThemeRe("gtk-key-theme-name\\s*=\\s*\"([^\"]*)\""); + TQRegExp includeRe("include\\s*\"([^\"]*)\""); + TQRegExp fontRe("font_name\\s*=\\s*\"([^\"]*)\""); + TQRegExp keyThemeRe("gtk-key-theme-name\\s*=\\s*\"([^\"]*)\""); - QStringList includes; + TQStringList includes; while (1) { - QString line = stream.readLine(); + TQString line = stream.readLine(); if (line.isNull()) break; if (line.startsWith("#")) @@ -103,7 +103,7 @@ void GtkRcParser::parse(QString fileName) { if (includeRe.search(line) == -1) continue; - QString themePath = includeRe.cap(1); + TQString themePath = includeRe.cap(1); if (themePath.endsWith("/gtk-2.0/gtkrc") && !themePath.startsWith("/etc")) style = includeRe.cap(1); } @@ -118,7 +118,7 @@ void GtkRcParser::parse(QString fileName) { if (keyThemeRe.search(line) == -1) continue; - if (keyThemeRe.cap(1).lower() == "emacs") + if (TQString(keyThemeRe.cap(1)).lower() == "emacs") emacs = true; } } @@ -126,16 +126,16 @@ void GtkRcParser::parse(QString fileName) file.close(); } -QFont GtkRcParser::parseFont(QString fontString) +TQFont GtkRcParser::parseFont(TQString fontString) { - QFont ret; + TQFont ret; while (true) { - int lastSpacePos = fontString.findRev(' '); + int lastSpacePos = fontString.tqfindRev(' '); if (lastSpacePos == -1) break; - QString lastWord = fontString.right(fontString.length() - lastSpacePos).stripWhiteSpace(); + TQString lastWord = fontString.right(fontString.length() - lastSpacePos).stripWhiteSpace(); if (lastWord.lower() == "bold") ret.setBold(true); @@ -156,8 +156,8 @@ QFont GtkRcParser::parseFont(QString fontString) return ret; } -KcmGtk::KcmGtk(QWidget *parent, const char *name, const QStringList&) - : KCModule(parent, name), +KcmGtk::KcmGtk(TQWidget *tqparent, const char *name, const TQStringList&) + : KCModule(tqparent, name), myAboutData(0), emacsDetailsDialog(NULL), searchPathsDialog(NULL) @@ -166,17 +166,17 @@ KcmGtk::KcmGtk(QWidget *parent, const char *name, const QStringList&) config = new KConfig("kcmgtkrc"); - QStringList gtkSearchPathsDefault; + TQStringList gtkSearchPathsDefault; gtkSearchPathsDefault.append("/usr"); gtkSearchPathsDefault.append("/usr/local"); gtkSearchPathsDefault.append("/opt/gnome"); - gtkSearchPathsDefault.append(QDir::homeDirPath() + "/.local"); + gtkSearchPathsDefault.append(TQDir::homeDirPath() + "/.local"); gtkSearchPaths = config->readListEntry("gtkSearchPaths", gtkSearchPathsDefault); - // Add the widget to our layout - QBoxLayout* l = new QVBoxLayout(this); + // Add the widget to our tqlayout + TQBoxLayout* l = new TQVBoxLayout(this); widget = new KcmGtkWidget(this); l->addWidget(widget); @@ -191,33 +191,33 @@ KcmGtk::KcmGtk(QWidget *parent, const char *name, const QStringList&) load(); // Connect some signals - connect(widget->warning2, SIGNAL(leftClickedURL(const QString&)), KApplication::kApplication(), SLOT(invokeBrowser(const QString&))); - connect(widget->styleGroup, SIGNAL(clicked(int)), SLOT(itemChanged())); - connect(widget->fontGroup, SIGNAL(clicked(int)), SLOT(itemChanged())); - connect(widget->styleBox, SIGNAL(activated(int)), SLOT(itemChanged())); - connect(widget->styleBox, SIGNAL(activated(int)), SLOT(styleChanged())); - connect(widget->emacsBox, SIGNAL(toggled(bool)), SLOT(itemChanged())); - connect(widget->fontChange, SIGNAL(clicked()), SLOT(fontChangeClicked())); - connect(widget->firefoxFix, SIGNAL(clicked()), SLOT(firefoxFixClicked())); - connect(widget->emacsDetails, SIGNAL(clicked()), SLOT(emacsDetailsClicked())); - connect(widget->warning3, SIGNAL(clicked()), SLOT(searchPathsClicked())); + connect(widget->warning2, TQT_SIGNAL(leftClickedURL(const TQString&)), KApplication::kApplication(), TQT_SLOT(invokeBrowser(const TQString&))); + connect(widget->styleGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(itemChanged())); + connect(widget->fontGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(itemChanged())); + connect(widget->styleBox, TQT_SIGNAL(activated(int)), TQT_SLOT(itemChanged())); + connect(widget->styleBox, TQT_SIGNAL(activated(int)), TQT_SLOT(styleChanged())); + connect(widget->emacsBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(itemChanged())); + connect(widget->fontChange, TQT_SIGNAL(clicked()), TQT_SLOT(fontChangeClicked())); + connect(widget->firefoxFix, TQT_SIGNAL(clicked()), TQT_SLOT(firefoxFixClicked())); + connect(widget->emacsDetails, TQT_SIGNAL(clicked()), TQT_SLOT(emacsDetailsClicked())); + connect(widget->warning3, TQT_SIGNAL(clicked()), TQT_SLOT(searchPathsClicked())); } void KcmGtk::getInstalledThemes() { themes.clear(); - for ( QStringList::Iterator it = gtkSearchPaths.begin(); it != gtkSearchPaths.end(); ++it ) + for ( TQStringList::Iterator it = gtkSearchPaths.begin(); it != gtkSearchPaths.end(); ++it ) { - QString path = (*it) + "/share/themes/"; - QDir dir(path); - QStringList entryList = dir.entryList(QDir::Dirs, QDir::Unsorted); - for ( QStringList::Iterator it2 = entryList.begin(); it2 != entryList.end(); ++it2 ) + TQString path = (*it) + "/share/themes/"; + TQDir dir(path); + TQStringList entryList = dir.entryList(TQDir::Dirs, TQDir::Unsorted); + for ( TQStringList::Iterator it2 = entryList.begin(); it2 != entryList.end(); ++it2 ) { if ((*it2).startsWith(".")) continue; - if (themes.find(*it2) != themes.end()) + if (themes.tqfind(*it2) != themes.end()) continue; - if (!QFile::exists(path + (*it2) + "/gtk-2.0/gtkrc")) + if (!TQFile::exists(path + (*it2) + "/gtk-2.0/gtkrc")) continue; themes.insert((*it2), path + (*it2) + "/gtk-2.0/gtkrc"); } @@ -226,7 +226,7 @@ void KcmGtk::getInstalledThemes() widget->styleBox->clear(); widget->styleBox->insertStringList(themes.keys()); - bool installed = (themes.find("Qt") != themes.end()); + bool installed = (themes.tqfind("TQt") != themes.end()); widget->styleKde->setEnabled(installed); widget->warning1->setHidden(installed); widget->warning2->setHidden(installed); @@ -255,20 +255,20 @@ void KcmGtk::styleChanged() itemChanged(); } -QString KcmGtk::env(QString key) +TQString KcmGtk::env(TQString key) { char* value = getenv(key.latin1()); if (value == NULL) - return QString::null; + return TQString(); else - return QString(value); + return TQString(value); } void KcmGtk::updateFontPreview() { widget->fontPreview->setFont(font); widget->fontPreview->setText( - i18n("%1 (size %2)").arg(font.family()).arg(QString::number(font.pointSize()))); + i18n("%1 (size %2)").tqarg(font.family()).tqarg(TQString::number(font.pointSize()))); widget->fontPreview2->setFont(font); } @@ -281,18 +281,18 @@ KcmGtk::~KcmGtk() void KcmGtk::load() { - parser.parse(QDir::homeDirPath() + "/" + GTK_RC_FILE); + parser.parse(TQDir::homeDirPath() + "/" + GTK_RC_FILE); - bool usingQtEngine = false; + bool usingTQtEngine = false; if (!parser.style.isEmpty()) { - for ( QMapIterator it = themes.begin(); it != themes.end(); ++it ) + for ( TQMapIterator it = themes.begin(); it != themes.end(); ++it ) { if (it.data() != parser.style) continue; - if (it.key() == "Qt") - usingQtEngine = true; + if (it.key() == "TQt") + usingTQtEngine = true; for (int i=0 ; istyleBox->count() ; ++i) { @@ -306,17 +306,17 @@ void KcmGtk::load() break; } - if (usingQtEngine) + if (usingTQtEngine) widget->styleGroup->setButton(widget->styleGroup->id(widget->styleKde)); else widget->styleGroup->setButton(widget->styleGroup->id(widget->styleOther)); } font = parser.font; - if (QApplication::font().family() == font.family() && - QApplication::font().pointSize() == font.pointSize() && - QApplication::font().bold() == font.bold() && - QApplication::font().italic() == font.italic()) + if (TQApplication::font().family() == font.family() && + TQApplication::font().pointSize() == font.pointSize() && + TQApplication::font().bold() == font.bold() && + TQApplication::font().italic() == font.italic()) widget->fontGroup->setButton(widget->fontGroup->id(widget->fontKde)); else widget->fontGroup->setButton(widget->fontGroup->id(widget->fontOther)); @@ -330,24 +330,24 @@ void KcmGtk::load() void KcmGtk::save() { // First write out the gtkrc file - QFile file(QDir::homeDirPath() + "/" + GTK_RC_FILE); + TQFile file(TQDir::homeDirPath() + "/" + GTK_RC_FILE); file.open(IO_WriteOnly); - QTextStream stream(&file); + TQTextStream stream(&file); - QFont selectedFont(widget->fontKde->isChecked() ? QApplication::font() : font); - QString fontName = selectedFont.family() + " " + - QString(selectedFont.bold() ? "Bold " : "") + - QString(selectedFont.italic() ? "Italic " : "") + - QString::number(selectedFont.pointSize()); + TQFont selectedFont(widget->fontKde->isChecked() ? TQApplication::font() : font); + TQString fontName = selectedFont.family() + " " + + TQString(selectedFont.bold() ? "Bold " : "") + + TQString(selectedFont.italic() ? "Italic " : "") + + TQString::number(selectedFont.pointSize()); - QString themeName = widget->styleKde->isChecked() ? themes["Qt"] : themes[widget->styleBox->currentText()]; - QString themeNameShort = widget->styleKde->isChecked() ? QString("Qt") : widget->styleBox->currentText(); + TQString themeName = widget->styleKde->isChecked() ? themes["TQt"] : themes[widget->styleBox->currentText()]; + TQString themeNameShort = widget->styleKde->isChecked() ? TQString("TQt") : widget->styleBox->currentText(); stream << "# This file was written by KDE\n"; stream << "# You can edit it in the KDE control center, under \"GTK Styles and Fonts\"\n"; stream << "\n"; stream << "include \"" << themeName << "\"\n"; - if (QFile::exists("/etc/gtk-2.0/gtkrc")) + if (TQFile::exists("/etc/gtk-2.0/gtkrc")) stream << "include \"/etc/gtk-2.0/gtkrc\"\n"; stream << "\n"; stream << "style \"user-font\"\n"; @@ -365,22 +365,22 @@ void KcmGtk::save() file.close(); // Now we check if that file is actually being loaded. - QDir kdeRcDir; + TQDir kdeRcDir; if (!kdeRcDir.exists(KDE_RC_DIR)) { // Make sure KDE's rc dir exists kdeRcDir.mkdir(KDE_RC_DIR); } - file.setName(KDE_RC_DIR + "/" + GTK_QT_RC_FILE); + file.setName(KDE_RC_DIR + "/" + GTK_TQT_RC_FILE); bool envFileDidNotExist = (!file.exists()); file.open(IO_ReadWrite); - stream.setDevice(&file); + stream.setDevice(TQT_TQIODEVICE(&file)); bool found = false; for (;;) { - QString line = stream.readLine(); + TQString line = stream.readLine(); if (line.isNull()) break; @@ -404,16 +404,16 @@ void KcmGtk::save() // Tell the user to restart KDE if the environment file was created this time if (envFileDidNotExist) - QMessageBox::information(this, "Restart KDE", "Your changes have been saved, but you will have to restart KDE for them to take effect.", QMessageBox::Ok); + TQMessageBox::information(this, "Restart KDE", "Your changes have been saved, but you will have to restart KDE for them to take effect.", TQMessageBox::Ok); - // Older versions of the Gtk-Qt theme engine wrote directly into ~/.gtkrc-2.0 + // Older versions of the Gtk-TQt theme engine wrote directly into ~/.gtkrc-2.0 // If the user has upgraded, that file needs to be deleted so the old settings // won't override the new ones set now. - file.setName(QDir::homeDirPath() + "/.gtkrc-2.0"); + file.setName(TQDir::homeDirPath() + "/.gtkrc-2.0"); if (file.exists()) { file.open(IO_ReadOnly); - QString firstLine; + TQString firstLine; file.readLine(firstLine, 50); file.close(); @@ -422,19 +422,19 @@ void KcmGtk::save() } // Simarly, remove the line we added to ~/.bashrc to tell GTK to load ~/.gtkrc-2.0 - file.setName(QDir::homeDirPath() + "/.bashrc"); + file.setName(TQDir::homeDirPath() + "/.bashrc"); if (file.exists()) { file.open(IO_ReadOnly); - QByteArray fileData = file.readAll(); + TQByteArray fileData = file.readAll(); file.close(); - QString rcLine = "export GTK2_RC_FILES=$HOME/.gtkrc-2.0"; - QString fileDataString(fileData); - fileDataString.replace("\n" + rcLine, "\n# (This is no longer needed from version 0.8 of the theme engine)\n# " + rcLine); + TQString rcLine = "export GTK2_RC_FILES=$HOME/.gtkrc-2.0"; + TQString fileDataString(fileData); + fileDataString.tqreplace("\n" + rcLine, "\n# (This is no longer needed from version 0.8 of the theme engine)\n# " + rcLine); file.open(IO_WriteOnly); - stream.setDevice(&file); + stream.setDevice(TQT_TQIODEVICE(&file)); stream << fileDataString; file.close(); } @@ -448,7 +448,7 @@ int KcmGtk::buttons() return KCModule::Apply; } -QString KcmGtk::quickHelp() const +TQString KcmGtk::quickHelp() const { return i18n(""); } @@ -457,10 +457,10 @@ QString KcmGtk::quickHelp() const void KcmGtk::firefoxFixClicked() { profiles.clear(); - getProfiles(QDir::homeDirPath() + "/.mozilla/firefox/", 0); - getProfiles(QDir::homeDirPath() + "/.thunderbird/", 1); + getProfiles(TQDir::homeDirPath() + "/.mozilla/firefox/", 0); + getProfiles(TQDir::homeDirPath() + "/.thunderbird/", 1); - QString profilePath; + TQString profilePath; if (profiles.count() == 0) { KMessageBox::error(this, i18n("No Mozilla profiles found"), i18n("Could not load Mozilla profiles")); @@ -477,9 +477,9 @@ void KcmGtk::firefoxFixClicked() w->profilesList->header()->hide(); w->profilesList->hideColumn(1); - QPixmap icon = KGlobal::iconLoader()->loadIcon("kuser", KIcon::Small); + TQPixmap icon = KGlobal::iconLoader()->loadIcon("kuser", KIcon::Small); - for ( QMapIterator it = profiles.begin(); it != profiles.end(); ++it ) + for ( TQMapIterator it = profiles.begin(); it != profiles.end(); ++it ) { KListViewItem* i = new KListViewItem(w->profilesList); i->setPixmap(0, icon); @@ -488,13 +488,13 @@ void KcmGtk::firefoxFixClicked() } dialog->setMainWidget(w); - if (dialog->exec() == QDialog::Rejected) + if (dialog->exec() == TQDialog::Rejected) { delete dialog; return; } - QListViewItemIterator it2(w->profilesList, QListViewItemIterator::Selected); + TQListViewItemIterator it2(w->profilesList, TQListViewItemIterator::Selected); while (it2.current()) { KListViewItem* i = (KListViewItem*) it2.current(); @@ -508,22 +508,22 @@ void KcmGtk::firefoxFixClicked() KMessageBox::information(this, i18n("Your Mozilla profile was updated sucessfully. You must close and restart all Firefox and Thunderbird windows for the changes to take effect"), i18n("Mozilla profile")); } -void KcmGtk::getProfiles(const QString& basePath, int type) +void KcmGtk::getProfiles(const TQString& basePath, int type) { - QString fileName = basePath + "/profiles.ini"; - if (QFile::exists(fileName)) + TQString fileName = basePath + "/profiles.ini"; + if (TQFile::exists(fileName)) { KConfig config(fileName, true, false); - QStringList groups = config.groupList(); + TQStringList groups = config.groupList(); - for ( QStringList::Iterator it = groups.begin(); it != groups.end(); ++it ) + for ( TQStringList::Iterator it = groups.begin(); it != groups.end(); ++it ) { if (!(*it).lower().startsWith("profile")) continue; config.setGroup(*it); - QString name = (type ? i18n("Thunderbird") : i18n("Firefox")) + " - " + config.readEntry("Name"); - QString path = config.readEntry("Path"); + TQString name = (type ? i18n("Thunderbird") : i18n("Firefox")) + " - " + config.readEntry("Name"); + TQString path = config.readEntry("Path"); if (!path.startsWith("/")) path = basePath + path; profiles.insert(name, path); @@ -531,65 +531,65 @@ void KcmGtk::getProfiles(const QString& basePath, int type) } } -void KcmGtk::fixProfile(const QString& path) +void KcmGtk::fixProfile(const TQString& path) { - if (!QFile::exists(path + "/chrome")) + if (!TQFile::exists(path + "/chrome")) { - QDir dir(path); + TQDir dir(path); dir.mkdir("chrome"); } - QString data = scrollBarCSS(); + TQString data = scrollBarCSS(); writeFirefoxCSS(path + "/chrome/userChrome.css", data); writeFirefoxCSS(path + "/chrome/userContent.css", data); } -QString KcmGtk::scrollBarCSS() +TQString KcmGtk::scrollBarCSS() { // The following code determines how many buttons are on a scrollbar // It works by looking at each pixel of the scrollbar's area not taken up by the groove, // and asking the style which subcontrol is at that location. - QScrollBar sbar(NULL); + TQScrollBar sbar(NULL); sbar.setOrientation(Qt::Horizontal); sbar.setValue(1); sbar.resize(200,25); - QRect rect = qApp->style().querySubControlMetrics(QStyle::CC_ScrollBar, &sbar, QStyle::SC_ScrollBarGroove); + TQRect rect = tqApp->tqstyle().querySubControlMetrics(TQStyle::CC_ScrollBar, &sbar, TQStyle::SC_ScrollBarGroove); bool back1 = false; bool forward1 = false; bool back2 = false; bool forward2 = false; - QStyle::SubControl sc = QStyle::SC_None; - for (QPoint pos(0,7) ; pos.x()style().querySubControl(QStyle::CC_ScrollBar, &sbar, pos); + TQStyle::SubControl sc2 = tqApp->tqstyle().querySubControl(TQStyle::CC_ScrollBar, &sbar, pos); if (sc != sc2) { - if (sc2 == QStyle::SC_ScrollBarAddLine) forward1 = true; - if (sc2 == QStyle::SC_ScrollBarSubLine) back1 = true; + if (sc2 == TQStyle::SC_ScrollBarAddLine) forward1 = true; + if (sc2 == TQStyle::SC_ScrollBarSubLine) back1 = true; sc = sc2; } } - sc = QStyle::SC_None; - for (QPoint pos(rect.x()+rect.width(),7) ; pos.x()<200 ; pos.setX(pos.x()+1)) + sc = TQStyle::SC_None; + for (TQPoint pos(rect.x()+rect.width(),7) ; pos.x()<200 ; pos.setX(pos.x()+1)) { - QStyle::SubControl sc2 = qApp->style().querySubControl(QStyle::CC_ScrollBar, &sbar, pos); + TQStyle::SubControl sc2 = tqApp->tqstyle().querySubControl(TQStyle::CC_ScrollBar, &sbar, pos); if (sc != sc2) { - if (sc2 == QStyle::SC_ScrollBarAddLine) forward2 = true; - if (sc2 == QStyle::SC_ScrollBarSubLine) back2 = true; + if (sc2 == TQStyle::SC_ScrollBarAddLine) forward2 = true; + if (sc2 == TQStyle::SC_ScrollBarSubLine) back2 = true; sc = sc2; } } - QString upTop = (back1 ? "-moz-box" : "none"); - QString downTop = (forward1 ? "-moz-box" : "none"); - QString upBottom = (back2 ? "-moz-box" : "none"); - QString downBottom = (forward2 ? "-moz-box" : "none"); + TQString upTop = (back1 ? "-moz-box" : "none"); + TQString downTop = (forward1 ? "-moz-box" : "none"); + TQString upBottom = (back2 ? "-moz-box" : "none"); + TQString downBottom = (forward2 ? "-moz-box" : "none"); - QString data; + TQString data; data += "/* The following four lines were added by KDE */\n"; data += "scrollbarbutton[sbattr=\"scrollbar-up-top\"] { display: " + upTop + " !important; }\n"; data += "scrollbarbutton[sbattr=\"scrollbar-down-top\"] { display: " + downTop + " !important; }\n"; @@ -599,16 +599,16 @@ QString KcmGtk::scrollBarCSS() return data; } -void KcmGtk::writeFirefoxCSS(const QString& path, const QString& data) +void KcmGtk::writeFirefoxCSS(const TQString& path, const TQString& data) { - QString fileData; - QFile file(path); + TQString fileData; + TQFile file(path); if (file.open(IO_ReadOnly)) { - QTextStream stream(&file); + TQTextStream stream(&file); for (;;) { - QString line = stream.readLine(); + TQString line = stream.readLine(); if (line.isNull()) break; @@ -627,10 +627,10 @@ void KcmGtk::writeFirefoxCSS(const QString& path, const QString& data) if (!file.open(IO_WriteOnly | IO_Truncate)) { - KMessageBox::error(this, i18n("Could not write to %1").arg(path), i18n("Mozilla profile")); + KMessageBox::error(this, i18n("Could not write to %1").tqarg(path), i18n("Mozilla profile")); return; } - QTextStream stream(&file); + TQTextStream stream(&file); stream << fileData << data; file.close(); @@ -653,16 +653,16 @@ void KcmGtk::searchPathsClicked() if (searchPathsDialog == NULL) { searchPathsDialog = new SearchPaths(this); - connect(searchPathsDialog->okButton, SIGNAL(clicked()), SLOT(searchPathsOk())); - connect(searchPathsDialog->pathBox, SIGNAL(textChanged(const QString&)), SLOT(searchPathsTextChanged(const QString&))); - connect(searchPathsDialog->pathList, SIGNAL(currentChanged(QListBoxItem*)), SLOT(searchPathsCurrentChanged(QListBoxItem*))); - connect(searchPathsDialog->addButton, SIGNAL(clicked()), SLOT(searchPathsAddClicked())); - connect(searchPathsDialog->removeButton, SIGNAL(clicked()), SLOT(searchPathsRemoveClicked())); + connect(searchPathsDialog->okButton, TQT_SIGNAL(clicked()), TQT_SLOT(searchPathsOk())); + connect(searchPathsDialog->pathBox, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(searchPathsTextChanged(const TQString&))); + connect(searchPathsDialog->pathList, TQT_SIGNAL(currentChanged(TQListBoxItem*)), TQT_SLOT(searchPathsCurrentChanged(TQListBoxItem*))); + connect(searchPathsDialog->addButton, TQT_SIGNAL(clicked()), TQT_SLOT(searchPathsAddClicked())); + connect(searchPathsDialog->removeButton, TQT_SIGNAL(clicked()), TQT_SLOT(searchPathsRemoveClicked())); } searchPathsDialog->pathList->clear(); - for (QStringList::Iterator it = gtkSearchPaths.begin(); it != gtkSearchPaths.end(); ++it ) - new QListBoxText(searchPathsDialog->pathList, *it); + for (TQStringList::Iterator it = gtkSearchPaths.begin(); it != gtkSearchPaths.end(); ++it ) + new TQListBoxText(searchPathsDialog->pathList, *it); searchPathsDialog->show(); } @@ -671,7 +671,7 @@ void KcmGtk::searchPathsOk() { gtkSearchPaths.clear(); int i=0; - QListBoxItem* item = 0; + TQListBoxItem* item = 0; while ((item = searchPathsDialog->pathList->item(i++))) gtkSearchPaths.append(item->text()); @@ -679,19 +679,19 @@ void KcmGtk::searchPathsOk() getInstalledThemes(); } -void KcmGtk::searchPathsTextChanged(const QString& text) +void KcmGtk::searchPathsTextChanged(const TQString& text) { searchPathsDialog->addButton->setDisabled(text.isEmpty()); } -void KcmGtk::searchPathsCurrentChanged(QListBoxItem* item) +void KcmGtk::searchPathsCurrentChanged(TQListBoxItem* item) { searchPathsDialog->removeButton->setEnabled(item != NULL); } void KcmGtk::searchPathsAddClicked() { - new QListBoxText(searchPathsDialog->pathList, searchPathsDialog->pathBox->text()); + new TQListBoxText(searchPathsDialog->pathList, searchPathsDialog->pathBox->text()); searchPathsDialog->pathBox->clear(); } -- cgit v1.2.1