summaryrefslogtreecommitdiffstats
path: root/noatun/modules/kaiman
diff options
context:
space:
mode:
Diffstat (limited to 'noatun/modules/kaiman')
-rw-r--r--noatun/modules/kaiman/SKIN-SPECS2
-rw-r--r--noatun/modules/kaiman/noatunui.cpp2
-rw-r--r--noatun/modules/kaiman/pref.cpp2
-rw-r--r--noatun/modules/kaiman/pref.h2
-rw-r--r--noatun/modules/kaiman/style.cpp22
-rw-r--r--noatun/modules/kaiman/style.h23
-rw-r--r--noatun/modules/kaiman/userinterface.cpp64
-rw-r--r--noatun/modules/kaiman/userinterface.h2
8 files changed, 59 insertions, 60 deletions
diff --git a/noatun/modules/kaiman/SKIN-SPECS b/noatun/modules/kaiman/SKIN-SPECS
index ae293014..bc3533ad 100644
--- a/noatun/modules/kaiman/SKIN-SPECS
+++ b/noatun/modules/kaiman/SKIN-SPECS
@@ -247,7 +247,7 @@ Digit_Large/Digit_Small_Default: filename
Image file. Contains digits horizontally from 0 to 9, and a blank space.
These two digits are a convenience function, if you want to use a digit more than
- once it is quicker to load it into on of these two Q_SLOTS. Then when using the digit
+ once it is quicker to load it into on of these two slots. Then when using the digit
in the number item type below, use the words 'Large' or 'Small' in place of the
filename.
diff --git a/noatun/modules/kaiman/noatunui.cpp b/noatun/modules/kaiman/noatunui.cpp
index bc1bceb0..6dc2538e 100644
--- a/noatun/modules/kaiman/noatunui.cpp
+++ b/noatun/modules/kaiman/noatunui.cpp
@@ -2,7 +2,7 @@
extern "C"
{
- KDE_EXPORT Plugin *create_plugin()
+ TDE_EXPORT Plugin *create_plugin()
{
return new Kaiman();
}
diff --git a/noatun/modules/kaiman/pref.cpp b/noatun/modules/kaiman/pref.cpp
index 5e2193c7..3464e66f 100644
--- a/noatun/modules/kaiman/pref.cpp
+++ b/noatun/modules/kaiman/pref.cpp
@@ -24,7 +24,7 @@
#include <tqfileinfo.h>
#include <tdeglobal.h>
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeconfig.h>
#include "pref.h"
diff --git a/noatun/modules/kaiman/pref.h b/noatun/modules/kaiman/pref.h
index 50ab3808..6917f879 100644
--- a/noatun/modules/kaiman/pref.h
+++ b/noatun/modules/kaiman/pref.h
@@ -26,7 +26,7 @@ class TQLabel;
class KaimanPrefDlg : public CModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
KaimanPrefDlg( TQObject *parent );
diff --git a/noatun/modules/kaiman/style.cpp b/noatun/modules/kaiman/style.cpp
index a11f569b..ca96c933 100644
--- a/noatun/modules/kaiman/style.cpp
+++ b/noatun/modules/kaiman/style.cpp
@@ -19,7 +19,7 @@
#include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdemessagebox.h>
#include <tqfile.h>
#include <tqtextstream.h>
@@ -160,7 +160,7 @@ void KaimanStyleElement::setPixmap( int num )
if ( num<0 ) num = 0;
_currentPixmap = num;
- repaint( FALSE );
+ repaint( false );
}
}
@@ -646,7 +646,7 @@ KaimanStyleText::KaimanStyleText(TQWidget *parent, const char *name)
_pos = 0;
_timer = new TQTimer( this );
_delay = 500;
- connect( _timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()) );
+ connect( _timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout()) );
}
KaimanStyleText::~KaimanStyleText()
@@ -677,7 +677,7 @@ void KaimanStyleText::startAnimation( int delay )
_pos = 0;
_direction = 1;
_delay = delay;
- _timer->start( _delay, TRUE );
+ _timer->start( _delay, true );
}
@@ -693,7 +693,7 @@ void KaimanStyleText::timeout()
// reflect
if ( _pos+_direction<0 || (int)_value.length()-(_pos+_direction)<digits ) {
_direction = -_direction;
- _timer->start( _delay*5, TRUE );
+ _timer->start( _delay*5, true );
} else {
// check new position
if ( _pos+_direction>=0 && (int)_value.length()-(_pos+_direction)>=digits ) {
@@ -701,7 +701,7 @@ void KaimanStyleText::timeout()
repaint();
}
- _timer->start( _delay, TRUE );
+ _timer->start( _delay, true );
}
@@ -741,7 +741,7 @@ KaimanStyleAnimation::KaimanStyleAnimation(int delay, TQWidget *parent, const ch
_delay = delay;
_frame = 0;
_timer = new TQTimer( this );
- connect( _timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()) );
+ connect( _timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout()) );
}
KaimanStyleAnimation::~KaimanStyleAnimation()
@@ -750,7 +750,7 @@ KaimanStyleAnimation::~KaimanStyleAnimation()
void KaimanStyleAnimation::start()
{
- _timer->start( _delay, FALSE );
+ _timer->start( _delay, false );
}
void KaimanStyleAnimation::pause()
@@ -1400,13 +1400,13 @@ bool KaimanStyle::eventFilter( TQObject *o, TQEvent *e )
TQMouseEvent *m = (TQMouseEvent*)e;
// handle noatun context menu
- if (m->button()==Qt::RightButton) {
+ if (m->button()==TQt::RightButton) {
NoatunStdAction::ContextMenu::showContextMenu();
return true;
}
- TQPoint mousePos( m->x()+TQT_TQWIDGET(o)->x(),
- m->y()+TQT_TQWIDGET(o)->y() );
+ TQPoint mousePos( m->x()+static_cast<TQWidget*>(o)->x(),
+ m->y()+static_cast<TQWidget*>(o)->y() );
TQWidget *slider = 0;
/* find slider that is under the mouse position */
diff --git a/noatun/modules/kaiman/style.h b/noatun/modules/kaiman/style.h
index 0fb4fe42..f3489448 100644
--- a/noatun/modules/kaiman/style.h
+++ b/noatun/modules/kaiman/style.h
@@ -1,4 +1,3 @@
-// -*- C++ -*-
/*
Copyright (c) 2000 Stefan Schimanski (1Stein@gmx.de)
1999-2000 Christian Esken (esken@kde.org)
@@ -31,7 +30,7 @@
class KaimanStyleElement : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
KaimanStyleElement(TQWidget *parent, const char *name=0);
@@ -72,7 +71,7 @@ private:
class KaimanStyleMasked : public KaimanStyleElement
{
- Q_OBJECT
+ TQ_OBJECT
public:
KaimanStyleMasked(TQWidget *parent, const char *name=0)
@@ -89,7 +88,7 @@ public:
class KaimanStyleButton : public KaimanStyleMasked
{
- Q_OBJECT
+ TQ_OBJECT
public:
KaimanStyleButton(TQWidget *parent, const char *name=0);
@@ -127,7 +126,7 @@ private:
class KaimanStyleSlider : public KaimanStyleMasked
{
- Q_OBJECT
+ TQ_OBJECT
public:
KaimanStyleSlider(int min, int max, TQWidget *parent, const char *name=0);
@@ -166,7 +165,7 @@ protected:
class KaimanStyleBackground : public KaimanStyleMasked
{
- Q_OBJECT
+ TQ_OBJECT
public:
KaimanStyleBackground(TQWidget *parent, const char *name=0);
@@ -186,7 +185,7 @@ private:
class KaimanStyleValue : public KaimanStyleMasked
{
- Q_OBJECT
+ TQ_OBJECT
public:
KaimanStyleValue(int min, int max, TQWidget *parent, const char *name=0);
@@ -205,7 +204,7 @@ private:
class KaimanStyleState : public KaimanStyleMasked
{
- Q_OBJECT
+ TQ_OBJECT
public:
KaimanStyleState(TQWidget *parent, const char *name=0);
@@ -229,7 +228,7 @@ private:
class KaimanStyleNumber : public KaimanStyleElement
{
- Q_OBJECT
+ TQ_OBJECT
public:
KaimanStyleNumber(TQWidget *parent, const char *name=0);
@@ -254,7 +253,7 @@ private:
class KaimanStyleText : public KaimanStyleElement
{
- Q_OBJECT
+ TQ_OBJECT
public:
KaimanStyleText(TQWidget *parent, const char *name=0);
@@ -289,7 +288,7 @@ private:
class KaimanStyleAnimation : public KaimanStyleMasked
{
- Q_OBJECT
+ TQ_OBJECT
public:
KaimanStyleAnimation(int delay, TQWidget *parent, const char *name=0);
@@ -310,7 +309,7 @@ private:
class KaimanStyle : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
KaimanStyle(TQWidget *parent, const char *name=0);
diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp
index 9f502178..dfcc15ab 100644
--- a/noatun/modules/kaiman/userinterface.cpp
+++ b/noatun/modules/kaiman/userinterface.cpp
@@ -46,7 +46,7 @@
#include <tdelocale.h>
#include <tdeconfig.h>
#include <tdepopupmenu.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdemessagebox.h>
#include <tdeio/netaccess.h>
#include <kurldrag.h>
@@ -92,27 +92,27 @@ Kaiman::Kaiman()
if ( !changeStyle( DEFAULT_SKIN, "skindata" ) )
{
KMessageBox::error( this, i18n("Cannot load default skin %1.").arg(DEFAULT_SKIN) );
- TQTimer::singleShot( 0, this, TQT_SLOT(close()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(close()) );
return;
}
}
// global connects
- connect( napp, TQT_SIGNAL(hideYourself()), this, TQT_SLOT(hide()) );
- connect( napp, TQT_SIGNAL(showYourself()), this, TQT_SLOT(show()) );
+ connect( napp, TQ_SIGNAL(hideYourself()), this, TQ_SLOT(hide()) );
+ connect( napp, TQ_SIGNAL(showYourself()), this, TQ_SLOT(show()) );
- connect( napp->player(), TQT_SIGNAL(playing()), this, TQT_SLOT(updateMode()));
- connect( napp->player(), TQT_SIGNAL(stopped()), this, TQT_SLOT(updateMode()));
- connect( napp->player(), TQT_SIGNAL(paused()), this, TQT_SLOT(updateMode()));
- connect( napp->player(), TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()));
- connect( napp->player(), TQT_SIGNAL(loopTypeChange(int)), this, TQT_SLOT(loopTypeChange(int)));
- connect( napp->player(), TQT_SIGNAL(newSongLen(int,int)), this, TQT_SLOT(newSongLen(int,int)));
- connect( napp->player(), TQT_SIGNAL(newSong()), this, TQT_SLOT(newSong()));
+ connect( napp->player(), TQ_SIGNAL(playing()), this, TQ_SLOT(updateMode()));
+ connect( napp->player(), TQ_SIGNAL(stopped()), this, TQ_SLOT(updateMode()));
+ connect( napp->player(), TQ_SIGNAL(paused()), this, TQ_SLOT(updateMode()));
+ connect( napp->player(), TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout()));
+ connect( napp->player(), TQ_SIGNAL(loopTypeChange(int)), this, TQ_SLOT(loopTypeChange(int)));
+ connect( napp->player(), TQ_SIGNAL(newSongLen(int,int)), this, TQ_SLOT(newSongLen(int,int)));
+ connect( napp->player(), TQ_SIGNAL(newSong()), this, TQ_SLOT(newSong()));
if( napp->player()->isPlaying() )
newSong();
- new KaimanPrefDlg(TQT_TQOBJECT(this));
+ new KaimanPrefDlg(this);
show();
}
@@ -174,64 +174,64 @@ bool Kaiman::loadStyle( const TQString &style, const TQString &desc )
}
item = _style->find("Playlist_Button");
- if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(toggleListView()) );
+ if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(toggleListView()) );
item = _style->find("Play_Button");
- if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause()) );
+ if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(playpause()) );
item = _style->find("Pause_Button");
- if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause()) );
+ if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(playpause()) );
item = _style->find("Stop_Button");
- if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(stop()) );
+ if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(stop()) );
item = _style->find("Next_Button");
- if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward()) );
+ if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(forward()) );
item = _style->find("Prev_Button");
- if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(back()) );
+ if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(back()) );
item = _style->find("Exit_Button");
- if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(close()) );
+ if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(close()) );
item = _style->find("Mixer_Button");
- if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(execMixer()) );
+ if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(execMixer()) );
item = _style->find("Iconify_Button");
- if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMinimized()) );
+ if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(showMinimized()) );
item = _style->find("Alt_Skin_Button");
- if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleSkin()) );
+ if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggleSkin()) );
item = _style->find("Repeat_Button");
- if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleLoop()) );
+ if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggleLoop()) );
item = _style->find("Shuffle_Button");
- if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleShuffle()) );
+ if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggleShuffle()) );
item = _style->find("Config_Button");
- if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp, TQT_SLOT(preferences()) );
+ if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp, TQ_SLOT(preferences()) );
item = _style->find("Volume_Up_Button");
- if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this,TQT_SLOT(volumeUp()));
+ if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this,TQ_SLOT(volumeUp()));
item = _style->find("Volume_Down_Button");
- if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this,TQT_SLOT(volumeDown()));
+ if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this,TQ_SLOT(volumeDown()));
KaimanStyleSlider* slider =
static_cast<KaimanStyleSlider*>(_style->find("Position_Slider"));
if( slider!=0 )
{
- connect( slider, TQT_SIGNAL(newValueDrag(int)), this, TQT_SLOT(seekStart(int)) );
- connect( slider, TQT_SIGNAL(newValue(int)), this, TQT_SLOT(seekDrag(int)) );
- connect( slider, TQT_SIGNAL(newValueDrop(int)), this, TQT_SLOT(seekStop(int)) );
+ connect( slider, TQ_SIGNAL(newValueDrag(int)), this, TQ_SLOT(seekStart(int)) );
+ connect( slider, TQ_SIGNAL(newValue(int)), this, TQ_SLOT(seekDrag(int)) );
+ connect( slider, TQ_SIGNAL(newValueDrop(int)), this, TQ_SLOT(seekStop(int)) );
slider->setValue( 0, 0, 1000 );
}
slider = static_cast<KaimanStyleSlider*>(_style->find("Volume_Slider"));
if ( slider!=0 )
{
- connect(slider, TQT_SIGNAL(newValue(int)), this, TQT_SLOT(setVolume(int)));
+ connect(slider, TQ_SIGNAL(newValue(int)), this, TQ_SLOT(setVolume(int)));
slider->setValue( napp->player()->volume(), 0, 100 );
}
@@ -372,7 +372,7 @@ void Kaiman::volumeDown()
void Kaiman::execMixer()
{
- kapp->startServiceByDesktopName ( TQString::fromLatin1("kmix"), TQString() );
+ tdeApp->startServiceByDesktopName ( TQString::fromLatin1("kmix"), TQString() );
}
diff --git a/noatun/modules/kaiman/userinterface.h b/noatun/modules/kaiman/userinterface.h
index f4f712a4..0d10a34d 100644
--- a/noatun/modules/kaiman/userinterface.h
+++ b/noatun/modules/kaiman/userinterface.h
@@ -34,7 +34,7 @@ class Player;
*/
class Kaiman : public TDEMainWindow, public UserInterface
{
-Q_OBJECT
+TQ_OBJECT
public:
Kaiman();
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-17 20:18:03 +0000