From 560378aaca1784ba19806a0414a32b20c744de39 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 3 Jan 2011 04:12:51 +0000 Subject: Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1 NOTE: This will not compile with Qt4 (yet), however it does compile with Qt3 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211081 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdecore/kglobalsettings.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'kdecore/kglobalsettings.cpp') diff --git a/kdecore/kglobalsettings.cpp b/kdecore/kglobalsettings.cpp index 6dfd92c9b..734861663 100644 --- a/kdecore/kglobalsettings.cpp +++ b/kdecore/kglobalsettings.cpp @@ -35,7 +35,7 @@ #include static QRgb qt_colorref2qrgb(COLORREF col) { - return qRgb(GetRValue(col),GetGValue(col),GetBValue(col)); + return tqRgb(GetRValue(col),GetGValue(col),GetBValue(col)); } #endif @@ -98,9 +98,9 @@ void readXdgUserDirs(TQString *desktop, TQString *documents) while (!line.isNull()) { if (line.startsWith("XDG_DESKTOP_DIR=")) - *desktop = line.remove("XDG_DESKTOP_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath()); + *desktop = line.remove("XDG_DESKTOP_DIR=").remove("\"").tqreplace("$HOME", TQDir::homeDirPath()); else if (line.startsWith("XDG_DOCUMENTS_DIR=")) - *documents = line.remove("XDG_DOCUMENTS_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath()); + *documents = line.remove("XDG_DOCUMENTS_DIR=").remove("\"").tqreplace("$HOME", TQDir::homeDirPath()); line = s.readLine(); } @@ -694,10 +694,10 @@ TQRect KGlobalSettings::splashScreenDesktopGeometry() scr = dw->screenNumber(TQCursor::pos()); return dw->screenGeometry(scr); } else { - return dw->geometry(); + return dw->tqgeometry(); } } else { - return dw->geometry(); + return dw->tqgeometry(); } } @@ -711,10 +711,10 @@ TQRect KGlobalSettings::desktopGeometry(const TQPoint& point) group.readBoolEntry("XineramaPlacementEnabled", true)) { return dw->screenGeometry(dw->screenNumber(point)); } else { - return dw->geometry(); + return dw->tqgeometry(); } } else { - return dw->geometry(); + return dw->tqgeometry(); } } @@ -730,10 +730,10 @@ TQRect KGlobalSettings::desktopGeometry(TQWidget* w) return dw->screenGeometry(dw->screenNumber(w)); else return dw->screenGeometry(-1); } else { - return dw->geometry(); + return dw->tqgeometry(); } } else { - return dw->geometry(); + return dw->tqgeometry(); } } -- cgit v1.2.1