summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arts/gui/kde/klevelmeter_linebars.cpp2
-rw-r--r--juk/cache.cpp2
-rw-r--r--noatun/library/playlistsaver.cpp2
-rw-r--r--noatun/modules/winskin/waDigit.cpp12
-rw-r--r--noatun/modules/winskin/waInfo.cpp4
-rw-r--r--noatun/modules/winskin/waLabel.cpp2
-rw-r--r--noatun/modules/winskin/waWidget.cpp16
-rw-r--r--noatun/modules/winskin/waWidget.h2
8 files changed, 21 insertions, 21 deletions
diff --git a/arts/gui/kde/klevelmeter_linebars.cpp b/arts/gui/kde/klevelmeter_linebars.cpp
index e3a15ca2..1f3cd450 100644
--- a/arts/gui/kde/klevelmeter_linebars.cpp
+++ b/arts/gui/kde/klevelmeter_linebars.cpp
@@ -94,7 +94,7 @@ void KLevelMeter_LineBars::paintEvent( TQPaintEvent* ) {
p.drawLine( 0, top, w, top );
}
- bitBlt( TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&pm), 0, 0, pm.width(), pm.height(), CopyROP, true );
+ bitBlt( this, 0, 0, &pm, 0, 0, pm.width(), pm.height(), CopyROP, true );
}
/**
diff --git a/juk/cache.cpp b/juk/cache.cpp
index 58062036..5de4b40e 100644
--- a/juk/cache.cpp
+++ b/juk/cache.cpp
@@ -275,7 +275,7 @@ void Cache::load()
if(!f.open(IO_ReadOnly))
return;
- CacheDataStream s(TQT_TQIODEVICE(&f));
+ CacheDataStream s(&f);
TQ_INT32 version;
s >> version;
diff --git a/noatun/library/playlistsaver.cpp b/noatun/library/playlistsaver.cpp
index 13b7ecfe..1450804d 100644
--- a/noatun/library/playlistsaver.cpp
+++ b/noatun/library/playlistsaver.cpp
@@ -449,7 +449,7 @@ bool PlaylistSaver::loadXML(const KURL &url, int opt)
reset();
// TQXml is horribly documented
- TQXmlInputSource source(TQT_TQIODEVICE(&file));
+ TQXmlInputSource source(&file);
TQXmlSimpleReader reader;
if (opt == ASX ||
diff --git a/noatun/modules/winskin/waDigit.cpp b/noatun/modules/winskin/waDigit.cpp
index 3e953e6b..1feb3851 100644
--- a/noatun/modules/winskin/waDigit.cpp
+++ b/noatun/modules/winskin/waDigit.cpp
@@ -57,24 +57,24 @@ void WaDigit::paintEvent(TQPaintEvent *)
// continue parsing
mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_MINUS);
if (len == 6) {
- waSkinModel->getDigit('-', TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y);
+ waSkinModel->getDigit('-', this, mapRect.x() - x, mapRect.y() - y);
time++;
}
else {
- waSkinModel->getDigit(' ', TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y);
+ waSkinModel->getDigit(' ', this, mapRect.x() - x, mapRect.y() - y);
}
mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_DIGIT_1);
- waSkinModel->getDigit(time[0], TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y);
+ waSkinModel->getDigit(time[0], this, mapRect.x() - x, mapRect.y() - y);
mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_DIGIT_2);
- waSkinModel->getDigit(time[1], TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y);
+ waSkinModel->getDigit(time[1], this, mapRect.x() - x, mapRect.y() - y);
mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_DIGIT_3);
- waSkinModel->getDigit(time[3], TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y);
+ waSkinModel->getDigit(time[3], this, mapRect.x() - x, mapRect.y() - y);
mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_DIGIT_4);
- waSkinModel->getDigit(time[4], TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y);
+ waSkinModel->getDigit(time[4], this, mapRect.x() - x, mapRect.y() - y);
}
void WaDigit::mousePressEvent(TQMouseEvent* e) {
diff --git a/noatun/modules/winskin/waInfo.cpp b/noatun/modules/winskin/waInfo.cpp
index af64ecc2..97f21606 100644
--- a/noatun/modules/winskin/waInfo.cpp
+++ b/noatun/modules/winskin/waInfo.cpp
@@ -132,7 +132,7 @@ void WaInfo::pixmapChange()
completePixmap->resize(TQMAX(n * _WA_TEXT_WIDTH, size.width()), _WA_TEXT_HEIGHT);
for (i = 0; i < n; i++) {
- WaSkinModel::instance()->getText(infoString[i], TQT_TQPAINTDEVICE(completePixmap), x, 0);
+ WaSkinModel::instance()->getText(infoString[i], completePixmap, x, 0);
x += _WA_TEXT_WIDTH;
}
@@ -140,7 +140,7 @@ void WaInfo::pixmapChange()
// fill the pixmap with spaces
if (x < size.width()) {
while (x < size.width()) {
- WaSkinModel::instance()->getText(' ', TQT_TQPAINTDEVICE(completePixmap), x, 0);
+ WaSkinModel::instance()->getText(' ', completePixmap, x, 0);
x += _WA_TEXT_WIDTH;
}
}
diff --git a/noatun/modules/winskin/waLabel.cpp b/noatun/modules/winskin/waLabel.cpp
index 71f2baa2..54b7513b 100644
--- a/noatun/modules/winskin/waLabel.cpp
+++ b/noatun/modules/winskin/waLabel.cpp
@@ -58,7 +58,7 @@ void WaLabel::pixmapChange()
int n = label_text ? strlen(label_text) : 0;
for (int i = 0; i < n; i++)
- WaSkinModel::instance()->getText(label_text[i], TQT_TQPAINTDEVICE(completePixmap),
+ WaSkinModel::instance()->getText(label_text[i], completePixmap,
i * _WA_TEXT_WIDTH, 0);
}
diff --git a/noatun/modules/winskin/waWidget.cpp b/noatun/modules/winskin/waWidget.cpp
index 69f797f5..48e6eb24 100644
--- a/noatun/modules/winskin/waWidget.cpp
+++ b/noatun/modules/winskin/waWidget.cpp
@@ -14,31 +14,31 @@ WaWidget::~WaWidget() {
void WaWidget::paintPixmap(int pixmap_mapping) {
if (pixmap_mapping != -1)
- WaSkinModel::instance()->bltTo(pixmap_mapping, TQT_TQPAINTDEVICE(this), 0, 0);
+ WaSkinModel::instance()->bltTo(pixmap_mapping, this, 0, 0);
else
- WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), 0, 0);
+ WaSkinModel::instance()->paintBackgroundTo(mapping, this, 0, 0);
}
void WaWidget::paintPixmap(int pixmap_mapping, int x, int y) {
if (pixmap_mapping != -1)
- WaSkinModel::instance()->bltTo(pixmap_mapping, TQT_TQPAINTDEVICE(this), x, y);
+ WaSkinModel::instance()->bltTo(pixmap_mapping, this, x, y);
else
- WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), x, y);
+ WaSkinModel::instance()->paintBackgroundTo(mapping, this, x, y);
}
void WaWidget::paintPixmap(int pixmap_mapping, int argument) {
if (pixmap_mapping != -1)
- WaSkinModel::instance()->bltTo(pixmap_mapping, TQT_TQPAINTDEVICE(this), 0, 0, argument);
+ WaSkinModel::instance()->bltTo(pixmap_mapping, this, 0, 0, argument);
else
- WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), 0, 0);
+ WaSkinModel::instance()->paintBackgroundTo(mapping, this, 0, 0);
}
void WaWidget::paintPixmap(int pixmap_mapping, int argument, int x, int y) {
if (pixmap_mapping != -1)
- WaSkinModel::instance()->bltTo(pixmap_mapping, TQT_TQPAINTDEVICE(this), x, y, argument);
+ WaSkinModel::instance()->bltTo(pixmap_mapping, this, x, y, argument);
else
- WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), x, y);
+ WaSkinModel::instance()->paintBackgroundTo(mapping, this, x, y);
}
TQSize WaWidget::sizeHint() {
diff --git a/noatun/modules/winskin/waWidget.h b/noatun/modules/winskin/waWidget.h
index 81f12f14..3f2f018a 100644
--- a/noatun/modules/winskin/waWidget.h
+++ b/noatun/modules/winskin/waWidget.h
@@ -19,7 +19,7 @@ public:
void paintPixmap(int wa_mapping, int x, int y);
void paintPixmap(int wa_mapping, int number, int x, int y);
- void paintBackground() { WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), 0, 0); }
+ void paintBackground() { WaSkinModel::instance()->paintBackgroundTo(mapping, this, 0, 0); }
protected:
void mousePressEvent(TQMouseEvent *);
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-03 22:16:56 +0000