summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kcm_gtk/kcmgtk.cpp6
-rw-r--r--src/qt_qt_wrapper.cpp12
2 files changed, 9 insertions, 9 deletions
diff --git a/kcm_gtk/kcmgtk.cpp b/kcm_gtk/kcmgtk.cpp
index 2d35870..d77b9c6 100644
--- a/kcm_gtk/kcmgtk.cpp
+++ b/kcm_gtk/kcmgtk.cpp
@@ -464,7 +464,7 @@ void KcmGtk::save()
bool envFileDidNotExist = (!file.exists());
file.open(IO_ReadWrite);
- stream.setDevice(TQT_TQIODEVICE(&file));
+ stream.setDevice(&file);
bool found = false;
for (;;)
{
@@ -514,7 +514,7 @@ void KcmGtk::save()
if (file.exists())
{
file.open(IO_ReadOnly);
- stream.setDevice(TQT_TQIODEVICE(&file));
+ stream.setDevice(&file);
TQString fileDataString = stream.read();
file.close();
@@ -522,7 +522,7 @@ void KcmGtk::save()
fileDataString.replace("\n" + rcLine, "\n# (This is no longer needed from version 0.8 of the theme engine)\n# " + rcLine);
file.open(IO_WriteOnly);
- stream.setDevice(TQT_TQIODEVICE(&file));
+ stream.setDevice(&file);
stream << fileDataString;
file.close();
}
diff --git a/src/qt_qt_wrapper.cpp b/src/qt_qt_wrapper.cpp
index 43bf6fd..69f7a52 100644
--- a/src/qt_qt_wrapper.cpp
+++ b/src/qt_qt_wrapper.cpp
@@ -1218,13 +1218,13 @@ void drawScrollBarSlider(GdkWindow* window, GtkStyle* style, GtkStateType state,
if (orientation == GTK_ORIENTATION_HORIZONTAL)
{
- bitBlt(TQT_TQPAINTDEVICE(&pixmap), 1, 0, TQT_TQPAINTDEVICE(&leftPix), leftRect.width(), 0, 6, h, TQt::CopyROP, true);
- bitBlt(TQT_TQPAINTDEVICE(&pixmap), w-7, 0, TQT_TQPAINTDEVICE(&rightPix), 0, 0, 7, h, TQt::CopyROP, true);
+ bitBlt(&pixmap, 1, 0, &leftPix, leftRect.width(), 0, 6, h, TQt::CopyROP, true);
+ bitBlt(&pixmap, w-7, 0, &rightPix, 0, 0, 7, h, TQt::CopyROP, true);
}
else
{
- bitBlt(TQT_TQPAINTDEVICE(&pixmap), 0, 1, TQT_TQPAINTDEVICE(&leftPix), 0, leftRect.height(), w, 6, TQt::CopyROP, true);
- bitBlt(TQT_TQPAINTDEVICE(&pixmap), 0, h-7, TQT_TQPAINTDEVICE(&rightPix), 0, 0, w, 7, TQt::CopyROP, true);
+ bitBlt(&pixmap, 0, 1, &leftPix, 0, leftRect.height(), w, 6, TQt::CopyROP, true);
+ bitBlt(&pixmap, 0, h-7, &rightPix, 0, 0, w, 7, TQt::CopyROP, true);
}
}
@@ -2063,7 +2063,7 @@ void setRcProperties(GtkRcStyle* rc_style, int forceRecreate)
if (!forceRecreate && cacheFile.exists())
{
cacheFile.open(IO_ReadOnly);
- stream.setDevice(TQT_TQIODEVICE(&cacheFile));
+ stream.setDevice(&cacheFile);
if (stream.readLine() == "# " + iconTheme + ", " + tqApp->style().name() + ", " + RC_CACHE_VERSION)
{
@@ -2078,7 +2078,7 @@ void setRcProperties(GtkRcStyle* rc_style, int forceRecreate)
}
cacheFile.open(IO_WriteOnly | IO_Truncate);
- stream.setDevice(TQT_TQIODEVICE(&cacheFile));
+ stream.setDevice(&cacheFile);
stream << "# " << iconTheme << ", " << tqApp->style().name() << ", " << RC_CACHE_VERSION << "\n\n";
stream << "# This file was generated by the Gtk Qt Theme Engine\n";