summaryrefslogtreecommitdiffstats
path: root/kdecore/kglobalsettings.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 04:12:51 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 04:12:51 +0000
commit560378aaca1784ba19806a0414a32b20c744de39 (patch)
treece0dfd7c3febf2a1adc7603d1019a8be2083c415 /kdecore/kglobalsettings.cpp
parentd4d5af1cdbd3cc65d095e0afc5b1f4260091cf5d (diff)
downloadtdelibs-560378aaca1784ba19806a0414a32b20c744de39.tar.gz
tdelibs-560378aaca1784ba19806a0414a32b20c744de39.zip
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
Diffstat (limited to 'kdecore/kglobalsettings.cpp')
-rw-r--r--kdecore/kglobalsettings.cpp18
1 files changed, 9 insertions, 9 deletions
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 <win32_utils.h>
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();
}
}