summaryrefslogtreecommitdiffstats
path: root/noatun/modules/winskin
diff options
context:
space:
mode:
Diffstat (limited to 'noatun/modules/winskin')
-rw-r--r--noatun/modules/winskin/waInfo.cpp10
-rw-r--r--noatun/modules/winskin/waLabel.cpp2
-rw-r--r--noatun/modules/winskin/waSkin.cpp26
-rw-r--r--noatun/modules/winskin/waSkin.h6
-rw-r--r--noatun/modules/winskin/waSlider.cpp6
-rw-r--r--noatun/modules/winskin/waStatus.cpp6
-rw-r--r--noatun/modules/winskin/waStatus.h8
-rw-r--r--noatun/modules/winskin/waWidget.cpp2
-rw-r--r--noatun/modules/winskin/waWidget.h2
-rw-r--r--noatun/modules/winskin/winSkinConfig.cpp6
10 files changed, 37 insertions, 37 deletions
diff --git a/noatun/modules/winskin/waInfo.cpp b/noatun/modules/winskin/waInfo.cpp
index 5f670953..fb923994 100644
--- a/noatun/modules/winskin/waInfo.cpp
+++ b/noatun/modules/winskin/waInfo.cpp
@@ -30,7 +30,7 @@ WaInfo::WaInfo() : WaWidget(_WA_MAPPING_INFO)
completePixmap = new TQPixmap();
- TQSize size = sizeHint();
+ TQSize size = tqsizeHint();
completePixmap->resize(size.width(), size.height());
xGrabbedPos = -1;
@@ -55,7 +55,7 @@ void WaInfo::timeEvent()
}
if (isVisible())
- repaint(false);
+ tqrepaint(false);
}
}
@@ -65,7 +65,7 @@ void WaInfo::scrollerSetup()
xScrollPos = 0;
xScrollDirection = 0;
timer->stop();
- TQSize size = sizeHint();
+ TQSize size = tqsizeHint();
if (completePixmap->width() > size.width()) {
xScrollDirection = 1;
@@ -79,7 +79,7 @@ void WaInfo::scrollerSetup()
void WaInfo::paintEvent(TQPaintEvent *)
{
- TQSize size = sizeHint();
+ TQSize size = tqsizeHint();
if (completePixmap->width() <= size.width()) {
bitBlt(this, 0, 0, completePixmap);
@@ -127,7 +127,7 @@ void WaInfo::pixmapChange()
int x = 0;
int n=infoString ? strlen(infoString) : 0;
- TQSize size = sizeHint();
+ TQSize size = tqsizeHint();
completePixmap->resize(TQMAX(n * _WA_TEXT_WIDTH, size.width()), _WA_TEXT_HEIGHT);
diff --git a/noatun/modules/winskin/waLabel.cpp b/noatun/modules/winskin/waLabel.cpp
index 71f2baa2..bb16d118 100644
--- a/noatun/modules/winskin/waLabel.cpp
+++ b/noatun/modules/winskin/waLabel.cpp
@@ -24,7 +24,7 @@ WaLabel::WaLabel(int mapping) : WaWidget(mapping)
completePixmap = new TQPixmap();
- TQSize size = sizeHint();
+ TQSize size = tqsizeHint();
completePixmap->resize(size.width(), size.height());
}
diff --git a/noatun/modules/winskin/waSkin.cpp b/noatun/modules/winskin/waSkin.cpp
index fdf2e768..e4770b7f 100644
--- a/noatun/modules/winskin/waSkin.cpp
+++ b/noatun/modules/winskin/waSkin.cpp
@@ -72,8 +72,8 @@ WaSkin::WaSkin() : TQWidget(0, "NoatunWinampSkin"), UserInterface()
createHighLevelElements();
createButtons();
- setMinimumSize(sizeHint());
- setMaximumSize(sizeHint());
+ setMinimumSize(tqsizeHint());
+ setMaximumSize(tqsizeHint());
KWin::setType(this->winId(), NET::Override);
setBackgroundMode(NoBackground);
@@ -142,7 +142,7 @@ void WaSkin::loadSkin(TQString newSkinDir)
{
waSkinManager->loadSkin(newSkinDir);
- setMinimumSize(sizeHint());
+ setMinimumSize(tqsizeHint());
if (title_shaded) {
// waSkinModel::load() resets our skin model :(
@@ -154,7 +154,7 @@ void WaSkin::loadSkin(TQString newSkinDir)
}
}
-TQSize WaSkin::sizeHint() const
+TQSize WaSkin::tqsizeHint() const
{
TQRect temp_rect;
@@ -305,7 +305,7 @@ void WaSkin::createHighLevelElements()
waInfo = new WaInfo();
- waStatus = new WaStatus();
+ watqStatus = new WatqStatus();
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);
@@ -337,7 +337,7 @@ void WaSkin::setChannels(int val)
void WaSkin::shade() {
waSkinModel->setSkinModel(WA_MODEL_WINDOWSHADE);
- setMinimumSize(sizeHint());
+ setMinimumSize(tqsizeHint());
setMask(*windowRegion->mainWindowShadeMask());
title_shaded = true;
@@ -346,7 +346,7 @@ void WaSkin::shade() {
void WaSkin::unshade() {
waSkinModel->setSkinModel(WA_MODEL_NORMAL);
- setMinimumSize(sizeHint());
+ setMinimumSize(tqsizeHint());
setMask(*windowRegion->mainWindowMask());
title_shaded = false;
@@ -558,9 +558,9 @@ void WaSkin::balanceSetValue(int val)
waInfo->setText(i18n("Balance: Center"));
}
else if (val < 0) {
- waInfo->setText(i18n("Balance: %1% Left").arg(-val));
+ waInfo->setText(i18n("Balance: %1% Left").tqarg(-val));
} else {
- waInfo->setText(i18n("Balance: %1% Right").arg(val));
+ waInfo->setText(i18n("Balance: %1% Right").tqarg(val));
}
}
@@ -672,14 +672,14 @@ void WaSkin::volumeSliderReleased()
void WaSkin::volumeSetValue(int val)
{
if (mVolumePressed)
- waInfo->setText(i18n("Volume: %1%").arg(val));
+ waInfo->setText(i18n("Volume: %1%").tqarg(val));
napp->player()->setVolume(val);
}
void WaSkin::slotPlaying()
{
- waStatus->setStatus(STATUS_PLAYING);
+ watqStatus->settqStatus(STATUS_PLAYING);
if (!napp->playlist()->current()) {
return;
@@ -710,7 +710,7 @@ void WaSkin::slotPlaying()
void WaSkin::slotStopped()
{
- waStatus->setStatus(STATUS_STOPPED);
+ watqStatus->settqStatus(STATUS_STOPPED);
waDigit->setTime("");
@@ -733,7 +733,7 @@ void WaSkin::slotStopped()
void WaSkin::slotPaused()
{
- waStatus->setStatus(STATUS_PAUSED);
+ watqStatus->settqStatus(STATUS_PAUSED);
}
void WaSkin::keyPressEvent(TQKeyEvent *e) {
diff --git a/noatun/modules/winskin/waSkin.h b/noatun/modules/winskin/waSkin.h
index 842a17d7..5c363428 100644
--- a/noatun/modules/winskin/waSkin.h
+++ b/noatun/modules/winskin/waSkin.h
@@ -33,7 +33,7 @@ class WaMain;
class WaIndicator;
class WaTitleBar;
class WaClutterbar;
-class WaStatus;
+class WatqStatus;
class WaJumpSlider;
class WaVolumeSlider;
@@ -60,7 +60,7 @@ class WaSkin : public TQWidget, public UserInterface {
void loadSkin(TQString skinDir);
void setChannels(int val);
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
static TQString defaultSkin();
static WaSkin *instance() { return _waskin_instance; }
@@ -159,7 +159,7 @@ class WaSkin : public TQWidget, public UserInterface {
WaLabel *waFreq;
WaInfo *waInfo;
- WaStatus *waStatus;
+ WatqStatus *watqStatus;
WaIndicator *waStereo;
WaIndicator *waMono;
diff --git a/noatun/modules/winskin/waSlider.cpp b/noatun/modules/winskin/waSlider.cpp
index 8c97c272..3323e7ee 100644
--- a/noatun/modules/winskin/waSlider.cpp
+++ b/noatun/modules/winskin/waSlider.cpp
@@ -70,7 +70,7 @@ void WaSlider::mouseMoveEvent(TQMouseEvent * e)
if (newX < 0)
newX = 0;
- TQSize size = sizeHint();
+ TQSize size = tqsizeHint();
int maxX = size.width() - slider_width;
@@ -143,7 +143,7 @@ void WaSlider::mouseReleaseEvent(TQMouseEvent *e)
int WaSlider::pixel2Value(int xpos)
{
- TQSize size = sizeHint();
+ TQSize size = tqsizeHint();
int min = abs(minValue);
int max = abs(maxValue);
@@ -158,7 +158,7 @@ int WaSlider::pixel2Value(int xpos)
int WaSlider::value2Pixel(int value)
{
- TQSize size = sizeHint();
+ TQSize size = tqsizeHint();
float min = (float) minValue;
float max = (float) maxValue;
float fmin = min;
diff --git a/noatun/modules/winskin/waStatus.cpp b/noatun/modules/winskin/waStatus.cpp
index 861e8677..20f95d92 100644
--- a/noatun/modules/winskin/waStatus.cpp
+++ b/noatun/modules/winskin/waStatus.cpp
@@ -14,16 +14,16 @@
#include "waStatus.h"
#include "waSkinModel.h"
-WaStatus::WaStatus() : WaWidget(_WA_MAPPING_PLAYPAUS)
+WatqStatus::WatqStatus() : WaWidget(_WA_MAPPING_PLAYPAUS)
{
_status = STATUS_STOPPED;
}
-WaStatus::~WaStatus()
+WatqStatus::~WatqStatus()
{
}
-void WaStatus::paintEvent(TQPaintEvent *)
+void WatqStatus::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 3508ddca..e028f318 100644
--- a/noatun/modules/winskin/waStatus.h
+++ b/noatun/modules/winskin/waStatus.h
@@ -22,15 +22,15 @@
enum status_enum {STATUS_PLAYING, STATUS_STOPPED, STATUS_PAUSED};
-class WaStatus : public WaWidget {
+class WatqStatus : public WaWidget {
Q_OBJECT
TQ_OBJECT
public:
- WaStatus();
- ~WaStatus();
+ WatqStatus();
+ ~WatqStatus();
- void setStatus(status_enum status) { _status = status; update(); }
+ void settqStatus(status_enum status) { _status = status; update(); }
status_enum status() const { return _status; }
private:
diff --git a/noatun/modules/winskin/waWidget.cpp b/noatun/modules/winskin/waWidget.cpp
index 4a44f252..0b792c7c 100644
--- a/noatun/modules/winskin/waWidget.cpp
+++ b/noatun/modules/winskin/waWidget.cpp
@@ -41,7 +41,7 @@ void WaWidget::paintPixmap(int pixmap_mapping, int argument, int x, int y) {
WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), x, y);
}
-TQSize WaWidget::sizeHint() {
+TQSize WaWidget::tqsizeHint() {
return WaSkinModel::instance()->getMapGeometry(mapping).size();
}
diff --git a/noatun/modules/winskin/waWidget.h b/noatun/modules/winskin/waWidget.h
index b8b5cb3f..d1fb1d9c 100644
--- a/noatun/modules/winskin/waWidget.h
+++ b/noatun/modules/winskin/waWidget.h
@@ -11,7 +11,7 @@ public:
WaWidget(int mapping);
virtual ~WaWidget();
- TQSize sizeHint();
+ TQSize tqsizeHint();
void paintPixmap(int wa_mapping);
void paintPixmap(int wa_mapping, int number);
diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp
index 0ed05dd4..0cfd7f90 100644
--- a/noatun/modules/winskin/winSkinConfig.cpp
+++ b/noatun/modules/winskin/winSkinConfig.cpp
@@ -2,7 +2,7 @@
#include <klocale.h>
#include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqpixmap.h>
#include <kglobal.h>
@@ -29,7 +29,7 @@ WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) :
"style",
TQT_TQOBJECT(parent))
{
- // Make a token horizontal layout box
+ // Make a token horizontal tqlayout box
vbox = new TQVBoxLayout(this);
vbox->setSpacing( 6 );
vbox->setMargin( 0 );
@@ -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() ), TQString(), KStdGuiItem::del() )
+ i18n("<qt>Are you sure you want to remove the <b>%1</b> skin?</qt>").tqarg( skin_list->currentText() ), TQString(), KStdGuiItem::del() )
== KMessageBox::Continue ) {
mWaSkinManager->removeSkin( skin_list->currentText() );
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 22:40:16 +0000