diff options
Diffstat (limited to 'noatun/modules/winskin')
44 files changed, 439 insertions, 439 deletions
diff --git a/noatun/modules/winskin/fileInfo.cpp b/noatun/modules/winskin/fileInfo.cpp index 69f93215..6e721cd9 100644 --- a/noatun/modules/winskin/fileInfo.cpp +++ b/noatun/modules/winskin/fileInfo.cpp @@ -1,14 +1,14 @@ #include <noatun/app.h> #include <noatun/playlist.h> -#include <qstring.h> +#include <tqstring.h> #include <kfilemetainfo.h> #include "fileInfo.h" fileInfo::fileInfo(const PlaylistItem &item) { - QString prop; + TQString prop; prop = item.property("bitrate"); if (prop.isNull()) diff --git a/noatun/modules/winskin/guiSpectrumAnalyser.cpp b/noatun/modules/winskin/guiSpectrumAnalyser.cpp index d015e5da..583266e0 100644 --- a/noatun/modules/winskin/guiSpectrumAnalyser.cpp +++ b/noatun/modules/winskin/guiSpectrumAnalyser.cpp @@ -12,9 +12,9 @@ #include <klocale.h> -#include <qcolor.h> -#include <qpopupmenu.h> -#include <qpainter.h> +#include <tqcolor.h> +#include <tqpopupmenu.h> +#include <tqpainter.h> #include <kconfig.h> #include "waColor.h" @@ -28,11 +28,11 @@ GuiSpectrumAnalyser::GuiSpectrumAnalyser() : WaWidget(_WA_MAPPING_ANALYSER) { - connect(WaSkinModel::instance(), SIGNAL(skinChanged()), this, SLOT(pixmapChange())); + connect(WaSkinModel::instance(), TQT_SIGNAL(skinChanged()), this, TQT_SLOT(pixmapChange())); - contextMenu = new QPopupMenu(this); - visualizationMenu = new QPopupMenu(); - analyserMenu = new QPopupMenu(); + contextMenu = new TQPopupMenu(this); + visualizationMenu = new TQPopupMenu(); + analyserMenu = new TQPopupMenu(); contextMenu->insertItem(i18n("Visualization Mode"), visualizationMenu); contextMenu->insertItem(i18n("Analyzer Mode"), analyserMenu); @@ -40,13 +40,13 @@ GuiSpectrumAnalyser::GuiSpectrumAnalyser() visualizationMenu->insertItem(i18n("Analyzer"), (int)MODE_ANALYSER); visualizationMenu->insertItem(i18n("Disabled"), (int)MODE_DISABLED); visualizationMenu->setCheckable(true); - connect(visualizationMenu, SIGNAL(activated(int)), this, SLOT(setVisualizationMode(int))); + connect(visualizationMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setVisualizationMode(int))); analyserMenu->insertItem(i18n("Normal"), (int)MODE_NORMAL); analyserMenu->insertItem(i18n("Fire"), (int)MODE_FIRE); analyserMenu->insertItem(i18n("Vertical Lines"), (int)MODE_VERTICAL_LINES); analyserMenu->setCheckable(true); - connect(analyserMenu, SIGNAL(activated(int)), this, SLOT(setAnalyserMode(int))); + connect(analyserMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setAnalyserMode(int))); analyserCache = NULL; winSkinVis = NULL; @@ -70,7 +70,7 @@ GuiSpectrumAnalyser::~GuiSpectrumAnalyser() delete analyserCache; } -void GuiSpectrumAnalyser::mousePressEvent ( QMouseEvent *e ) +void GuiSpectrumAnalyser::mousePressEvent ( TQMouseEvent *e ) { if (e->button() == LeftButton) { if (visualization_mode == MODE_DISABLED) @@ -79,7 +79,7 @@ void GuiSpectrumAnalyser::mousePressEvent ( QMouseEvent *e ) setVisualizationMode(MODE_DISABLED); } else if (e->button() == RightButton) { - contextMenu->popup(mapToGlobal(QPoint(e->x(), e->y()))); + contextMenu->popup(mapToGlobal(TQPoint(e->x(), e->y()))); } } @@ -139,7 +139,7 @@ void GuiSpectrumAnalyser::setVisualizationMode(int mode) if (!winSkinVis) { winSkinVis=new WinSkinVis(this,"WinSkinVis"); - connect(winSkinVis,SIGNAL(doRepaint()),this,SLOT(updatePeaks())); + connect(winSkinVis,TQT_SIGNAL(doRepaint()),this,TQT_SLOT(updatePeaks())); } } else @@ -160,20 +160,20 @@ void GuiSpectrumAnalyser::freshenAnalyserCache() // The analyser cache is a 34x16 pixmap containing all the bits needed // to quickly draw the spectrum analyser - analyserCache = new QPixmap(34, 16); - QPainter p(analyserCache); + analyserCache = new TQPixmap(34, 16); + TQPainter p(analyserCache); for (unsigned int x = 0;x < 17;x++) { if (x != 16) { - p.setPen(QPen(colorScheme->skinColors[INDEX_BACKGROUND_COLOR])); + p.setPen(TQPen(colorScheme->skinColors[INDEX_BACKGROUND_COLOR])); p.drawLine(x * 2, 0, x * 2, 16 - x - 1); } for (unsigned int y = 0; y < (16 - x);y++) { if (y % 2) - p.setPen(QPen(colorScheme->skinColors[INDEX_GRID_COLOR])); + p.setPen(TQPen(colorScheme->skinColors[INDEX_GRID_COLOR])); else - p.setPen(QPen(colorScheme->skinColors[INDEX_BACKGROUND_COLOR])); + p.setPen(TQPen(colorScheme->skinColors[INDEX_BACKGROUND_COLOR])); p.drawPoint((x * 2) + 1, y); } @@ -184,13 +184,13 @@ void GuiSpectrumAnalyser::freshenAnalyserCache() switch (analyser_mode) { case MODE_FIRE: for (unsigned int y = (16 - x); y < 16; y++) { - p.setPen(QPen(colorScheme->skinColors[INDEX_SPEC_BASE + (y - (16 - x))])); + p.setPen(TQPen(colorScheme->skinColors[INDEX_SPEC_BASE + (y - (16 - x))])); p.drawPoint((x * 2), y); p.drawPoint((x * 2) + 1, y); } break; case MODE_VERTICAL_LINES: - p.setPen(QPen(colorScheme->skinColors[INDEX_SPEC_BASE + (16 - x)])); + p.setPen(TQPen(colorScheme->skinColors[INDEX_SPEC_BASE + (16 - x)])); p.drawLine((x * 2), (15 - x), (x * 2), 15); p.drawLine((x * 2) + 1, (15 - x), (x * 2) + 1, 15); break; @@ -198,7 +198,7 @@ void GuiSpectrumAnalyser::freshenAnalyserCache() // Fall through default: for (unsigned int y = (16 - x); y < 16; y++) { - p.setPen(QPen(colorScheme->skinColors[INDEX_SPEC_BASE + y])); + p.setPen(TQPen(colorScheme->skinColors[INDEX_SPEC_BASE + y])); p.drawPoint((x * 2), y); p.drawPoint((x * 2) + 1, y); } @@ -207,7 +207,7 @@ void GuiSpectrumAnalyser::freshenAnalyserCache() } } -void GuiSpectrumAnalyser::paintEvent (QPaintEvent *) +void GuiSpectrumAnalyser::paintEvent (TQPaintEvent *) { if (visualization_mode == MODE_DISABLED) paintBackground(); diff --git a/noatun/modules/winskin/guiSpectrumAnalyser.h b/noatun/modules/winskin/guiSpectrumAnalyser.h index ecef8d37..e2dd3431 100644 --- a/noatun/modules/winskin/guiSpectrumAnalyser.h +++ b/noatun/modules/winskin/guiSpectrumAnalyser.h @@ -34,7 +34,7 @@ class GuiSpectrumAnalyser : public WaWidget { GuiSpectrumAnalyser(); ~GuiSpectrumAnalyser(); - void mousePressEvent(QMouseEvent * mouseEvent); + void mousePressEvent(TQMouseEvent * mouseEvent); public slots: void pauseVisualization(); @@ -48,18 +48,18 @@ class GuiSpectrumAnalyser : public WaWidget { void setAnalyserMode(int); private: - void paintEvent(QPaintEvent *); + void paintEvent(TQPaintEvent *); - QPopupMenu *contextMenu; - QPopupMenu *visualizationMenu; - QPopupMenu *analyserMenu; + TQPopupMenu *contextMenu; + TQPopupMenu *visualizationMenu; + TQPopupMenu *analyserMenu; void freshenAnalyserCache(); int visualization_mode; int analyser_mode; - QPixmap *analyserCache; + TQPixmap *analyserCache; WinSkinVis *winSkinVis; }; #endif diff --git a/noatun/modules/winskin/skinMap.h b/noatun/modules/winskin/skinMap.h index f67f1557..1b9f8530 100644 --- a/noatun/modules/winskin/skinMap.h +++ b/noatun/modules/winskin/skinMap.h @@ -16,7 +16,7 @@ #ifndef _SKINMAP_H #define _SKINMAP_H -#include <qpixmap.h> +#include <tqpixmap.h> typedef struct { int x; diff --git a/noatun/modules/winskin/waBalanceSlider.cpp b/noatun/modules/winskin/waBalanceSlider.cpp index 1ac1b562..cb6b0f19 100644 --- a/noatun/modules/winskin/waBalanceSlider.cpp +++ b/noatun/modules/winskin/waBalanceSlider.cpp @@ -38,10 +38,10 @@ void WaBalanceSlider::buildGui() ws->setValue(0); - connect(ws, SIGNAL(valueChanged(int)), this, - SIGNAL(balanceSetValue(int))); - connect(ws, SIGNAL(sliderPressed()), SIGNAL(sliderPressed())); - connect(ws, SIGNAL(sliderReleased()), SIGNAL(sliderReleased())); + connect(ws, TQT_SIGNAL(valueChanged(int)), this, + TQT_SIGNAL(balanceSetValue(int))); + connect(ws, TQT_SIGNAL(sliderPressed()), TQT_SIGNAL(sliderPressed())); + connect(ws, TQT_SIGNAL(sliderReleased()), TQT_SIGNAL(sliderReleased())); } diff --git a/noatun/modules/winskin/waButton.cpp b/noatun/modules/winskin/waButton.cpp index cac0275a..da113c87 100644 --- a/noatun/modules/winskin/waButton.cpp +++ b/noatun/modules/winskin/waButton.cpp @@ -10,7 +10,7 @@ */ -#include <qbitmap.h> +#include <tqbitmap.h> #include "waButton.h" @@ -44,12 +44,12 @@ void WaButton::setPixmapDownSelected(int pixId) { nDownIdSelected=pixId; } -void WaButton::paintEvent(QPaintEvent *) { +void WaButton::paintEvent(TQPaintEvent *) { paintPixmap(getPixmapId()); } -void WaButton::mousePressEvent(QMouseEvent* e) { +void WaButton::mousePressEvent(TQMouseEvent* e) { if (e->button() != LeftButton) { // We can't deal with it, but maybe the widget can do something clever WaWidget::mousePressEvent(e); @@ -60,7 +60,7 @@ void WaButton::mousePressEvent(QMouseEvent* e) { } } -void WaButton::mouseReleaseEvent(QMouseEvent* e) { +void WaButton::mouseReleaseEvent(TQMouseEvent* e) { if (!pressed) { // We're not pressed, so just pass along the mouse event, it's not ours WaWidget::mouseReleaseEvent(e); diff --git a/noatun/modules/winskin/waButton.h b/noatun/modules/winskin/waButton.h index 50947216..bfaf43ff 100644 --- a/noatun/modules/winskin/waButton.h +++ b/noatun/modules/winskin/waButton.h @@ -16,7 +16,7 @@ #ifndef __WABUTTON_H #define __WABUTTON_H -#include <qpainter.h> +#include <tqpainter.h> #include "waWidget.h" class WaButton : public WaWidget { @@ -37,18 +37,18 @@ class WaButton : public WaWidget { bool togglable() const { return _togglable; } int getPixmapId(); - void paintEvent(QPaintEvent*); + void paintEvent(TQPaintEvent*); private: - void mousePressEvent (QMouseEvent* e); - void mouseReleaseEvent (QMouseEvent* e); + void mousePressEvent (TQMouseEvent* e); + void mouseReleaseEvent (TQMouseEvent* e); int nUpId; int nDownId; int nDownIdSelected; int nUpIdSelected; - QPoint currentLocation; + TQPoint currentLocation; bool _toggled; bool _togglable; diff --git a/noatun/modules/winskin/waClutterbar.cpp b/noatun/modules/winskin/waClutterbar.cpp index 6ceb7d04..f4370e87 100644 --- a/noatun/modules/winskin/waClutterbar.cpp +++ b/noatun/modules/winskin/waClutterbar.cpp @@ -6,6 +6,6 @@ WaClutterbar::WaClutterbar() : WaWidget(_WA_MAPPING_CLUTTERBAR) { WaClutterbar::~WaClutterbar() { } -void WaClutterbar::paintEvent(QPaintEvent *) { +void WaClutterbar::paintEvent(TQPaintEvent *) { paintPixmap(_WA_SKIN_CLUTTERBAR_DISABLED); } diff --git a/noatun/modules/winskin/waClutterbar.h b/noatun/modules/winskin/waClutterbar.h index 69339c37..5a96993a 100644 --- a/noatun/modules/winskin/waClutterbar.h +++ b/noatun/modules/winskin/waClutterbar.h @@ -1,7 +1,7 @@ #ifndef __WACLUTTERBAR_H #define __WACLUTTERBAR_H -#include <qpainter.h> +#include <tqpainter.h> #include "waWidget.h" class WaClutterbar : public WaWidget { @@ -12,7 +12,7 @@ class WaClutterbar : public WaWidget { ~WaClutterbar(); public slots: - void paintEvent(QPaintEvent *); + void paintEvent(TQPaintEvent *); }; #endif diff --git a/noatun/modules/winskin/waColor.cpp b/noatun/modules/winskin/waColor.cpp index e06b38bc..43fa5154 100644 --- a/noatun/modules/winskin/waColor.cpp +++ b/noatun/modules/winskin/waColor.cpp @@ -1,11 +1,11 @@ #include <fstream> -#include <qfile.h> +#include <tqfile.h> #include "waColor.h" WaColor *colorScheme = NULL; -WaColor::WaColor(QString filename) { +WaColor::WaColor(TQString filename) { int r, g, b; char comma; @@ -38,7 +38,7 @@ WaColor::WaColor(QString filename) { return; } - std::ifstream viscolor(QFile::encodeName(filename)); + std::ifstream viscolor(TQFile::encodeName(filename)); if (!viscolor) return; diff --git a/noatun/modules/winskin/waColor.h b/noatun/modules/winskin/waColor.h index a0e18484..e029b70b 100644 --- a/noatun/modules/winskin/waColor.h +++ b/noatun/modules/winskin/waColor.h @@ -3,8 +3,8 @@ #ifndef WACOLOR_H #define WACOLOR_H -#include <qcolor.h> -#include <qstring.h> +#include <tqcolor.h> +#include <tqstring.h> #define INDEX_BACKGROUND_COLOR 0 #define INDEX_GRID_COLOR 1 @@ -14,10 +14,10 @@ class WaColor { public: - WaColor(QString filename); + WaColor(TQString filename); ~WaColor(); - QColor skinColors[24]; + TQColor skinColors[24]; }; extern WaColor *colorScheme; diff --git a/noatun/modules/winskin/waDigit.cpp b/noatun/modules/winskin/waDigit.cpp index b775d7cf..15a3ae46 100644 --- a/noatun/modules/winskin/waDigit.cpp +++ b/noatun/modules/winskin/waDigit.cpp @@ -34,7 +34,7 @@ WaDigit::~WaDigit() config->writeEntry("timeReversed", reverse_time); } -void WaDigit::paintEvent(QPaintEvent *) +void WaDigit::paintEvent(TQPaintEvent *) { paintBackground(); @@ -49,7 +49,7 @@ void WaDigit::paintEvent(QPaintEvent *) int x = waSkinModel->getMapGeometry(mapping).x(); int y = waSkinModel->getMapGeometry(mapping).y(); - QRect mapRect; + TQRect mapRect; // We expect strings either in the form "xx:yy", or "-xx:yy" // If the string length is 6, we have it in the form of "-xx:yy" @@ -77,7 +77,7 @@ void WaDigit::paintEvent(QPaintEvent *) waSkinModel->getDigit(time[4], this, mapRect.x() - x, mapRect.y() - y); } -void WaDigit::mousePressEvent(QMouseEvent* e) { +void WaDigit::mousePressEvent(TQMouseEvent* e) { if (e->button() == LeftButton) { reverse_time = !reverse_time; emit digitsClicked(); diff --git a/noatun/modules/winskin/waDigit.h b/noatun/modules/winskin/waDigit.h index cefbfeb3..cee5da1d 100644 --- a/noatun/modules/winskin/waDigit.h +++ b/noatun/modules/winskin/waDigit.h @@ -16,7 +16,7 @@ #ifndef __WADIGIT_H #define __WADIGIT_H -#include <qpainter.h> +#include <tqpainter.h> #include "waWidget.h" @@ -27,20 +27,20 @@ class WaDigit : public WaWidget { WaDigit(); ~WaDigit(); - void setTime(QString time) { timeString = time; update(); } - QString time() const { return timeString; } + void setTime(TQString time) { timeString = time; update(); } + TQString time() const { return timeString; } bool timeReversed() const { return reverse_time; } public slots: - void paintEvent(QPaintEvent * paintEvent); + void paintEvent(TQPaintEvent * paintEvent); private: - void mousePressEvent(QMouseEvent* e); + void mousePressEvent(TQMouseEvent* e); bool reverse_time; WaSkinModel *waSkinModel; - QString timeString; + TQString timeString; signals: void digitsClicked(); diff --git a/noatun/modules/winskin/waIndicator.cpp b/noatun/modules/winskin/waIndicator.cpp index 9c5efa84..1c6a64cc 100644 --- a/noatun/modules/winskin/waIndicator.cpp +++ b/noatun/modules/winskin/waIndicator.cpp @@ -25,7 +25,7 @@ WaIndicator::~WaIndicator() { } -void WaIndicator::paintEvent(QPaintEvent *) +void WaIndicator::paintEvent(TQPaintEvent *) { paintPixmap( _state ? _enabled_mapping : _disabled_mapping ); } diff --git a/noatun/modules/winskin/waIndicator.h b/noatun/modules/winskin/waIndicator.h index f367fe84..b4d37482 100644 --- a/noatun/modules/winskin/waIndicator.h +++ b/noatun/modules/winskin/waIndicator.h @@ -16,7 +16,7 @@ #ifndef __WAINDICATOR_H #define __WAINDICATOR_H -#include <qpainter.h> +#include <tqpainter.h> #include "waWidget.h" @@ -31,7 +31,7 @@ class WaIndicator : public WaWidget { bool state() const { return _state; } public slots: - void paintEvent(QPaintEvent *); + void paintEvent(TQPaintEvent *); private: int _enabled_mapping; diff --git a/noatun/modules/winskin/waInfo.cpp b/noatun/modules/winskin/waInfo.cpp index c735a8e4..d64191da 100644 --- a/noatun/modules/winskin/waInfo.cpp +++ b/noatun/modules/winskin/waInfo.cpp @@ -12,8 +12,8 @@ */ -#include <qpainter.h> -#include <qpixmap.h> +#include <tqpainter.h> +#include <tqpixmap.h> #include <stdlib.h> @@ -25,18 +25,18 @@ WaInfo::WaInfo() : WaWidget(_WA_MAPPING_INFO) { - connect(WaSkinModel::instance(), SIGNAL(skinChanged()), - this, SLOT(pixmapChange())); + connect(WaSkinModel::instance(), TQT_SIGNAL(skinChanged()), + this, TQT_SLOT(pixmapChange())); - completePixmap = new QPixmap(); + completePixmap = new TQPixmap(); - QSize size = sizeHint(); + TQSize size = sizeHint(); completePixmap->resize(size.width(), size.height()); xGrabbedPos = -1; - timer = new QTimer(this); - connect(timer, SIGNAL(timeout()), this, SLOT(timeEvent())); + timer = new TQTimer(this); + connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeEvent())); } WaInfo::~WaInfo() @@ -65,7 +65,7 @@ void WaInfo::scrollerSetup() xScrollPos = 0; xScrollDirection = 0; timer->stop(); - QSize size = sizeHint(); + TQSize size = sizeHint(); if (completePixmap->width() > size.width()) { xScrollDirection = 1; @@ -77,9 +77,9 @@ void WaInfo::scrollerSetup() } } -void WaInfo::paintEvent(QPaintEvent *) +void WaInfo::paintEvent(TQPaintEvent *) { - QSize size = sizeHint(); + TQSize size = sizeHint(); if (completePixmap->width() <= size.width()) { bitBlt(this, 0, 0, completePixmap); @@ -105,7 +105,7 @@ void WaInfo::paintEvent(QPaintEvent *) } -void WaInfo::setText(QString song) +void WaInfo::setText(TQString song) { if (_text != song) { _text = song; @@ -113,7 +113,7 @@ void WaInfo::setText(QString song) } } -QString WaInfo::text() const +TQString WaInfo::text() const { return _text; } @@ -127,7 +127,7 @@ void WaInfo::pixmapChange() int x = 0; int n=infoString ? strlen(infoString) : 0; - QSize size = sizeHint(); + TQSize size = sizeHint(); completePixmap->resize(QMAX(n * _WA_TEXT_WIDTH, size.width()), _WA_TEXT_HEIGHT); @@ -149,12 +149,12 @@ void WaInfo::pixmapChange() update(); } -void WaInfo::mousePressEvent (QMouseEvent *e) { +void WaInfo::mousePressEvent (TQMouseEvent *e) { if (e->button() == LeftButton) xGrabbedPos = (e->x() + xScrollPos) % completePixmap->width(); } -void WaInfo::mouseMoveEvent (QMouseEvent * e) { +void WaInfo::mouseMoveEvent (TQMouseEvent * e) { xScrollPos = -e->x() + xGrabbedPos; if (xScrollPos < 0) @@ -165,7 +165,7 @@ void WaInfo::mouseMoveEvent (QMouseEvent * e) { update(); } -void WaInfo::mouseReleaseEvent (QMouseEvent *) { +void WaInfo::mouseReleaseEvent (TQMouseEvent *) { xGrabbedPos = -1; } diff --git a/noatun/modules/winskin/waInfo.h b/noatun/modules/winskin/waInfo.h index 513ff3cc..32d310e4 100644 --- a/noatun/modules/winskin/waInfo.h +++ b/noatun/modules/winskin/waInfo.h @@ -16,8 +16,8 @@ #ifndef __WAINFO_H #define __WAINFO_H -#include <qpainter.h> -#include <qtimer.h> +#include <tqpainter.h> +#include <tqtimer.h> #include "waWidget.h" @@ -28,20 +28,20 @@ class WaInfo : public WaWidget { WaInfo(); ~WaInfo(); - void setText(QString song); - QString text() const; + void setText(TQString song); + TQString text() const; void scrollerSetup(); protected: - void paintEvent(QPaintEvent * paintEvent); + void paintEvent(TQPaintEvent * paintEvent); - void mousePressEvent (QMouseEvent * e); - void mouseMoveEvent (QMouseEvent * e); - void mouseReleaseEvent (QMouseEvent * e); + void mousePressEvent (TQMouseEvent * e); + void mouseMoveEvent (TQMouseEvent * e); + void mouseReleaseEvent (TQMouseEvent * e); - QPixmap *completePixmap; - QString _text; - QTimer *timer; + TQPixmap *completePixmap; + TQString _text; + TQTimer *timer; int xScrollPos; int xScrollDirection; int xGrabbedPos; diff --git a/noatun/modules/winskin/waJumpSlider.cpp b/noatun/modules/winskin/waJumpSlider.cpp index 51633300..b8750dc1 100644 --- a/noatun/modules/winskin/waJumpSlider.cpp +++ b/noatun/modules/winskin/waJumpSlider.cpp @@ -30,9 +30,9 @@ void WaJumpSlider::buildGui() ws->setRange(0, 100); ws->setValue(0); - connect(ws, SIGNAL(sliderPressed()), this, SIGNAL(sliderPressed())); - connect(ws, SIGNAL(sliderReleased()), this, SLOT(releasedSlider())); - connect(ws, SIGNAL(valueChanged(int)), this, SIGNAL(valueChanged(int))); + connect(ws, TQT_SIGNAL(sliderPressed()), this, TQT_SIGNAL(sliderPressed())); + connect(ws, TQT_SIGNAL(sliderReleased()), this, TQT_SLOT(releasedSlider())); + connect(ws, TQT_SIGNAL(valueChanged(int)), this, TQT_SIGNAL(valueChanged(int))); } void WaJumpSlider::setJumpRange(int val) @@ -63,11 +63,11 @@ void WaJumpSlider::releasedSlider() { emit(sliderReleased()); } -void WaJumpSlider::showEvent (QShowEvent *) { +void WaJumpSlider::showEvent (TQShowEvent *) { ws->show(); } -void WaJumpSlider::hideEvent (QHideEvent *) { +void WaJumpSlider::hideEvent (TQHideEvent *) { ws->hide(); } diff --git a/noatun/modules/winskin/waJumpSlider.h b/noatun/modules/winskin/waJumpSlider.h index 12c07808..e8a48b1f 100644 --- a/noatun/modules/winskin/waJumpSlider.h +++ b/noatun/modules/winskin/waJumpSlider.h @@ -35,8 +35,8 @@ class WaJumpSlider : public WaWidget { protected: WaSlider *ws; - void showEvent (QShowEvent *); - void hideEvent (QHideEvent *); + void showEvent (TQShowEvent *); + void hideEvent (TQHideEvent *); private slots: void releasedSlider(); diff --git a/noatun/modules/winskin/waLabel.cpp b/noatun/modules/winskin/waLabel.cpp index 8f3ddb60..54b7513b 100644 --- a/noatun/modules/winskin/waLabel.cpp +++ b/noatun/modules/winskin/waLabel.cpp @@ -11,20 +11,20 @@ */ -#include <qpainter.h> -#include <qpixmap.h> +#include <tqpainter.h> +#include <tqpixmap.h> #include "waLabel.h" #include "waSkinModel.h" WaLabel::WaLabel(int mapping) : WaWidget(mapping) { - connect(WaSkinModel::instance(), SIGNAL(skinChanged()), - this, SLOT(pixmapChange())); + connect(WaSkinModel::instance(), TQT_SIGNAL(skinChanged()), + this, TQT_SLOT(pixmapChange())); - completePixmap = new QPixmap(); + completePixmap = new TQPixmap(); - QSize size = sizeHint(); + TQSize size = sizeHint(); completePixmap->resize(size.width(), size.height()); } @@ -34,12 +34,12 @@ WaLabel::~WaLabel() delete completePixmap; } -void WaLabel::paintEvent(QPaintEvent *) +void WaLabel::paintEvent(TQPaintEvent *) { bitBlt(this, 0, 0, completePixmap); } -void WaLabel::setText(const QString &new_text) +void WaLabel::setText(const TQString &new_text) { int width = WaSkinModel::instance()->getMapGeometry(mapping).width(); diff --git a/noatun/modules/winskin/waLabel.h b/noatun/modules/winskin/waLabel.h index f1470902..ce7ad771 100644 --- a/noatun/modules/winskin/waLabel.h +++ b/noatun/modules/winskin/waLabel.h @@ -13,7 +13,7 @@ #ifndef __WABPS_H #define __WABPS_H -#include <qpainter.h> +#include <tqpainter.h> #include "waWidget.h" class WaLabel : public WaWidget { @@ -23,14 +23,14 @@ class WaLabel : public WaWidget { WaLabel(int mapping); ~WaLabel(); - void setText(const QString &text); - QString text() const { return _text; } + void setText(const TQString &text); + TQString text() const { return _text; } private: - void paintEvent(QPaintEvent *); + void paintEvent(TQPaintEvent *); - QPixmap *completePixmap; - QString _text; + TQPixmap *completePixmap; + TQString _text; private slots: diff --git a/noatun/modules/winskin/waMain.cpp b/noatun/modules/winskin/waMain.cpp index a5bb7fdc..f66b8535 100644 --- a/noatun/modules/winskin/waMain.cpp +++ b/noatun/modules/winskin/waMain.cpp @@ -6,7 +6,7 @@ WaMain::WaMain() : WaWidget(_WA_MAPPING_MAIN) { WaMain::~WaMain() { } -void WaMain::paintEvent(QPaintEvent *) { +void WaMain::paintEvent(TQPaintEvent *) { paintPixmap(_WA_SKIN_MAIN); } diff --git a/noatun/modules/winskin/waMain.h b/noatun/modules/winskin/waMain.h index 06bcfe5d..fbc47a64 100644 --- a/noatun/modules/winskin/waMain.h +++ b/noatun/modules/winskin/waMain.h @@ -10,7 +10,7 @@ public: ~WaMain(); protected: - void paintEvent(QPaintEvent *); + void paintEvent(TQPaintEvent *); }; #endif diff --git a/noatun/modules/winskin/waRegion.cpp b/noatun/modules/winskin/waRegion.cpp index ab4d2e57..06f6851e 100644 --- a/noatun/modules/winskin/waRegion.cpp +++ b/noatun/modules/winskin/waRegion.cpp @@ -11,9 +11,9 @@ */ #include <ksimpleconfig.h> -#include <qbitmap.h> -#include <qpainter.h> -#include <qregexp.h> +#include <tqbitmap.h> +#include <tqpainter.h> +#include <tqregexp.h> #include "waSkinModel.h" #include "waSkins.h" @@ -26,7 +26,7 @@ WaRegion *windowRegion = NULL; const char *pointListNames[] = {"PointList", "pointlist", "Pointlist", "pointList", "POINTLIST", 0}; const char *numPointsNames[] = {"NumPoints", "numpoints", "Numpoints", "numPoints", "NUMPOINTS", 0}; -WaRegion::WaRegion(QString filename) { +WaRegion::WaRegion(TQString filename) { // Load the region file, which happens to be in KConfig format KSimpleConfig regionFile(filename, true); @@ -35,19 +35,19 @@ WaRegion::WaRegion(QString filename) { shade_mask = 0; // Make the new bitmaps, default window size - window_mask = new QBitmap(WaSkinModel::instance()->getMapGeometry(_WA_MAPPING_MAIN).size(), true); - shade_mask = new QBitmap(WaSkinModel::instance()->getMapGeometry(_WA_MAPPING_TITLE).size(), true); + window_mask = new TQBitmap(WaSkinModel::instance()->getMapGeometry(_WA_MAPPING_MAIN).size(), true); + shade_mask = new TQBitmap(WaSkinModel::instance()->getMapGeometry(_WA_MAPPING_TITLE).size(), true); // Load the normal window mask data regionFile.setGroup("Normal"); - QValueList<int> num_points; + TQValueList<int> num_points; for (int x = 0;numPointsNames[x];x++) { if (regionFile.hasKey(numPointsNames[x])) num_points = parseList(regionFile.readEntry(numPointsNames[x])); } - QValueList<int> point_list; + TQValueList<int> point_list; for (int x = 0;pointListNames[x];x++) { if (regionFile.hasKey(pointListNames[x])) point_list = parseList(regionFile.readEntry(pointListNames[x])); @@ -71,27 +71,27 @@ WaRegion::~WaRegion() { delete shade_mask; } -void WaRegion::buildPixmap(const QValueList<int> &num_points_list, const QValueList<int> &points_list, QBitmap *dest) { +void WaRegion::buildPixmap(const TQValueList<int> &num_points_list, const TQValueList<int> &points_list, TQBitmap *dest) { if (!num_points_list.count()) { dest->fill(Qt::color1); return; } - QValueList<int>::const_iterator points = points_list.begin(); + TQValueList<int>::const_iterator points = points_list.begin(); - QPainter p(dest); + TQPainter p(dest); // Coordinates in REGION.TXT can go one pixel beyond the window size - QBitmap bm(dest->width()+1,dest->height()+1,true); - QPainter bmp(&bm); + TQBitmap bm(dest->width()+1,dest->height()+1,true); + TQPainter bmp(&bm); bmp.setBrush(Qt::color1); bmp.setPen(Qt::NoPen); // The polygon border itself should not be part of the visible window // Go over each "region" in the file - for (QValueList<int>::const_iterator num_points = num_points_list.begin();num_points != num_points_list.end();num_points++) { + for (TQValueList<int>::const_iterator num_points = num_points_list.begin();num_points != num_points_list.end();num_points++) { // Make a new point array - QPointArray point_array(*num_points); + TQPointArray point_array(*num_points); // Populate it for (int i = 0;i < *num_points;i++) { @@ -112,14 +112,14 @@ void WaRegion::buildPixmap(const QValueList<int> &num_points_list, const QValueL // The winamp list format is absolutely insane, it will accept either // commas or whitespace as the delimiter. This function deals with // that. -QValueList<int> WaRegion::parseList(const QString &list) const { - QValueList<int> temp_list; +TQValueList<int> WaRegion::parseList(const TQString &list) const { + TQValueList<int> temp_list; if (list.isEmpty()) return temp_list; - QStringList open=QStringList::split(QRegExp("[,\\s]+"), list); - for (QStringList::Iterator i=open.begin(); i != open.end(); ++i) + TQStringList open=TQStringList::split(TQRegExp("[,\\s]+"), list); + for (TQStringList::Iterator i=open.begin(); i != open.end(); ++i) temp_list.append((*i).toInt()); return temp_list; diff --git a/noatun/modules/winskin/waRegion.h b/noatun/modules/winskin/waRegion.h index 853909c1..66c7c811 100644 --- a/noatun/modules/winskin/waRegion.h +++ b/noatun/modules/winskin/waRegion.h @@ -1,23 +1,23 @@ #ifndef WAREGION_H #define WAREGION_H -#include <qcolor.h> -#include <qstring.h> +#include <tqcolor.h> +#include <tqstring.h> class WaRegion { public: - WaRegion(QString filename); + WaRegion(TQString filename); ~WaRegion(); - const QBitmap *mainWindowMask() const { return window_mask; } - const QBitmap *mainWindowShadeMask() const { return shade_mask; } + const TQBitmap *mainWindowMask() const { return window_mask; } + const TQBitmap *mainWindowShadeMask() const { return shade_mask; } private: - QValueList<int> parseList(const QString &list) const; - void buildPixmap(const QValueList<int> &num_points, const QValueList<int> &point_list, QBitmap *dest); + TQValueList<int> parseList(const TQString &list) const; + void buildPixmap(const TQValueList<int> &num_points, const TQValueList<int> &point_list, TQBitmap *dest); - QBitmap *window_mask; - QBitmap *shade_mask; + TQBitmap *window_mask; + TQBitmap *shade_mask; }; extern WaRegion *windowRegion; diff --git a/noatun/modules/winskin/waSkin.cpp b/noatun/modules/winskin/waSkin.cpp index 7d95047d..d7b443ee 100644 --- a/noatun/modules/winskin/waSkin.cpp +++ b/noatun/modules/winskin/waSkin.cpp @@ -12,7 +12,7 @@ */ #include <kconfig.h> -#include <qstringlist.h> +#include <tqstringlist.h> #include <kglobal.h> #include <klocale.h> #include <kiconloader.h> @@ -21,7 +21,7 @@ #include <kurldrag.h> #include <kstdaction.h> #include <kaction.h> -#include <qdragobject.h> +#include <tqdragobject.h> #include <kstandarddirs.h> #include <kwin.h> #include <time.h> @@ -57,7 +57,7 @@ WaSkin *_waskin_instance = NULL; -WaSkin::WaSkin() : QWidget(0, "NoatunWinampSkin"), UserInterface() +WaSkin::WaSkin() : TQWidget(0, "NoatunWinampSkin"), UserInterface() { mJumpPressed = false; mVolumePressed = false; @@ -83,22 +83,22 @@ WaSkin::WaSkin() : QWidget(0, "NoatunWinampSkin"), UserInterface() title_shaded = false; // These slots make Young Hickory love us - connect( napp, SIGNAL(hideYourself()), this, SLOT(hide()) ); - connect( napp, SIGNAL(showYourself()), this, SLOT(show()) ); - - connect(napp->player(), SIGNAL(playlistShown()), this, - SLOT(playlistShown())); - connect(napp->player(), SIGNAL(playlistHidden()), this, - SLOT(playlistHidden())); - connect(napp->player(), SIGNAL(loopTypeChange(int)), this, - SLOT(loopChange(int))); - connect(napp->player(), SIGNAL(newSong()), this, SLOT(newSong())); - - connect(napp->player(), SIGNAL(timeout()), this, SLOT(timetick())); + connect( napp, TQT_SIGNAL(hideYourself()), this, TQT_SLOT(hide()) ); + connect( napp, TQT_SIGNAL(showYourself()), this, TQT_SLOT(show()) ); + + connect(napp->player(), TQT_SIGNAL(playlistShown()), this, + TQT_SLOT(playlistShown())); + connect(napp->player(), TQT_SIGNAL(playlistHidden()), this, + TQT_SLOT(playlistHidden())); + connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), this, + TQT_SLOT(loopChange(int))); + connect(napp->player(), TQT_SIGNAL(newSong()), this, TQT_SLOT(newSong())); + + connect(napp->player(), TQT_SIGNAL(timeout()), this, TQT_SLOT(timetick())); KConfig *config=KGlobal::config(); config->setGroup("Winskin"); - QString skin = config->readEntry("CurrentSkin", WaSkin::defaultSkin()); + TQString skin = config->readEntry("CurrentSkin", WaSkin::defaultSkin()); loadSkin(skin); @@ -106,13 +106,13 @@ WaSkin::WaSkin() : QWidget(0, "NoatunWinampSkin"), UserInterface() setIcon(SmallIcon("noatun")); - QObject::connect(waTitleBar, SIGNAL(shaded()), this, SLOT(shadeEvent())); + TQObject::connect(waTitleBar, TQT_SIGNAL(shaded()), this, TQT_SLOT(shadeEvent())); // connect to players signals - so we can update our display if someone else // changes settings... - connect(napp->player(), SIGNAL(stopped()), this, SLOT(slotStopped())); - connect(napp->player(), SIGNAL(playing()), this, SLOT(slotPlaying())); - connect(napp->player(), SIGNAL(paused()), this, SLOT(slotPaused())); + connect(napp->player(), TQT_SIGNAL(stopped()), this, TQT_SLOT(slotStopped())); + connect(napp->player(), TQT_SIGNAL(playing()), this, TQT_SLOT(slotPlaying())); + connect(napp->player(), TQT_SIGNAL(paused()), this, TQT_SLOT(slotPaused())); napp->player()->handleButtons(); @@ -126,7 +126,7 @@ WaSkin::WaSkin() : QWidget(0, "NoatunWinampSkin"), UserInterface() newSong(); // HACK: We won't get focus events otherwise - setFocusPolicy(QWidget::ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); show(); } @@ -138,7 +138,7 @@ WaSkin::~WaSkin() waSkinManager = 0L; } -void WaSkin::loadSkin(QString newSkinDir) +void WaSkin::loadSkin(TQString newSkinDir) { waSkinManager->loadSkin(newSkinDir); @@ -154,9 +154,9 @@ void WaSkin::loadSkin(QString newSkinDir) } } -QSize WaSkin::sizeHint() const +TQSize WaSkin::sizeHint() const { - QRect temp_rect; + TQRect temp_rect; temp_rect = waSkinModel->getGeometry(_WA_SKIN_MAIN); @@ -180,22 +180,22 @@ void WaSkin::createButtons() menu = new WaButton(_WA_MAPPING_TITLE_MENU); menu->setPixmapUp(_WA_SKIN_TITLE_MENU_NORM); menu->setPixmapDown(_WA_SKIN_TITLE_MENU_PRES); - connect(menu, SIGNAL(clicked()), this, SLOT(menuEvent())); + connect(menu, TQT_SIGNAL(clicked()), this, TQT_SLOT(menuEvent())); minimize = new WaButton(_WA_MAPPING_TITLE_MIN); minimize->setPixmapUp(_WA_SKIN_TITLE_MIN_NORM); minimize->setPixmapDown(_WA_SKIN_TITLE_MIN_PRES); - connect(minimize, SIGNAL(clicked()), this, SLOT(minimizeEvent())); + connect(minimize, TQT_SIGNAL(clicked()), this, TQT_SLOT(minimizeEvent())); titleshade = new WaButton(_WA_MAPPING_TITLE_SHADE); titleshade->setPixmapUp(_WA_SKIN_TITLE_SHADE_NORM); titleshade->setPixmapDown(_WA_SKIN_TITLE_SHADE_PRES); - connect(titleshade, SIGNAL(clicked()), this, SLOT(shadeEvent())); + connect(titleshade, TQT_SIGNAL(clicked()), this, TQT_SLOT(shadeEvent())); close = new WaButton(_WA_MAPPING_TITLE_CLOSE); close->setPixmapUp(_WA_SKIN_TITLE_CLOSE_NORM); close->setPixmapDown(_WA_SKIN_TITLE_CLOSE_PRES); - connect(close, SIGNAL(clicked()), this, SLOT(doClose())); + connect(close, TQT_SIGNAL(clicked()), this, TQT_SLOT(doClose())); shuffle->setTogglable(true); shuffle->show(); @@ -203,44 +203,44 @@ void WaSkin::createButtons() repeat->setTogglable(true); playlist->setTogglable(true); - connect(shuffle, SIGNAL(toggleEvent(bool)), - this, SLOT(shuffleClickedEvent(bool))); + connect(shuffle, TQT_SIGNAL(toggleEvent(bool)), + this, TQT_SLOT(shuffleClickedEvent(bool))); - connect(repeat, SIGNAL(toggleEvent(bool)), - this, SLOT(repeatClickedEvent(bool))); + connect(repeat, TQT_SIGNAL(toggleEvent(bool)), + this, TQT_SLOT(repeatClickedEvent(bool))); - connect(playlist, SIGNAL(toggleEvent(bool)), - this, SLOT(playlistClickedEvent(bool))); + connect(playlist, TQT_SIGNAL(toggleEvent(bool)), + this, TQT_SLOT(playlistClickedEvent(bool))); - connect(eq, SIGNAL(clicked()), - this, SLOT(eqClickedEvent())); + connect(eq, TQT_SIGNAL(clicked()), + this, TQT_SLOT(eqClickedEvent())); prev->setPixmapUp(_WA_SKIN_CBUTTONS_PREV_NORM); prev->setPixmapDown(_WA_SKIN_CBUTTONS_PREV_PRES); - connect(prev, SIGNAL(clicked()), napp->player(), SLOT(back())); + connect(prev, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(back())); play->setPixmapUp(_WA_SKIN_CBUTTONS_PLAY_NORM); play->setPixmapDown(_WA_SKIN_CBUTTONS_PLAY_PRES); - connect(play, SIGNAL(clicked()), this, SLOT(playCurrentEvent())); + connect(play, TQT_SIGNAL(clicked()), this, TQT_SLOT(playCurrentEvent())); pause->setPixmapUp(_WA_SKIN_CBUTTONS_PAUSE_NORM); pause->setPixmapDown(_WA_SKIN_CBUTTONS_PAUSE_PRES); - connect(pause, SIGNAL(clicked()), this, SLOT(playPauseEvent())); + connect(pause, TQT_SIGNAL(clicked()), this, TQT_SLOT(playPauseEvent())); stop->setPixmapUp(_WA_SKIN_CBUTTONS_STOP_NORM); stop->setPixmapDown(_WA_SKIN_CBUTTONS_STOP_PRES); - connect(stop, SIGNAL(clicked()), napp->player(), SLOT(stop())); + connect(stop, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(stop())); next->setPixmapUp(_WA_SKIN_CBUTTONS_NEXT_NORM); next->setPixmapDown(_WA_SKIN_CBUTTONS_NEXT_PRES); - connect(next, SIGNAL(clicked()), napp->player(), SLOT(forward())); + connect(next, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward())); eject->setPixmapUp(_WA_SKIN_CBUTTONS_EJECT_NORM); eject->setPixmapDown(_WA_SKIN_CBUTTONS_EJECT_PRESS); - connect(eject, SIGNAL(clicked()), napp, SLOT(fileOpen())); + connect(eject, TQT_SIGNAL(clicked()), napp, TQT_SLOT(fileOpen())); shuffle->setPixmapUp(_WA_SKIN_SHUFREP_SHUFFLE_NOT_SET_NORM); shuffle->setPixmapDown(_WA_SKIN_SHUFREP_SHUFFLE_NOT_SET_PRES); @@ -280,25 +280,25 @@ void WaSkin::createHighLevelElements() waVolumeSlider = new WaVolumeSlider(); waVolumeSlider->buildGui(); - connect(waVolumeSlider, SIGNAL(volumeSetValue(int)), - this, SLOT(volumeSetValue(int))); - connect(waVolumeSlider, SIGNAL(sliderPressed()), - this, SLOT(volumeSliderPressed())); - connect(waVolumeSlider, SIGNAL(sliderReleased()), - this, SLOT(volumeSliderReleased())); + connect(waVolumeSlider, TQT_SIGNAL(volumeSetValue(int)), + this, TQT_SLOT(volumeSetValue(int))); + connect(waVolumeSlider, TQT_SIGNAL(sliderPressed()), + this, TQT_SLOT(volumeSliderPressed())); + connect(waVolumeSlider, TQT_SIGNAL(sliderReleased()), + this, TQT_SLOT(volumeSliderReleased())); waBalanceSlider = new WaBalanceSlider(); waBalanceSlider->buildGui(); - connect(waBalanceSlider, SIGNAL(balanceSetValue(int)), - this, SLOT(balanceSetValue(int))); - connect(waBalanceSlider, SIGNAL(sliderPressed()), - this, SLOT(balanceSliderPressed())); - connect(waBalanceSlider, SIGNAL(sliderReleased()), - this, SLOT(balanceSliderReleased())); + connect(waBalanceSlider, TQT_SIGNAL(balanceSetValue(int)), + this, TQT_SLOT(balanceSetValue(int))); + connect(waBalanceSlider, TQT_SIGNAL(sliderPressed()), + this, TQT_SLOT(balanceSliderPressed())); + connect(waBalanceSlider, TQT_SIGNAL(sliderReleased()), + this, TQT_SLOT(balanceSliderReleased())); waDigit = new WaDigit(); - connect(waDigit, SIGNAL(digitsClicked()), this, SLOT(digitsClicked())); + connect(waDigit, TQT_SIGNAL(digitsClicked()), this, TQT_SLOT(digitsClicked())); waBPS = new WaLabel(_WA_MAPPING_BPS); waFreq = new WaLabel(_WA_MAPPING_FREQ); @@ -310,13 +310,13 @@ void WaSkin::createHighLevelElements() waStereo = new WaIndicator(_WA_MAPPING_MONOSTER_STEREO, _WA_SKIN_MONOSTER_STEREO_TRUE, _WA_SKIN_MONOSTER_STEREO_FALSE); waMono = new WaIndicator(_WA_MAPPING_MONOSTER_MONO, _WA_SKIN_MONOSTER_MONO_TRUE, _WA_SKIN_MONOSTER_MONO_FALSE); - connect(waJumpSlider, SIGNAL(jump(int)), this, SLOT(jump(int))); - connect(waJumpSlider, SIGNAL(sliderPressed()), - this, SLOT(jumpSliderPressed())); - connect(waJumpSlider, SIGNAL(sliderReleased()), - this, SLOT(jumpSliderReleased())); - connect(waJumpSlider, SIGNAL(valueChanged(int)), - this, SLOT(jumpValueChanged(int))); + connect(waJumpSlider, TQT_SIGNAL(jump(int)), this, TQT_SLOT(jump(int))); + connect(waJumpSlider, TQT_SIGNAL(sliderPressed()), + this, TQT_SLOT(jumpSliderPressed())); + connect(waJumpSlider, TQT_SIGNAL(sliderReleased()), + this, TQT_SLOT(jumpSliderReleased())); + connect(waJumpSlider, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(jumpValueChanged(int))); } @@ -352,7 +352,7 @@ void WaSkin::unshade() { title_shaded = false; } -void WaSkin::focusOutEvent( QFocusEvent * ) { +void WaSkin::focusOutEvent( TQFocusEvent * ) { menu->setPixmapUp(_WA_SKIN_TITLE_MENU_INACTIVE); menu->update(); @@ -368,7 +368,7 @@ void WaSkin::focusOutEvent( QFocusEvent * ) { waTitleBar->setState(false); } -void WaSkin::focusInEvent( QFocusEvent * ) { +void WaSkin::focusInEvent( TQFocusEvent * ) { menu->setPixmapUp(_WA_SKIN_TITLE_MENU_NORM); menu->update(); @@ -384,7 +384,7 @@ void WaSkin::focusInEvent( QFocusEvent * ) { waTitleBar->setState(true); } -void WaSkin::wheelEvent(QWheelEvent *e) { +void WaSkin::wheelEvent(TQWheelEvent *e) { // Get the current volume int newVolume = napp->player()->volume(); @@ -448,7 +448,7 @@ void WaSkin::jumpSliderReleased() void WaSkin::jumpValueChanged(int val) { if (mJumpPressed && !napp->player()->isStopped()) { - QString timeStr = i18n("Seek to: %1/%2 (%3%)"). + TQString timeStr = i18n("Seek to: %1/%2 (%3%)"). arg(getTimeString(val * 1000)). arg(getTimeString(napp->player()->getLength())). arg((val * 1000 * 100) / napp->player()->getLength()); @@ -456,15 +456,15 @@ void WaSkin::jumpValueChanged(int val) } } -QString WaSkin::getTitleString() { +TQString WaSkin::getTitleString() { int length; - QString title = ""; + TQString title = ""; if (!napp->playlist()->current()) { title = "Noatun "; - title += QString::number(NOATUN_MAJOR) + "."; - title += QString::number(NOATUN_MINOR) + "."; - title += QString::number(NOATUN_PATCHLEVEL); + title += TQString::number(NOATUN_MAJOR) + "."; + title += TQString::number(NOATUN_MINOR) + "."; + title += TQString::number(NOATUN_PATCHLEVEL); } else { length = napp->playlist()->current().length(); @@ -483,9 +483,9 @@ QString WaSkin::getTitleString() { return title; } -QString WaSkin::getTimeString(int milliseconds, bool truncate) { +TQString WaSkin::getTimeString(int milliseconds, bool truncate) { int seconds = abs(milliseconds / 1000); - QString ret = ""; + TQString ret = ""; // Do we need to convert to hours:minutes instead of minutes:seconds? if (truncate && (abs(seconds) >= (100 * 60))) @@ -498,7 +498,7 @@ QString WaSkin::getTimeString(int milliseconds, bool truncate) { } void WaSkin::menuEvent() { - NoatunStdAction::ContextMenu::showContextMenu(mapToGlobal(QPoint(0, 14))); + NoatunStdAction::ContextMenu::showContextMenu(mapToGlobal(TQPoint(0, 14))); } void WaSkin::minimizeEvent() { @@ -518,16 +518,16 @@ void WaSkin::doUnload() { } void WaSkin::doClose() { - QTimer::singleShot(0, this, SLOT(doUnload())); + TQTimer::singleShot(0, this, TQT_SLOT(doUnload())); } -void WaSkin::dragEnterEvent(QDragEnterEvent * event) +void WaSkin::dragEnterEvent(TQDragEnterEvent * event) { // accept uri drops only event->accept(KURLDrag::canDecode(event)); } -void WaSkin::dropEvent(QDropEvent * event) +void WaSkin::dropEvent(TQDropEvent * event) { KURL::List uri; if (KURLDrag::decode(event, uri)) @@ -690,12 +690,12 @@ void WaSkin::slotPlaying() if (!info.bps()) waBPS->setText(""); else - waBPS->setText(QString::number(info.bps())); + waBPS->setText(TQString::number(info.bps())); if (!info.KHz()) waFreq->setText(""); else - waFreq->setText(QString::number(info.KHz() / 1000)); + waFreq->setText(TQString::number(info.KHz() / 1000)); setChannels(info.channelCount()); guiSpectrumAnalyser->resumeVisualization(); @@ -736,7 +736,7 @@ void WaSkin::slotPaused() waStatus->setStatus(STATUS_PAUSED); } -void WaSkin::keyPressEvent(QKeyEvent *e) { +void WaSkin::keyPressEvent(TQKeyEvent *e) { switch(e->key()) { case Key_Up: napp->player()->setVolume(napp->player()->volume() + 5); @@ -793,7 +793,7 @@ void WaSkin::keyPressEvent(QKeyEvent *e) { } } -QString WaSkin::defaultSkin() { +TQString WaSkin::defaultSkin() { return "Winamp"; } diff --git a/noatun/modules/winskin/waSkin.h b/noatun/modules/winskin/waSkin.h index 7a2db9e1..947ce81e 100644 --- a/noatun/modules/winskin/waSkin.h +++ b/noatun/modules/winskin/waSkin.h @@ -19,7 +19,7 @@ #include <noatun/plugin.h> #include <noatun/app.h> #include <noatun/player.h> -#include <qwidget.h> +#include <tqwidget.h> // Use forward declarations so we compile in a finite time class WaSkinModel; @@ -44,7 +44,7 @@ class GuiSpectrumAnalyser; class WaSkin; extern WaSkin *_waskin_instance; -class WaSkin : public QWidget, public UserInterface { +class WaSkin : public TQWidget, public UserInterface { Q_OBJECT NOATUNPLUGIND WaSkinModel *waSkinModel; @@ -56,12 +56,12 @@ class WaSkin : public QWidget, public UserInterface { int getSkinId(); - void loadSkin(QString skinDir); + void loadSkin(TQString skinDir); void setChannels(int val); - QSize sizeHint() const; + TQSize sizeHint() const; - static QString defaultSkin(); + static TQString defaultSkin(); static WaSkin *instance() { return _waskin_instance; } public slots: @@ -117,21 +117,21 @@ class WaSkin : public QWidget, public UserInterface { void createButtons(); void createHighLevelElements(); - void keyPressEvent(QKeyEvent *); + void keyPressEvent(TQKeyEvent *); void shade(); void unshade(); - QString getTitleString(); - QString getTimeString(int milliseconds, bool truncate = false); + TQString getTitleString(); + TQString getTimeString(int milliseconds, bool truncate = false); - void focusOutEvent ( QFocusEvent * ); - void focusInEvent ( QFocusEvent * ); + void focusOutEvent ( TQFocusEvent * ); + void focusInEvent ( TQFocusEvent * ); - void dragEnterEvent(QDragEnterEvent * event); - void dropEvent(QDropEvent * event); + void dragEnterEvent(TQDragEnterEvent * event); + void dropEvent(TQDropEvent * event); - void wheelEvent(QWheelEvent *e); + void wheelEvent(TQWheelEvent *e); WaButton *prev; WaButton *play; diff --git a/noatun/modules/winskin/waSkinManager.cpp b/noatun/modules/winskin/waSkinManager.cpp index 5cde117b..cb5b0e2a 100644 --- a/noatun/modules/winskin/waSkinManager.cpp +++ b/noatun/modules/winskin/waSkinManager.cpp @@ -1,8 +1,8 @@ #include <kglobal.h> -#include <qfileinfo.h> -#include <qregexp.h> +#include <tqfileinfo.h> +#include <tqregexp.h> #include <kstandarddirs.h> -#include <qdir.h> +#include <tqdir.h> #include <kdebug.h> #include <kmimetype.h> #include <kio/job.h> @@ -19,21 +19,21 @@ WaSkinManager::WaSkinManager() : DCOPObject("WaSkinManager") { WaSkinManager::~WaSkinManager() { } -QStringList WaSkinManager::availableSkins() { - QStringList skinDirs = KGlobal::dirs()->findDirs("data", "noatun/skins/winamp"); - QStringList skin_list; +TQStringList WaSkinManager::availableSkins() { + TQStringList skinDirs = KGlobal::dirs()->findDirs("data", "noatun/skins/winamp"); + TQStringList skin_list; // This loop adds them all to our skin list for(unsigned int x = 0;x < skinDirs.count();x++) { - QDir skinQDir(skinDirs[x]); + TQDir skinQDir(skinDirs[x]); // We only want directories, although there shouldn't be anything else - skinQDir.setFilter( QDir::Dirs ); + skinQDir.setFilter( TQDir::Dirs ); // I guess name is as good as any - skinQDir.setSorting( QDir::Name ); + skinQDir.setSorting( TQDir::Name ); for (unsigned int y = 0;y < skinQDir.count();y++) { - QStringList skins = skinQDir.entryList(QDir::Dirs, QDir::Name); + TQStringList skins = skinQDir.entryList(TQDir::Dirs, TQDir::Name); // We really don't care for '.' and '..' if (skinQDir[y][0] != (char)'.') { @@ -46,16 +46,16 @@ QStringList WaSkinManager::availableSkins() { return skin_list; } -QString WaSkinManager::currentSkin() { +TQString WaSkinManager::currentSkin() { return mCurrentSkin; } -QString WaSkinManager::defaultSkin() { +TQString WaSkinManager::defaultSkin() { return "Winamp"; } -bool WaSkinManager::loadSkin(QString skinName) { - QStringList skins = KGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + skinName); +bool WaSkinManager::loadSkin(TQString skinName) { + TQStringList skins = KGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + skinName); if (!skins.count()) mCurrentSkin = defaultSkin(); @@ -65,15 +65,15 @@ bool WaSkinManager::loadSkin(QString skinName) { return _waskinmodel_instance->load(skins[0]); } -bool WaSkinManager::installSkin(QString _url) { - QString location = KGlobal::dirs()->saveLocation("data", "noatun/skins/winamp"); +bool WaSkinManager::installSkin(TQString _url) { + TQString location = KGlobal::dirs()->saveLocation("data", "noatun/skins/winamp"); KURL url(_url); - QString mimetype = KMimeType::findByURL(_url)->name(); + TQString mimetype = KMimeType::findByURL(_url)->name(); if (mimetype == "inode/directory") { KIO::Job *job = KIO::copy(url, location, !url.isLocalFile()); - connect(job, SIGNAL(result(KIO::Job *)), this, SIGNAL(updateSkinList())); + connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SIGNAL(updateSkinList())); return true; } else if ((mimetype == "interface/x-winamp-skin") || (mimetype == "application/x-zip")) @@ -81,10 +81,10 @@ bool WaSkinManager::installSkin(QString _url) { if (!url.isLocalFile()) return false; - QString base_path; - base_path = location + "/" + QFileInfo(url.path()).baseName().replace(QRegExp("_"), " "); + TQString base_path; + base_path = location + "/" + TQFileInfo(url.path()).baseName().replace(TQRegExp("_"), " "); KIO::Job *job = KIO::copy("zip:" + url.path(), base_path); - connect(job, SIGNAL(result(KIO::Job *)), this, SIGNAL(updateSkinList())); + connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SIGNAL(updateSkinList())); return true; } @@ -92,30 +92,30 @@ bool WaSkinManager::installSkin(QString _url) { return false; } -bool WaSkinManager::removeSkin(QString skinName) { +bool WaSkinManager::removeSkin(TQString skinName) { if (!skinRemovable(skinName)) return false; - QStringList skins = KGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + skinName); + TQStringList skins = KGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + skinName); KIO::Job *job = KIO::del(KURL(skins[0]), false, false); - connect(job, SIGNAL(result(KIO::Job *)), this, SIGNAL(updateSkinList())); + connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SIGNAL(updateSkinList())); return true; } -bool WaSkinManager::skinRemovable(QString skinName) { - QStringList skins = KGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + skinName); +bool WaSkinManager::skinRemovable(TQString skinName) { + TQStringList skins = KGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + skinName); if (!skins.count()) return false; - QFileInfo info(skins[0]); + TQFileInfo info(skins[0]); return info.isWritable(); } -QStringList WaSkinManager::skinMimeTypes() { - QStringList temp; +TQStringList WaSkinManager::skinMimeTypes() { + TQStringList temp; temp.append("interface/x-winamp-skin"); temp.append("application/x-zip"); diff --git a/noatun/modules/winskin/waSkinManager.h b/noatun/modules/winskin/waSkinManager.h index 17b21daf..360826b1 100644 --- a/noatun/modules/winskin/waSkinManager.h +++ b/noatun/modules/winskin/waSkinManager.h @@ -2,12 +2,12 @@ #define _WASKINMANAGER_H #include <dcopobject.h> -#include <qobject.h> -#include <qstringlist.h> -#include <qstring.h> -#include <qmap.h> +#include <tqobject.h> +#include <tqstringlist.h> +#include <tqstring.h> +#include <tqmap.h> -class WaSkinManager : public QObject, public DCOPObject { +class WaSkinManager : public TQObject, public DCOPObject { Q_OBJECT K_DCOP @@ -16,24 +16,24 @@ public: ~WaSkinManager(); k_dcop: - QStringList availableSkins(); - QString currentSkin(); - bool loadSkin(QString skinName); + TQStringList availableSkins(); + TQString currentSkin(); + bool loadSkin(TQString skinName); - QString defaultSkin(); + TQString defaultSkin(); - bool installSkin(QString url); + bool installSkin(TQString url); - bool skinRemovable(QString skinName); - bool removeSkin(QString skinName); + bool skinRemovable(TQString skinName); + bool removeSkin(TQString skinName); - QStringList skinMimeTypes(); + TQStringList skinMimeTypes(); signals: void updateSkinList(); private: - QString mCurrentSkin; + TQString mCurrentSkin; }; #endif diff --git a/noatun/modules/winskin/waSkinModel.cpp b/noatun/modules/winskin/waSkinModel.cpp index ff53b4e6..bbe20a39 100644 --- a/noatun/modules/winskin/waSkinModel.cpp +++ b/noatun/modules/winskin/waSkinModel.cpp @@ -13,9 +13,9 @@ #include <config.h> -#include <qdir.h> -#include <qstringlist.h> -#include <qbitmap.h> +#include <tqdir.h> +#include <tqstringlist.h> +#include <tqbitmap.h> #include <kdebug.h> #include <kstandarddirs.h> @@ -39,7 +39,7 @@ int digit_height; struct WaPixmapEntry { const char *filename; - QPixmap *pixmap; + TQPixmap *pixmap; }; WaPixmapEntry waPixmapEntries[11] = { @@ -74,15 +74,15 @@ WaSkinModel::~WaSkinModel() delete colorScheme; } -bool WaSkinModel::load(QString skinDir) +bool WaSkinModel::load(TQString skinDir) { bool success = true; - QDir dir(skinDir); + TQDir dir(skinDir); if (findFile(dir, "main.bmp").isEmpty()) { // Ack, our skin dir doesn't exist, fall back to the default - dir = QDir(KGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + WaSkin::defaultSkin())[0]); + dir = TQDir(KGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + WaSkin::defaultSkin())[0]); success = false; } @@ -105,27 +105,27 @@ bool WaSkinModel::load(QString skinDir) // Filename -must- be lowercase, which is an nice optimization, since // this is a private API, and all our filenames are internally lowercase // anyway -QString WaSkinModel::findFile(const QDir &dir, const QString &filename) { - QFileInfo fileInfo; - QString ret = ""; +TQString WaSkinModel::findFile(const TQDir &dir, const TQString &filename) { + TQFileInfo fileInfo; + TQString ret = ""; - QStringList strList = dir.entryList(); + TQStringList strList = dir.entryList(); - for (QStringList::iterator file = strList.begin(); file != strList.end(); file++) { - QFileInfo fileInfo(*file); + for (TQStringList::iterator file = strList.begin(); file != strList.end(); file++) { + TQFileInfo fileInfo(*file); if (fileInfo.isDir()) continue; if (fileInfo.filePath().lower() == filename) - return dir.absPath() + "/" + QString(fileInfo.filePath()); + return dir.absPath() + "/" + TQString(fileInfo.filePath()); } return ""; } -void WaSkinModel::loadColors(const QDir &dir) { - QString colorFile = findFile(dir, "viscolor.txt"); +void WaSkinModel::loadColors(const TQDir &dir) { + TQString colorFile = findFile(dir, "viscolor.txt"); if (colorScheme) { delete colorScheme; @@ -134,8 +134,8 @@ void WaSkinModel::loadColors(const QDir &dir) { colorScheme = new WaColor(colorFile); } -void WaSkinModel::loadRegion(const QDir &dir) { - QString regionFile = findFile(dir, "region.txt"); +void WaSkinModel::loadRegion(const TQDir &dir) { + TQString regionFile = findFile(dir, "region.txt"); if (windowRegion) { delete windowRegion; @@ -145,12 +145,12 @@ void WaSkinModel::loadRegion(const QDir &dir) { windowRegion = new WaRegion(regionFile); } -int WaSkinModel::getPixmap(const QDir &dir, QString fname, - QPixmap *target) +int WaSkinModel::getPixmap(const TQDir &dir, TQString fname, + TQPixmap *target) { - QFileInfo fileInfo; - QStringList strList = dir.entryList(); - QString abspath; + TQFileInfo fileInfo; + TQStringList strList = dir.entryList(); + TQString abspath; abspath = findFile(dir, fname); @@ -161,46 +161,46 @@ int WaSkinModel::getPixmap(const QDir &dir, QString fname, // now the filename mapping 1.8x -> 2.0 if (fname == "volume.bmp") - return WaSkinModel::getPixmap(dir, QString("volbar.bmp"), target); + return WaSkinModel::getPixmap(dir, TQString("volbar.bmp"), target); if (fname == "numbers.bmp") - return WaSkinModel::getPixmap(dir, QString("nums_ex.bmp"), target); + return WaSkinModel::getPixmap(dir, TQString("nums_ex.bmp"), target); // Even 2.x themes can omit BALANCE, in which case we use VOLUME if (fname == "balance.bmp") - return WaSkinModel::getPixmap(dir, QString("volume.bmp"), target); + return WaSkinModel::getPixmap(dir, TQString("volume.bmp"), target); return false; } -QRect WaSkinModel::getGeometry(int id) { +TQRect WaSkinModel::getGeometry(int id) { if ( (id < 0) || (id >= _WA_SKIN_ENTRIES) ) { kdDebug() << "Array index out of range. WaSkinModel::getGeometry"<<endl; exit(-1); } - return QRect(mapFromFile[id].x, mapFromFile[id].y, + return TQRect(mapFromFile[id].x, mapFromFile[id].y, mapFromFile[id].width, mapFromFile[id].height); } -QRect WaSkinModel::getMapGeometry(int id) { +TQRect WaSkinModel::getMapGeometry(int id) { if ( (id < 0) || (id >= _WA_MAPPING_ENTRIES) ) { kdDebug() << "Array index out of range. WaSkinModel::getMapGeometry"<<endl; exit(-1); } - return QRect(mapToGui[id].x, mapToGui[id].y, + return TQRect(mapToGui[id].x, mapToGui[id].y, mapToGui[id].width, mapToGui[id].height); } -void WaSkinModel::bltTo(int id, QPaintDevice *dest, int x, int y) { +void WaSkinModel::bltTo(int id, TQPaintDevice *dest, int x, int y) { bitBlt(dest, x, y, waPixmapEntries[mapFromFile[id].fileId].pixmap, mapFromFile[id].x, mapFromFile[id].y, mapFromFile[id].width, mapFromFile[id].height); } -void WaSkinModel::bltTo(int id, QPaintDevice *dest, int x, int y, int argument) { +void WaSkinModel::bltTo(int id, TQPaintDevice *dest, int x, int y, int argument) { if (id == _WA_SKIN_VOLUME_BAR) { - QPixmap *pix = waPixmapEntries[_WA_FILE_VOLUME].pixmap; + TQPixmap *pix = waPixmapEntries[_WA_FILE_VOLUME].pixmap; int nBar = int((float)argument * 27.0 / 100.0); bitBlt(dest, x, y, pix, 0, 15 * nBar, 68, 13); @@ -209,7 +209,7 @@ void WaSkinModel::bltTo(int id, QPaintDevice *dest, int x, int y, int argument) } if (id == _WA_SKIN_BALANCE_BAR) { - QPixmap *pix = waPixmapEntries[_WA_FILE_BALANCE].pixmap; + TQPixmap *pix = waPixmapEntries[_WA_FILE_BALANCE].pixmap; argument = abs(argument); @@ -222,7 +222,7 @@ void WaSkinModel::bltTo(int id, QPaintDevice *dest, int x, int y, int argument) bltTo(id, dest, x, y); } -void WaSkinModel::getDigit(char number, QPaintDevice *dest, int x, int y) { +void WaSkinModel::getDigit(char number, TQPaintDevice *dest, int x, int y) { if (number=='-') { bltTo(_WA_SKIN_NUMBERS_MINUS, dest, x, y); return; @@ -235,7 +235,7 @@ void WaSkinModel::getDigit(char number, QPaintDevice *dest, int x, int y) { } // number - QPixmap *pix = waPixmapEntries[mapFromFile[_WA_SKIN_NUMBERS].fileId].pixmap; + TQPixmap *pix = waPixmapEntries[mapFromFile[_WA_SKIN_NUMBERS].fileId].pixmap; // ordinary number: int index = number - '0'; @@ -247,8 +247,8 @@ void WaSkinModel::getDigit(char number, QPaintDevice *dest, int x, int y) { return; } -void WaSkinModel::getText(char text, QPaintDevice * dest, int x, int y) { - QPixmap *pix = waPixmapEntries[_WA_FILE_TEXT].pixmap; +void WaSkinModel::getText(char text, TQPaintDevice * dest, int x, int y) { + TQPixmap *pix = waPixmapEntries[_WA_FILE_TEXT].pixmap; text = deaccent(text); @@ -378,11 +378,11 @@ void WaSkinModel::getText(char text, QPaintDevice * dest, int x, int y) { bitBlt(dest, x, y,pix,(10*5),12,5,6); } -void WaSkinModel::paintBackgroundTo(int mapping, QPaintDevice *dest, int x, int y) +void WaSkinModel::paintBackgroundTo(int mapping, TQPaintDevice *dest, int x, int y) { - QPixmap *pix = waPixmapEntries[mapFromFile[_WA_SKIN_MAIN].fileId].pixmap; - QRect main_rect = getGeometry(_WA_SKIN_MAIN); - QRect dest_rect = getMapGeometry(mapping); + TQPixmap *pix = waPixmapEntries[mapFromFile[_WA_SKIN_MAIN].fileId].pixmap; + TQRect main_rect = getGeometry(_WA_SKIN_MAIN); + TQRect dest_rect = getMapGeometry(mapping); int source_x = main_rect.x() + dest_rect.x() + x; int source_y = main_rect.y() + dest_rect.y() + y; @@ -418,38 +418,38 @@ void WaSkinModel::resetSkinModel() { } -QChar WaSkinModel::deaccent(QChar input) { - if (QString("Á").contains(input)) +TQChar WaSkinModel::deaccent(TQChar input) { + if (TQString("Á").contains(input)) return 'A'; - if (QString("ÉË").contains(input)) + if (TQString("ÉË").contains(input)) return 'E'; - if (QString("ÍÎ").contains(input)) + if (TQString("ÍÎ").contains(input)) return 'I'; - if (QString("ÔÓ").contains(input)) + if (TQString("ÔÓ").contains(input)) return 'O'; - if (QString("ÚÜ").contains(input)) + if (TQString("ÚÜ").contains(input)) return 'U'; if (input == 'Ý') return 'Y'; - if (QString("áâ").contains(input)) + if (TQString("áâ").contains(input)) return 'a'; - if (QString("éë").contains(input)) + if (TQString("éë").contains(input)) return 'e'; - if (QString("îí").contains(input)) + if (TQString("îí").contains(input)) return 'i'; - if (QString("ôó").contains(input)) + if (TQString("ôó").contains(input)) return 'o'; - if (QString("úü").contains(input)) + if (TQString("úü").contains(input)) return 'u'; return input; diff --git a/noatun/modules/winskin/waSkinModel.h b/noatun/modules/winskin/waSkinModel.h index 9447f8ae..bc3e83c1 100644 --- a/noatun/modules/winskin/waSkinModel.h +++ b/noatun/modules/winskin/waSkinModel.h @@ -13,9 +13,9 @@ #ifndef __WASKINMODEL_H #define __WASKINMODEL_H -#include <qstring.h> -#include <qobject.h> -#include <qdir.h> +#include <tqstring.h> +#include <tqobject.h> +#include <tqdir.h> #include "waSkins.h" @@ -25,25 +25,25 @@ class QChar; class WaSkinModel; extern WaSkinModel *_waskinmodel_instance; -class WaSkinModel : public QObject { +class WaSkinModel : public TQObject { Q_OBJECT public: WaSkinModel(); ~WaSkinModel(); - void getDigit(char number, QPaintDevice *dest, int x, int y); - void getText(char text, QPaintDevice *dest, int x, int y); + void getDigit(char number, TQPaintDevice *dest, int x, int y); + void getText(char text, TQPaintDevice *dest, int x, int y); - void bltTo(int id, QPaintDevice *dest, int x, int y); - void bltTo(int id, QPaintDevice *dest, int x, int y, int argument); + void bltTo(int id, TQPaintDevice *dest, int x, int y); + void bltTo(int id, TQPaintDevice *dest, int x, int y, int argument); - void paintBackgroundTo(int mapping, QPaintDevice *dest, int x, int y); + void paintBackgroundTo(int mapping, TQPaintDevice *dest, int x, int y); - QRect getGeometry(int id); - QRect getMapGeometry(int id); + TQRect getGeometry(int id); + TQRect getMapGeometry(int id); - bool load(QString skinDir); + bool load(TQString skinDir); void setSkinModel(skin_models new_model); static WaSkinModel *instance() { return _waskinmodel_instance; } @@ -51,12 +51,12 @@ class WaSkinModel : public QObject { private: void resetSkinModel(); - QString findFile(const QDir &dir, const QString &filename); - QChar deaccent(QChar input); + TQString findFile(const TQDir &dir, const TQString &filename); + TQChar deaccent(TQChar input); - int getPixmap(const QDir &dir, QString fname, QPixmap * target); - void loadColors(const QDir &dir); - void loadRegion(const QDir &dir); + int getPixmap(const TQDir &dir, TQString fname, TQPixmap * target); + void loadColors(const TQDir &dir); + void loadRegion(const TQDir &dir); signals: void skinChanged(); diff --git a/noatun/modules/winskin/waSlider.cpp b/noatun/modules/winskin/waSlider.cpp index 4fff1b0d..99e52402 100644 --- a/noatun/modules/winskin/waSlider.cpp +++ b/noatun/modules/winskin/waSlider.cpp @@ -44,7 +44,7 @@ void WaSlider::setPixmapSliderBar(int pixId) update(); } -void WaSlider::paintEvent(QPaintEvent *) +void WaSlider::paintEvent(TQPaintEvent *) { // POSBAR.BMP does not have full height in all Winamp skins // Paint background before painting slider to be on the safe side @@ -58,7 +58,7 @@ void WaSlider::paintEvent(QPaintEvent *) } -void WaSlider::mouseMoveEvent(QMouseEvent * e) +void WaSlider::mouseMoveEvent(TQMouseEvent * e) { if (lDragging == false) { WaWidget::mouseMoveEvent(e); @@ -70,7 +70,7 @@ void WaSlider::mouseMoveEvent(QMouseEvent * e) if (newX < 0) newX = 0; - QSize size = sizeHint(); + TQSize size = sizeHint(); int maxX = size.width() - slider_width; @@ -101,7 +101,7 @@ void WaSlider::updateSliderPos(int value) update(); } -void WaSlider::mousePressEvent(QMouseEvent *e) { +void WaSlider::mousePressEvent(TQMouseEvent *e) { if (e->button() != LeftButton && e->button() != MidButton) { WaWidget::mousePressEvent(e); return; @@ -127,7 +127,7 @@ void WaSlider::mousePressEvent(QMouseEvent *e) { emit(sliderPressed()); } -void WaSlider::mouseReleaseEvent(QMouseEvent *e) +void WaSlider::mouseReleaseEvent(TQMouseEvent *e) { if (!lDragging) { WaWidget::mouseReleaseEvent(e); @@ -143,7 +143,7 @@ void WaSlider::mouseReleaseEvent(QMouseEvent *e) int WaSlider::pixel2Value(int xpos) { - QSize size = sizeHint(); + TQSize size = sizeHint(); int min = abs(minValue); int max = abs(maxValue); @@ -158,7 +158,7 @@ int WaSlider::pixel2Value(int xpos) int WaSlider::value2Pixel(int value) { - QSize size = sizeHint(); + TQSize size = sizeHint(); float min = (float) minValue; float max = (float) maxValue; float fmin = min; diff --git a/noatun/modules/winskin/waSlider.h b/noatun/modules/winskin/waSlider.h index 0003afd2..47630a6c 100644 --- a/noatun/modules/winskin/waSlider.h +++ b/noatun/modules/winskin/waSlider.h @@ -16,7 +16,7 @@ #ifndef __WASLIDER_H #define __WASLIDER_H -#include <qpainter.h> +#include <tqpainter.h> #include "waWidget.h" #include "waButton.h" @@ -44,7 +44,7 @@ class WaSlider : public WaWidget { void setPixmapSliderBar(int pixId); private: - void paintEvent(QPaintEvent *); + void paintEvent(TQPaintEvent *); int pixel2Value(int xpos); int value2Pixel(int value); @@ -60,16 +60,16 @@ class WaSlider : public WaWidget { int sliderBarMapId; bool lDragging; - QPoint pressPoint; + TQPoint pressPoint; int currentValue; int minValue; int maxValue; - void mousePressEvent(QMouseEvent *e); - void mouseMoveEvent(QMouseEvent *e); - void mouseReleaseEvent(QMouseEvent *e); + void mousePressEvent(TQMouseEvent *e); + void mouseMoveEvent(TQMouseEvent *e); + void mouseReleaseEvent(TQMouseEvent *e); private slots: void updateSliderPos(int value); diff --git a/noatun/modules/winskin/waStatus.cpp b/noatun/modules/winskin/waStatus.cpp index e028b7f0..861e8677 100644 --- a/noatun/modules/winskin/waStatus.cpp +++ b/noatun/modules/winskin/waStatus.cpp @@ -23,7 +23,7 @@ WaStatus::~WaStatus() { } -void WaStatus::paintEvent(QPaintEvent *) +void WaStatus::paintEvent(TQPaintEvent *) { if (_status == STATUS_PLAYING) { paintPixmap(_WA_SKIN_PLAYPAUS_WORK_INDICATOR); diff --git a/noatun/modules/winskin/waStatus.h b/noatun/modules/winskin/waStatus.h index a3fe1bc8..e67054df 100644 --- a/noatun/modules/winskin/waStatus.h +++ b/noatun/modules/winskin/waStatus.h @@ -16,7 +16,7 @@ #ifndef __WASTATUS_H #define __WASTATUS_H -#include <qpainter.h> +#include <tqpainter.h> #include "waWidget.h" @@ -33,7 +33,7 @@ class WaStatus : public WaWidget { status_enum status() const { return _status; } private: - void paintEvent(QPaintEvent * paintEvent); + void paintEvent(TQPaintEvent * paintEvent); status_enum _status; }; diff --git a/noatun/modules/winskin/waTitleBar.cpp b/noatun/modules/winskin/waTitleBar.cpp index 82b603f5..bba7386e 100644 --- a/noatun/modules/winskin/waTitleBar.cpp +++ b/noatun/modules/winskin/waTitleBar.cpp @@ -12,8 +12,8 @@ */ -#include <qwidget.h> -#include <qpixmap.h> +#include <tqwidget.h> +#include <tqpixmap.h> #include "waTitleBar.h" #include "waSkinModel.h" @@ -32,7 +32,7 @@ WaTitleBar::~WaTitleBar() { } -void WaTitleBar::mousePressEvent(QMouseEvent * e) +void WaTitleBar::mousePressEvent(TQMouseEvent * e) { if (e->button() != RightButton) { if (!moving) { @@ -49,11 +49,11 @@ void WaTitleBar::mousePressEvent(QMouseEvent * e) WaWidget::mousePressEvent(e); } -void WaTitleBar::mouseDoubleClickEvent(QMouseEvent *) { +void WaTitleBar::mouseDoubleClickEvent(TQMouseEvent *) { emit(shaded()); } -void WaTitleBar::mouseReleaseEvent(QMouseEvent * e) +void WaTitleBar::mouseReleaseEvent(TQMouseEvent * e) { if (e->button() != RightButton) { moving = false; @@ -64,9 +64,9 @@ void WaTitleBar::mouseReleaseEvent(QMouseEvent * e) WaWidget::mouseReleaseEvent(e); } -void WaTitleBar::mouseMoveEvent(QMouseEvent * e) +void WaTitleBar::mouseMoveEvent(TQMouseEvent * e) { - QPoint diff = e->globalPos() - mLastPos; + TQPoint diff = e->globalPos() - mLastPos; if (abs(diff.x()) > 10 || abs(diff.y()) > 10) { // Moving starts only, when passing a drag border moving = true; diff --git a/noatun/modules/winskin/waTitleBar.h b/noatun/modules/winskin/waTitleBar.h index 4e001394..30bfe29a 100644 --- a/noatun/modules/winskin/waTitleBar.h +++ b/noatun/modules/winskin/waTitleBar.h @@ -16,7 +16,7 @@ #ifndef __WATITLEBAR_H #define __WATITLEBAR_H -#include <qpainter.h> +#include <tqpainter.h> #include "waIndicator.h" @@ -35,14 +35,14 @@ class WaTitleBar : public WaIndicator { ~WaTitleBar(); private: - void mouseDoubleClickEvent (QMouseEvent * e); - void mousePressEvent(QMouseEvent * e); - void mouseReleaseEvent(QMouseEvent * e); - void mouseMoveEvent(QMouseEvent * e); + void mouseDoubleClickEvent (TQMouseEvent * e); + void mousePressEvent(TQMouseEvent * e); + void mouseReleaseEvent(TQMouseEvent * e); + void mouseMoveEvent(TQMouseEvent * e); bool moving; - QPoint mLastPos; - QPoint mDragStart; + TQPoint mLastPos; + TQPoint mDragStart; signals: void shaded(); diff --git a/noatun/modules/winskin/waVolumeSlider.cpp b/noatun/modules/winskin/waVolumeSlider.cpp index d0a934d7..f61e22f1 100644 --- a/noatun/modules/winskin/waVolumeSlider.cpp +++ b/noatun/modules/winskin/waVolumeSlider.cpp @@ -33,10 +33,10 @@ void WaVolumeSlider::buildGui() ws->setPixmapSliderButtonDown(_WA_SKIN_VOLUME_SLIDER_PRES); ws->setPixmapSliderBar(_WA_SKIN_VOLUME_BAR); - connect(ws, SIGNAL(valueChanged(int)), this, - SIGNAL(volumeSetValue(int))); - connect(ws, SIGNAL(sliderPressed()), SIGNAL(sliderPressed())); - connect(ws, SIGNAL(sliderReleased()), SIGNAL(sliderReleased())); + connect(ws, TQT_SIGNAL(valueChanged(int)), this, + TQT_SIGNAL(volumeSetValue(int))); + connect(ws, TQT_SIGNAL(sliderPressed()), TQT_SIGNAL(sliderPressed())); + connect(ws, TQT_SIGNAL(sliderReleased()), TQT_SIGNAL(sliderReleased())); } void WaVolumeSlider::setVolumeValue(int val) diff --git a/noatun/modules/winskin/waWidget.cpp b/noatun/modules/winskin/waWidget.cpp index ffe2d3b4..a93537b9 100644 --- a/noatun/modules/winskin/waWidget.cpp +++ b/noatun/modules/winskin/waWidget.cpp @@ -3,10 +3,10 @@ #include "noatun/stdaction.h" #include "waSkin.h" -WaWidget::WaWidget(int _mapping) : QWidget(WaSkin::instance()) { +WaWidget::WaWidget(int _mapping) : TQWidget(WaSkin::instance()) { mapping = _mapping; setBackgroundMode(NoBackground); - connect (WaSkinModel::instance(), SIGNAL(skinChanged()), this, SLOT(skinChanged())); + connect (WaSkinModel::instance(), TQT_SIGNAL(skinChanged()), this, TQT_SLOT(skinChanged())); } WaWidget::~WaWidget() { @@ -41,11 +41,11 @@ void WaWidget::paintPixmap(int pixmap_mapping, int argument, int x, int y) { WaSkinModel::instance()->paintBackgroundTo(mapping, this, x, y); } -QSize WaWidget::sizeHint() { +TQSize WaWidget::sizeHint() { return WaSkinModel::instance()->getMapGeometry(mapping).size(); } -void WaWidget::mousePressEvent(QMouseEvent *e) { +void WaWidget::mousePressEvent(TQMouseEvent *e) { if (e->button() == RightButton) NoatunStdAction::ContextMenu::showContextMenu(); } diff --git a/noatun/modules/winskin/waWidget.h b/noatun/modules/winskin/waWidget.h index f2a41c82..076d0a5c 100644 --- a/noatun/modules/winskin/waWidget.h +++ b/noatun/modules/winskin/waWidget.h @@ -1,16 +1,16 @@ #ifndef _WAWIDGET_H #define _WAWIDGET_H -#include <qwidget.h> +#include <tqwidget.h> #include "waSkinModel.h" -class WaWidget : public QWidget { +class WaWidget : public TQWidget { Q_OBJECT public: WaWidget(int mapping); virtual ~WaWidget(); - QSize sizeHint(); + TQSize sizeHint(); void paintPixmap(int wa_mapping); void paintPixmap(int wa_mapping, int number); @@ -21,7 +21,7 @@ public: void paintBackground() { WaSkinModel::instance()->paintBackgroundTo(mapping, this, 0, 0); } protected: - void mousePressEvent(QMouseEvent *); + void mousePressEvent(TQMouseEvent *); int mapping; private slots: diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp index 649fd1fe..07352c7b 100644 --- a/noatun/modules/winskin/winSkinConfig.cpp +++ b/noatun/modules/winskin/winSkinConfig.cpp @@ -1,77 +1,77 @@ #include <noatun/pref.h> #include <klocale.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qpixmap.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqpixmap.h> #include <kglobal.h> #include <kconfig.h> -#include <qslider.h> -#include <qframe.h> -#include <qstringlist.h> +#include <tqslider.h> +#include <tqframe.h> +#include <tqstringlist.h> #include <kfile.h> #include <kfiledialog.h> #include <kmessagebox.h> #include <kstandarddirs.h> #include <kurlrequester.h> #include <kurlrequesterdlg.h> -#include <qdir.h> +#include <tqdir.h> #include "waSkin.h" #include "waInfo.h" #include "waSkinManager.h" #include "winSkinConfig.h" -WinSkinConfig::WinSkinConfig(QWidget * parent, WaSkinManager *waSkinManager) : +WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) : CModule(i18n("Winskin"), i18n("Skin Selection for the Winskin Plugin"), "style", parent) { // Make a token horizontal layout box - vbox = new QVBoxLayout(this); + vbox = new TQVBoxLayout(this); vbox->setSpacing( 6 ); vbox->setMargin( 0 ); // Add a simple list of skins, populated in WinSkinConfig::reopen() - skin_list = new QListBox(this, "skin_list"); + skin_list = new TQListBox(this, "skin_list"); vbox->addWidget(skin_list); - QHBoxLayout* hbox = new QHBoxLayout( 0, 6, 6 ); + TQHBoxLayout* hbox = new TQHBoxLayout( 0, 6, 6 ); - QPushButton* buttonInstall = new QPushButton( i18n("&Install New Skin..."), this ); + TQPushButton* buttonInstall = new TQPushButton( i18n("&Install New Skin..."), this ); hbox->addWidget(buttonInstall); - buttonRemove = new QPushButton( i18n("&Remove Skin"), this ); + buttonRemove = new TQPushButton( i18n("&Remove Skin"), this ); buttonRemove->setEnabled(false); hbox->addWidget(buttonRemove); vbox->addLayout(hbox); - connect( skin_list, SIGNAL(highlighted(const QString &)), this, SLOT(selected())); - connect( buttonInstall, SIGNAL(clicked()), this, SLOT(install())); - connect( buttonRemove, SIGNAL(clicked()), this, SLOT(remove())); - connect(waSkinManager, SIGNAL(updateSkinList()), this, SLOT(reopen())); + connect( skin_list, TQT_SIGNAL(highlighted(const TQString &)), this, TQT_SLOT(selected())); + connect( buttonInstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(install())); + connect( buttonRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(remove())); + connect(waSkinManager, TQT_SIGNAL(updateSkinList()), this, TQT_SLOT(reopen())); mWaSkinManager = waSkinManager; - QGroupBox *settingsBox = new QGroupBox( 1, Vertical, i18n("Settings"), this ); + TQGroupBox *settingsBox = new TQGroupBox( 1, Vertical, i18n("Settings"), this ); vbox->addWidget(settingsBox); - QHBox *box = new QHBox(settingsBox); - QLabel *label = new QLabel(i18n("T&itle scrolling speed:"), box); - new QLabel(i18n("None"), box); + TQHBox *box = new TQHBox(settingsBox); + TQLabel *label = new TQLabel(i18n("T&itle scrolling speed:"), box); + new TQLabel(i18n("None"), box); - scrollSpeed = new QSlider(box); + scrollSpeed = new TQSlider(box); label->setBuddy(scrollSpeed); - scrollSpeed->setMinimumSize( QSize( 80, 0 ) ); + scrollSpeed->setMinimumSize( TQSize( 80, 0 ) ); scrollSpeed->setMinValue( 0 ); scrollSpeed->setMaxValue( 50 ); scrollSpeed->setPageStep( 1 ); - scrollSpeed->setOrientation( QSlider::Horizontal ); - scrollSpeed->setTickmarks( QSlider::NoMarks ); + scrollSpeed->setOrientation( TQSlider::Horizontal ); + scrollSpeed->setTickmarks( TQSlider::NoMarks ); - label = new QLabel(i18n("Fast"), box); + label = new TQLabel(i18n("Fast"), box); reopen(); } @@ -99,7 +99,7 @@ void WinSkinConfig::reopen() { skin_list->clear(); // Get a list of skins - QStringList skins = mWaSkinManager->availableSkins(); + TQStringList skins = mWaSkinManager->availableSkins(); // This loop adds them all to our skin list for(unsigned int x = 0;x < skins.count();x++) { @@ -108,10 +108,10 @@ void WinSkinConfig::reopen() { } // Figure out our current skin - QString orig_skin = mWaSkinManager->currentSkin(); + TQString orig_skin = mWaSkinManager->currentSkin(); // Where is that skin in our big-list-o-skins? - QListBoxItem *item = skin_list->findItem(orig_skin); + TQListBoxItem *item = skin_list->findItem(orig_skin); if (item) { // Aha, found it... make it the currently selected skin @@ -135,14 +135,14 @@ void WinSkinConfig::selected() void WinSkinConfig::install() { - QString url; + TQString url; // Ask the user for directory containing a skin - KURLRequesterDlg* udlg = new KURLRequesterDlg( QString::null, this, "udlg", true ); + KURLRequesterDlg* udlg = new KURLRequesterDlg( TQString::null, this, "udlg", true ); udlg->urlRequester()->setFilter(mWaSkinManager->skinMimeTypes().join(" ")); udlg->urlRequester()->setMode( KFile::File | KFile::Directory | KFile::ExistingOnly ); - if( udlg->exec() == QDialog::Accepted ) { + if( udlg->exec() == TQDialog::Accepted ) { url = udlg->urlRequester()->url(); mWaSkinManager->installSkin( url ); } @@ -163,7 +163,7 @@ void WinSkinConfig::remove() // Ask the user first if( KMessageBox::warningContinueCancel( this, - i18n("<qt>Are you sure you want to remove the <b>%1</b> skin?</qt>").arg( skin_list->currentText() ), QString::null, KStdGuiItem::del() ) + i18n("<qt>Are you sure you want to remove the <b>%1</b> skin?</qt>").arg( skin_list->currentText() ), TQString::null, KStdGuiItem::del() ) == KMessageBox::Continue ) { mWaSkinManager->removeSkin( skin_list->currentText() ); diff --git a/noatun/modules/winskin/winSkinConfig.h b/noatun/modules/winskin/winSkinConfig.h index 22dca884..0aabb1f5 100644 --- a/noatun/modules/winskin/winSkinConfig.h +++ b/noatun/modules/winskin/winSkinConfig.h @@ -2,7 +2,7 @@ #define __WINSKINCONFIG_H #include <noatun/pref.h> -#include <qwidget.h> +#include <tqwidget.h> class QVBoxLayout; class WaSkinManager; @@ -11,7 +11,7 @@ class QSlider; class WinSkinConfig:public CModule { Q_OBJECT public: - WinSkinConfig(QWidget * parent, WaSkinManager *waManager); + WinSkinConfig(TQWidget * parent, WaSkinManager *waManager); void save(); @@ -25,11 +25,11 @@ class WinSkinConfig:public CModule { private: WaSkinManager *mWaSkinManager; - QListBox *skin_list; - QString orig_skin; - QVBoxLayout *vbox; - QPushButton *buttonRemove; - QSlider *scrollSpeed; + TQListBox *skin_list; + TQString orig_skin; + TQVBoxLayout *vbox; + TQPushButton *buttonRemove; + TQSlider *scrollSpeed; }; #endif diff --git a/noatun/modules/winskin/winSkinVis.cpp b/noatun/modules/winskin/winSkinVis.cpp index f9937981..8ec025d2 100644 --- a/noatun/modules/winskin/winSkinVis.cpp +++ b/noatun/modules/winskin/winSkinVis.cpp @@ -17,8 +17,8 @@ #define __BANDS 75 #define __SPAHEIGHT 15 -WinSkinVis::WinSkinVis(QObject *parent, const char *name): - QObject(parent,name),Visualization(50) { +WinSkinVis::WinSkinVis(TQObject *parent, const char *name): + TQObject(parent,name),Visualization(50) { m_currentPeaks=new float[__BANDS]; diff --git a/noatun/modules/winskin/winSkinVis.h b/noatun/modules/winskin/winSkinVis.h index 7d139d0c..51c33205 100644 --- a/noatun/modules/winskin/winSkinVis.h +++ b/noatun/modules/winskin/winSkinVis.h @@ -14,7 +14,7 @@ #ifndef __WINSKINVIS_H #define __WINSKINVIS_H -#include <qobject.h> +#include <tqobject.h> // These are needed for the Visualisation class #include <soundserver.h> @@ -23,11 +23,11 @@ #include "vis/winskinvis.h" -class WinSkinVis : public QObject, public Visualization { +class WinSkinVis : public TQObject, public Visualization { Q_OBJECT public: - WinSkinVis(QObject* parent,const char* name); + WinSkinVis(TQObject* parent,const char* name); ~WinSkinVis(); /** |