diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:43:15 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:43:15 +0000 |
commit | e654398e46e37abf457b2b1122ab898d2c51c49f (patch) | |
tree | d39ee6440f3c3663c3ead84a2d4cc2d034667e96 /noatun/modules/kaiman | |
parent | e4f29b18e19394b9352f52a6c0d0d0e3932cf511 (diff) | |
download | tdemultimedia-e654398e46e37abf457b2b1122ab898d2c51c49f.tar.gz tdemultimedia-e654398e46e37abf457b2b1122ab898d2c51c49f.zip |
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1157644 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'noatun/modules/kaiman')
-rw-r--r-- | noatun/modules/kaiman/pref.cpp | 32 | ||||
-rw-r--r-- | noatun/modules/kaiman/pref.h | 8 | ||||
-rw-r--r-- | noatun/modules/kaiman/style.cpp | 190 | ||||
-rw-r--r-- | noatun/modules/kaiman/style.h | 140 | ||||
-rw-r--r-- | noatun/modules/kaiman/userinterface.cpp | 110 | ||||
-rw-r--r-- | noatun/modules/kaiman/userinterface.h | 12 |
6 files changed, 246 insertions, 246 deletions
diff --git a/noatun/modules/kaiman/pref.cpp b/noatun/modules/kaiman/pref.cpp index 29ef30d9..5f241bc0 100644 --- a/noatun/modules/kaiman/pref.cpp +++ b/noatun/modules/kaiman/pref.cpp @@ -17,11 +17,11 @@ */ #include <klocale.h> -#include <qlayout.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqlabel.h> #include <klistbox.h> -#include <qdir.h> -#include <qfileinfo.h> +#include <tqdir.h> +#include <tqfileinfo.h> #include <kglobal.h> #include <kdebug.h> #include <kstandarddirs.h> @@ -31,12 +31,12 @@ #include "userinterface.h" -KaimanPrefDlg::KaimanPrefDlg(QObject *parent ) +KaimanPrefDlg::KaimanPrefDlg(TQObject *parent ) : CModule(i18n("Kaiman Skins"), i18n("Skin Selection for the Kaiman Plugin"), "style", parent) { // create widgets - QVBoxLayout *topLayout = new QVBoxLayout( this, 6, 11 ); - QLabel *label = new QLabel( i18n("Kaiman Skins"), this, "label" ); + TQVBoxLayout *topLayout = new TQVBoxLayout( this, 6, 11 ); + TQLabel *label = new TQLabel( i18n("Kaiman Skins"), this, "label" ); topLayout->addWidget( label ); _skinList = new KListBox( this, "skinList" ); @@ -68,15 +68,15 @@ void KaimanPrefDlg::reopen() _skinList->clear(); // fill with available skins KGlobal::dirs()->addResourceType("skins", KStandardDirs::kde_default("data") + "noatun/skins/kaiman/"); - QStringList list = KGlobal::dirs()->resourceDirs("skins"); - for (QStringList::ConstIterator it = list.begin(); it != list.end(); it++) + TQStringList list = KGlobal::dirs()->resourceDirs("skins"); + for (TQStringList::ConstIterator it = list.begin(); it != list.end(); it++) readSkinDir(*it); // load current config KConfig *config=KGlobal::config(); config->setGroup("Kaiman"); - QString skin = config->readEntry( "SkinResource", Kaiman::DEFAULT_SKIN ); - QListBoxItem *item = _skinList->findItem( skin ); + TQString skin = config->readEntry( "SkinResource", Kaiman::DEFAULT_SKIN ); + TQListBoxItem *item = _skinList->findItem( skin ); if ( item ) _skinList->setCurrentItem( item ); else @@ -84,23 +84,23 @@ void KaimanPrefDlg::reopen() } -void KaimanPrefDlg::setSkin( QString skin ) +void KaimanPrefDlg::setSkin( TQString skin ) { _skinList->setCurrentItem( _skinList->findItem( skin ) ); } -QString KaimanPrefDlg::skin() +TQString KaimanPrefDlg::skin() { return _skinList->currentText(); } -void KaimanPrefDlg::readSkinDir( const QString &dir ) +void KaimanPrefDlg::readSkinDir( const TQString &dir ) { kdDebug() << "readSkinDir " << dir << endl; - QDir directory( dir ); + TQDir directory( dir ); if (!directory.exists()) return; @@ -109,7 +109,7 @@ void KaimanPrefDlg::readSkinDir( const QString &dir ) while ( it.current() ) { kdDebug() << it.current()->absFilePath() << endl; - QFileInfo skindata( it.current()->absFilePath()+"/skindata" ); + TQFileInfo skindata( it.current()->absFilePath()+"/skindata" ); if ( skindata.exists() ) { _skinList->insertItem( it.current()->baseName() ); diff --git a/noatun/modules/kaiman/pref.h b/noatun/modules/kaiman/pref.h index d18200fa..4f473859 100644 --- a/noatun/modules/kaiman/pref.h +++ b/noatun/modules/kaiman/pref.h @@ -28,18 +28,18 @@ class KaimanPrefDlg : public CModule { Q_OBJECT public: - KaimanPrefDlg( QObject *parent ); + KaimanPrefDlg( TQObject *parent ); virtual ~KaimanPrefDlg(); virtual void save(); virtual void reopen(); public slots: - void setSkin( QString skin ); - QString skin(); + void setSkin( TQString skin ); + TQString skin(); private: - void readSkinDir( const QString &dir ); + void readSkinDir( const TQString &dir ); KListBox *_skinList; }; diff --git a/noatun/modules/kaiman/style.cpp b/noatun/modules/kaiman/style.cpp index 0cce6b96..6b700230 100644 --- a/noatun/modules/kaiman/style.cpp +++ b/noatun/modules/kaiman/style.cpp @@ -21,14 +21,14 @@ #include <kapplication.h> #include <kstandarddirs.h> #include <kmessagebox.h> -#include <qfile.h> -#include <qtextstream.h> -#include <qpainter.h> -#include <qdropsite.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqpainter.h> +#include <tqdropsite.h> #include <kdebug.h> #include <klocale.h> #include <kurldrag.h> -#include <qtimer.h> +#include <tqtimer.h> #include <stdlib.h> #include <unistd.h> @@ -42,8 +42,8 @@ const bool KaimanStyleSlider::optionVertical = 1; const bool KaimanStyleSlider::optionReversed = 2; const bool KaimanStyleText::optionExtended = 1; -KaimanStyleElement::KaimanStyleElement(QWidget *parent, const char *name) - : QWidget(parent, name) +KaimanStyleElement::KaimanStyleElement(TQWidget *parent, const char *name) + : TQWidget(parent, name) { // Initialize everything to default values filename = ""; @@ -71,9 +71,9 @@ KaimanStyleElement::~KaimanStyleElement() } -void KaimanStyleElement::loadPixmaps(QString &val_s_filename) +void KaimanStyleElement::loadPixmaps(TQString &val_s_filename) { - QPixmap pixmap; + TQPixmap pixmap; bool i_b_ret = pixmap.load(val_s_filename); pixmapNum = pixmapLines*pixmapColumns; @@ -117,14 +117,14 @@ void KaimanStyleElement::loadPixmaps(QString &val_s_filename) { int w = (x==0) ? firstWidth : width; - QPixmap *part = new QPixmap(w,h,pixmap.depth()); + TQPixmap *part = new TQPixmap(w,h,pixmap.depth()); part->fill(Qt::black); bitBlt(part,0,0,&pixmap,sourcex,sourcey,w,h); pixmaps.insert(i,part); if(pixmap.mask()) { - QBitmap maskpart(w,h); + TQBitmap maskpart(w,h); bitBlt(&maskpart,0,0,pixmap.mask(),sourcex,sourcey,w,h); part->setMask(maskpart); } @@ -141,7 +141,7 @@ void KaimanStyleElement::loadPixmaps(QString &val_s_filename) for ( int i=0; i<pixmapNum; i++ ) { - QPixmap *pm = new QPixmap(10, 10); + TQPixmap *pm = new TQPixmap(10, 10); pm->fill(Qt::black); pixmaps.insert( i, pm ); } @@ -149,7 +149,7 @@ void KaimanStyleElement::loadPixmaps(QString &val_s_filename) if ( dimension.width()==0 ) dimension.setWidth( pixmaps[0]->width() ); if ( dimension.height()==0 ) dimension.setHeight( pixmaps[0]->height() ); - setGeometry( QRect(upperLeft, dimension) ); + setGeometry( TQRect(upperLeft, dimension) ); } void KaimanStyleElement::setPixmap( int num ) @@ -164,27 +164,27 @@ void KaimanStyleElement::setPixmap( int num ) } } -void KaimanStyleElement::paintEvent ( QPaintEvent */*qpe*/ ) +void KaimanStyleElement::paintEvent ( TQPaintEvent */*qpe*/ ) { - QPixmap *pm = pixmaps[_currentPixmap]; + TQPixmap *pm = pixmaps[_currentPixmap]; if ( pm ) bitBlt(this, 0, 0, pm ); else kdDebug() << "Invalid pixmap" << endl; -/* QPainter p( this ); +/* TQPainter p( this ); p.setBrush( NoBrush ); - p.setPen( QColor(255,255,255) ); + p.setPen( TQColor(255,255,255) ); p.drawRect( 0, 0, width(), height() ); p.drawText( 2, 16, name() ); */ } -void KaimanStyleElement::dragEnterEvent( QDragEnterEvent *event ) +void KaimanStyleElement::dragEnterEvent( TQDragEnterEvent *event ) { event->accept( KURLDrag::canDecode(event) ); } -void KaimanStyleElement::dropEvent( QDropEvent *event ) +void KaimanStyleElement::dropEvent( TQDropEvent *event ) { ((Kaiman*)(parentWidget()->parentWidget()))->doDropEvent(event); } @@ -192,7 +192,7 @@ void KaimanStyleElement::dropEvent( QDropEvent *event ) /***************************************************************************/ -KaimanStyleButton::KaimanStyleButton(QWidget *parent, const char *name) +KaimanStyleButton::KaimanStyleButton(TQWidget *parent, const char *name) : KaimanStyleMasked(parent, name) { i_b_lit = i_b_prelit = i_b_down = false; @@ -210,7 +210,7 @@ KaimanStyleButton::~KaimanStyleButton() { } -void KaimanStyleButton::mousePressEvent(QMouseEvent *qme) +void KaimanStyleButton::mousePressEvent(TQMouseEvent *qme) { // We deactivate prelight, because the user presses the button. // So it is now down, but there is no PrelitDown icon (BTW: would @@ -222,7 +222,7 @@ void KaimanStyleButton::mousePressEvent(QMouseEvent *qme) KaimanStyleMasked::mousePressEvent( qme ); } -void KaimanStyleButton::mouseReleaseEvent(QMouseEvent *qme) +void KaimanStyleButton::mouseReleaseEvent(TQMouseEvent *qme) { releaseMouse (); @@ -237,7 +237,7 @@ void KaimanStyleButton::mouseReleaseEvent(QMouseEvent *qme) /* paint prelight */ -void KaimanStyleButton::enterEvent ( QEvent * e ) +void KaimanStyleButton::enterEvent ( TQEvent * e ) { if ( !down() ) setPrelight(true); @@ -246,7 +246,7 @@ void KaimanStyleButton::enterEvent ( QEvent * e ) } /* unpaint prelight */ -void KaimanStyleButton::leaveEvent ( QEvent * e ) +void KaimanStyleButton::leaveEvent ( TQEvent * e ) { if (!down()) setPrelight(false); @@ -327,7 +327,7 @@ void KaimanStyleButton::updateButtonState() { /***********************************************************************/ -KaimanStyleSlider::KaimanStyleSlider(int min, int max, QWidget *parent, const char *name) +KaimanStyleSlider::KaimanStyleSlider(int min, int max, TQWidget *parent, const char *name) : KaimanStyleMasked( parent, name ) { _min = min; @@ -380,7 +380,7 @@ int KaimanStyleSlider::pos2value( int x, int y ) } -void KaimanStyleSlider::mouseMoveEvent(QMouseEvent *qme) +void KaimanStyleSlider::mouseMoveEvent(TQMouseEvent *qme) { KaimanStyleMasked::mouseMoveEvent( qme ); @@ -391,7 +391,7 @@ void KaimanStyleSlider::mouseMoveEvent(QMouseEvent *qme) } } -void KaimanStyleSlider::mousePressEvent(QMouseEvent *qme) +void KaimanStyleSlider::mousePressEvent(TQMouseEvent *qme) { if ( !_down ) { @@ -407,7 +407,7 @@ void KaimanStyleSlider::mousePressEvent(QMouseEvent *qme) } -void KaimanStyleSlider::mouseReleaseEvent(QMouseEvent *qme) +void KaimanStyleSlider::mouseReleaseEvent(TQMouseEvent *qme) { if ( _down ) { @@ -424,13 +424,13 @@ void KaimanStyleSlider::mouseReleaseEvent(QMouseEvent *qme) } -void KaimanStyleSlider::paintEvent(QPaintEvent */*qpe*/) +void KaimanStyleSlider::paintEvent(TQPaintEvent */*qpe*/) { // draw background bitBlt( this, 0, 0, pixmaps[0] ); // draw optional handle - QPixmap *handle; + TQPixmap *handle; if ( _down ) handle = pixmaps[2]; else @@ -460,7 +460,7 @@ void KaimanStyleSlider::paintEvent(QPaintEvent */*qpe*/) } } -void KaimanStyleSlider::enterEvent ( QEvent * e ) +void KaimanStyleSlider::enterEvent ( TQEvent * e ) { if ( !_lit && optionPrelight ) { @@ -471,7 +471,7 @@ void KaimanStyleSlider::enterEvent ( QEvent * e ) KaimanStyleMasked::enterEvent( e ); } -void KaimanStyleSlider::leaveEvent ( QEvent * e ) +void KaimanStyleSlider::leaveEvent ( TQEvent * e ) { if ( _lit ) { @@ -486,7 +486,7 @@ void KaimanStyleSlider::leaveEvent ( QEvent * e ) /***********************************************************************/ -KaimanStyleBackground::KaimanStyleBackground(QWidget *parent, const char *name) +KaimanStyleBackground::KaimanStyleBackground(TQWidget *parent, const char *name) : KaimanStyleMasked( parent, name ) { i_b_move = false; @@ -496,22 +496,22 @@ KaimanStyleBackground::~KaimanStyleBackground() { } -void KaimanStyleBackground::mouseReleaseEvent(QMouseEvent *qme) +void KaimanStyleBackground::mouseReleaseEvent(TQMouseEvent *qme) { i_b_move = false; KaimanStyleMasked::mouseReleaseEvent( qme ); } -void KaimanStyleBackground::mouseMoveEvent(QMouseEvent *qme) +void KaimanStyleBackground::mouseMoveEvent(TQMouseEvent *qme) { - QPoint diff = qme->globalPos() - i_point_lastPos; + TQPoint diff = qme->globalPos() - i_point_lastPos; if ( abs(diff.x()) > 10 || abs(diff.y()) > 10) { // Moving starts only, when passing a drag border i_b_move = true; } if ( i_b_move ) { - QWidget *p = parentWidget()->parentWidget(); + TQWidget *p = parentWidget()->parentWidget(); if ( !p ) p = parentWidget(); p->move( qme->globalPos() - i_point_dragStart ); @@ -520,7 +520,7 @@ void KaimanStyleBackground::mouseMoveEvent(QMouseEvent *qme) KaimanStyleMasked::mouseMoveEvent( qme ); } -void KaimanStyleBackground::mousePressEvent(QMouseEvent *qme) +void KaimanStyleBackground::mousePressEvent(TQMouseEvent *qme) { // On the background we move the shaped toplevel around if (!i_b_move) { @@ -533,7 +533,7 @@ void KaimanStyleBackground::mousePressEvent(QMouseEvent *qme) /***********************************************************************/ -KaimanStyleValue::KaimanStyleValue(int min, int max, QWidget *parent, const char *name) +KaimanStyleValue::KaimanStyleValue(int min, int max, TQWidget *parent, const char *name) : KaimanStyleMasked( parent, name ) { _min = min; @@ -571,12 +571,12 @@ void KaimanStyleValue::setValue( int value, int min, int max ) /***********************************************************************/ -KaimanStyleNumber::KaimanStyleNumber(QWidget *parent, const char *name) +KaimanStyleNumber::KaimanStyleNumber(TQWidget *parent, const char *name) : KaimanStyleElement( parent, name ) { //kdDebug(66666) << k_funcinfo << "name = '" << name << "'" << endl; _value = 0; - if (QCString(name) == "In_Rate_Number") + if (TQCString(name) == "In_Rate_Number") digits = 3; else digits = 2; @@ -587,7 +587,7 @@ KaimanStyleNumber::~KaimanStyleNumber() } -void KaimanStyleNumber::loadPixmaps(QString &val_s_filename) +void KaimanStyleNumber::loadPixmaps(TQString &val_s_filename) { KaimanStyleElement::loadPixmaps( val_s_filename ); resize( digits*pixmaps[0]->width(),pixmaps[0]->height() ); @@ -603,7 +603,7 @@ void KaimanStyleNumber::setValue( int value ) } } -void KaimanStyleNumber::paintEvent(QPaintEvent */*qpe*/) +void KaimanStyleNumber::paintEvent(TQPaintEvent */*qpe*/) { // check for overflow int v = _value; @@ -631,22 +631,22 @@ void KaimanStyleNumber::paintEvent(QPaintEvent */*qpe*/) bitBlt(this, x, 0, pixmaps[0] ); } /* - QPainter p( this ); + TQPainter p( this ); p.setBrush( NoBrush ); - p.setPen( QColor(255,255,255) ); + p.setPen( TQColor(255,255,255) ); p.drawRect( 0, 0, width(), height() ); p.drawText( 2, 16, name() );*/ } /***********************************************************************/ -KaimanStyleText::KaimanStyleText(QWidget *parent, const char *name) +KaimanStyleText::KaimanStyleText(TQWidget *parent, const char *name) : KaimanStyleElement( parent, name ) { _pos = 0; - _timer = new QTimer( this ); + _timer = new TQTimer( this ); _delay = 500; - connect( _timer, SIGNAL(timeout()), this, SLOT(timeout()) ); + connect( _timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()) ); } KaimanStyleText::~KaimanStyleText() @@ -654,14 +654,14 @@ KaimanStyleText::~KaimanStyleText() } -void KaimanStyleText::loadPixmaps(QString &val_s_filename) +void KaimanStyleText::loadPixmaps(TQString &val_s_filename) { KaimanStyleElement::loadPixmaps( val_s_filename ); resize( digits*pixmaps[0]->width(), pixmaps[0]->height() ); } -void KaimanStyleText::setValue( QString value ) +void KaimanStyleText::setValue( TQString value ) { if ( value!=_value ) { _pos = 0; @@ -708,7 +708,7 @@ void KaimanStyleText::timeout() } -void KaimanStyleText::paintEvent(QPaintEvent */*qpe*/) +void KaimanStyleText::paintEvent(TQPaintEvent */*qpe*/) { // draw number int p; @@ -718,30 +718,30 @@ void KaimanStyleText::paintEvent(QPaintEvent */*qpe*/) if ( pmNum>=96 ) pmNum = '?' - ' '; if ( pmNum<0 ) pmNum = '?' - ' '; - QPixmap *pm = pixmaps[pmNum]; + TQPixmap *pm = pixmaps[pmNum]; if ( pm ) bitBlt(this, p*pixmaps[0]->width(), 0, pm ); } - QPixmap *pm = pixmaps[0]; + TQPixmap *pm = pixmaps[0]; for ( ; p<digits; p++ ) bitBlt(this, p*pixmaps[0]->width(), 0, pm ); -/* QPainter pnt( this ); +/* TQPainter pnt( this ); pnt.setBrush( NoBrush ); - pnt.setPen( QColor(255,255,255) ); + pnt.setPen( TQColor(255,255,255) ); pnt.drawRect( 0, 0, width(), height() ); pnt.drawText( 2, 16, name() );*/ } /***********************************************************************/ -KaimanStyleAnimation::KaimanStyleAnimation(int delay, QWidget *parent, const char *name) +KaimanStyleAnimation::KaimanStyleAnimation(int delay, TQWidget *parent, const char *name) : KaimanStyleMasked( parent, name ) { _delay = delay; _frame = 0; - _timer = new QTimer( this ); - connect( _timer, SIGNAL(timeout()), this, SLOT(timeout()) ); + _timer = new TQTimer( this ); + connect( _timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()) ); } KaimanStyleAnimation::~KaimanStyleAnimation() @@ -774,7 +774,7 @@ void KaimanStyleAnimation::timeout() /***********************************************************************/ -KaimanStyleState::KaimanStyleState(QWidget *parent, const char *name) +KaimanStyleState::KaimanStyleState(TQWidget *parent, const char *name) : KaimanStyleMasked( parent, name ) { _value = 0; @@ -790,7 +790,7 @@ void KaimanStyleState::setValue( int value ) setPixmap( _value ); } -void KaimanStyleState::mousePressEvent(QMouseEvent *qme) +void KaimanStyleState::mousePressEvent(TQMouseEvent *qme) { emit clicked(); KaimanStyleMasked::mouseReleaseEvent( qme ); @@ -799,8 +799,8 @@ void KaimanStyleState::mousePressEvent(QMouseEvent *qme) /***********************************************************************/ -KaimanStyle::KaimanStyle( QWidget *parent, const char *name ) - : QWidget( parent, name ) +KaimanStyle::KaimanStyle( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { i_qw_parent = parent; i_eventSemaphore = false; @@ -812,17 +812,17 @@ KaimanStyle::~KaimanStyle() } -int KaimanStyle::parseStyleFile(QString &l_s_tmpName) +int KaimanStyle::parseStyleFile(TQString &l_s_tmpName) { int l_i_ret = false; - QStringList l_s_tokens; + TQStringList l_s_tokens; - QFile l_fd(l_s_tmpName); + TQFile l_fd(l_s_tmpName); if ( l_fd.open(IO_ReadOnly) ) { // file opened successfully - QTextStream l_ts_line( &l_fd ); - QString l_s_textLine, l_s_token; + TQTextStream l_ts_line( &l_fd ); + TQString l_s_textLine, l_s_token; while ( !l_ts_line.eof() ) { // Clear list of tokens (we are going to fill them now) l_s_tokens.clear(); @@ -865,15 +865,15 @@ int KaimanStyle::parseStyleFile(QString &l_s_tmpName) /* This function gets a list of tokens and inserts a new KaimanStyleElement in I_styleElem. */ -void KaimanStyle::interpretTokens(QStringList& ref_s_tokens) +void KaimanStyle::interpretTokens(TQStringList& ref_s_tokens) { if ( ref_s_tokens.count() < 1 ) { // A list with less than 1 item is useless to us return; } - QString l_s_tokenTypes; - const QString &l_s_elem = ref_s_tokens.first(); + TQString l_s_tokenTypes; + const TQString &l_s_elem = ref_s_tokens.first(); bool l_vertPixmaps = false; int l_i_pmIndex[KaimanStyleButton::StateListEND]; for (int i=0; i<KaimanStyleButton::StateListEND; i++) l_i_pmIndex[i]=0; @@ -1027,7 +1027,7 @@ void KaimanStyle::interpretTokens(QStringList& ref_s_tokens) 1) Create a new KaimanStyle*, that is inserted into I_styleElem. 2) Fill the KaimanStyleElement structure, by interpreting the tokens. */ - QStringList::Iterator li_s_tokens = ref_s_tokens.begin(); + TQStringList::Iterator li_s_tokens = ref_s_tokens.begin(); ++ li_s_tokens; // Skip the name of the element // 1) Create a new KaimanStyleElement, that is inserted into I_styleElem. @@ -1140,7 +1140,7 @@ void KaimanStyle::interpretTokens(QStringList& ref_s_tokens) // Take the first item from the l_s_tokenTypes; char l_c_type = (l_s_tokenTypes[0]).latin1(); l_s_tokenTypes = l_s_tokenTypes.mid(1); - QString l_s_token = *li_s_tokens; + TQString l_s_token = *li_s_tokens; switch(l_c_type) { case 'f': // filename @@ -1326,10 +1326,10 @@ void KaimanStyle::interpretTokens(QStringList& ref_s_tokens) } -QString KaimanStyle::getToken(QString &val_s_string, char val_c_separator) +TQString KaimanStyle::getToken(TQString &val_s_string, char val_c_separator) { int l_i_pos; - QString l_s_token; + TQString l_s_token; // Find the first occurrence of the separator l_i_pos = val_s_string.find(val_c_separator, 0, false); @@ -1351,15 +1351,15 @@ QString KaimanStyle::getToken(QString &val_s_string, char val_c_separator) -bool KaimanStyle::loadStyle(const QString &styleName, const QString &descFile) +bool KaimanStyle::loadStyle(const TQString &styleName, const TQString &descFile) { bool l_b_ret = true; int l_i_ret = 0; - QString l_s_tmpName; + TQString l_s_tmpName; i_skinName = styleName; this->i_s_styleName = styleName; - i_s_styleBase = QString("skins/kaiman/") + i_s_styleName + QString("/"); + i_s_styleBase = TQString("skins/kaiman/") + i_s_styleName + TQString("/"); l_s_tmpName = locate("appdata", i_s_styleBase + descFile ); if ( l_s_tmpName.isNull() ) { @@ -1390,14 +1390,14 @@ bool KaimanStyle::loadStyle(const QString &styleName, const QString &descFile) return l_b_ret; } -bool KaimanStyle::eventFilter( QObject *o, QEvent *e ) +bool KaimanStyle::eventFilter( TQObject *o, TQEvent *e ) { /* HACK! HACK! HACK! */ if ( !i_eventSemaphore ) - if ( e->type()==QEvent::MouseMove || e->type()==QEvent::MouseButtonPress || - e->type()==QEvent::MouseButtonRelease ) + if ( e->type()==TQEvent::MouseMove || e->type()==TQEvent::MouseButtonPress || + e->type()==TQEvent::MouseButtonRelease ) { - QMouseEvent *m = (QMouseEvent*)e; + TQMouseEvent *m = (TQMouseEvent*)e; // handle noatun context menu if (m->button()==RightButton) { @@ -1405,37 +1405,37 @@ bool KaimanStyle::eventFilter( QObject *o, QEvent *e ) return true; } - QPoint mousePos( m->x()+static_cast<QWidget *>(o)->x(), - m->y()+static_cast<QWidget *>(o)->y() ); - QWidget *slider = 0; + 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 */ - for ( QWidget *s = i_sliders.first(); s!=0; s=i_sliders.next() ) + for ( TQWidget *s = i_sliders.first(); s!=0; s=i_sliders.next() ) { - QRect sliderRect( s->pos(), s->size() ); + TQRect sliderRect( s->pos(), s->size() ); if ( sliderRect.contains(mousePos) ) slider = s; } /* the slider the mouse events instead of the visible widget */ if ( slider ) { - QMouseEvent newMouseEvent( m->type(), mousePos-slider->pos(), + TQMouseEvent newMouseEvent( m->type(), mousePos-slider->pos(), m->globalPos(), m->button(), m->state() ); i_eventSemaphore = true; - bool ret = QApplication::sendEvent( slider, &newMouseEvent ); + bool ret = TQApplication::sendEvent( slider, &newMouseEvent ); i_eventSemaphore = false; return ret; } } - return QWidget::eventFilter( o, e ); // standard event processing + return TQWidget::eventFilter( o, e ); // standard event processing } bool KaimanStyle::loadPixmaps() { - QString l_s_tmpName; - QPixmap *l_pixmap_Background = 0, *l_pixmap_Mask = 0; + TQString l_s_tmpName; + TQPixmap *l_pixmap_Background = 0, *l_pixmap_Mask = 0; KaimanStyleElement *l_kse_elem; for ( uint l_i_elem = 0; l_i_elem<I_styleElem.count(); l_i_elem++) { @@ -1460,9 +1460,9 @@ bool KaimanStyle::loadPixmaps() int l_i_width_Mask = l_pixmap_Mask->width(); int l_i_height_Mask = l_pixmap_Mask->height(); - QImage l_image_MaskOrig = l_pixmap_Mask->convertToImage(); + TQImage l_image_MaskOrig = l_pixmap_Mask->convertToImage(); - QImage l_image_Mask(l_i_width_Mask,l_i_height_Mask, 1, 2, QImage::LittleEndian); + TQImage l_image_Mask(l_i_width_Mask,l_i_height_Mask, 1, 2, TQImage::LittleEndian); l_image_Mask.setColor( 0, 0x00ffffff ); l_image_Mask.setColor( 1, 0 ); l_image_Mask.fill( 0xff ); @@ -1487,7 +1487,7 @@ bool KaimanStyle::loadPixmaps() } -QBitmap* KaimanStyle::Mask() +TQBitmap* KaimanStyle::Mask() { return &i_bitmap_Mask; } @@ -1495,7 +1495,7 @@ QBitmap* KaimanStyle::Mask() KaimanStyleElement* KaimanStyle::find(const char *val_s_elemName) { for (uint i=0; i< I_styleElem.count(); i++) { - if ( I_styleElem[i]->element == QString(val_s_elemName)) { + if ( I_styleElem[i]->element == TQString(val_s_elemName)) { return I_styleElem[i]; } } diff --git a/noatun/modules/kaiman/style.h b/noatun/modules/kaiman/style.h index 4266bc42..1f2bc788 100644 --- a/noatun/modules/kaiman/style.h +++ b/noatun/modules/kaiman/style.h @@ -21,27 +21,27 @@ #ifndef KaimanStyle_H #define KaimanStyle_H -#include <qstring.h> -#include <qwidget.h> -#include <qpixmap.h> -#include <qbitmap.h> -#include <qimage.h> -#include <qevent.h> -#include <qptrvector.h> +#include <tqstring.h> +#include <tqwidget.h> +#include <tqpixmap.h> +#include <tqbitmap.h> +#include <tqimage.h> +#include <tqevent.h> +#include <tqptrvector.h> class KaimanStyleElement : public QWidget { Q_OBJECT public: - KaimanStyleElement(QWidget *parent, const char *name=0); + KaimanStyleElement(TQWidget *parent, const char *name=0); ~KaimanStyleElement(); - virtual void loadPixmaps(QString &val_s_filename); + virtual void loadPixmaps(TQString &val_s_filename); - QString element; - QString filename; - QPoint upperLeft; - QSize dimension; + TQString element; + TQString filename; + TQPoint upperLeft; + TQSize dimension; bool options[3]; int digits; @@ -52,15 +52,15 @@ public: int pixmapLines; int pixmapColumns; - QPtrVector<QPixmap> pixmaps; + TQPtrVector<TQPixmap> pixmaps; public slots: void setPixmap( int num ); protected: - void paintEvent(QPaintEvent *qpe); - void dropEvent( QDropEvent *event ); - void dragEnterEvent( QDragEnterEvent *event ); + void paintEvent(TQPaintEvent *qpe); + void dropEvent( TQDropEvent *event ); + void dragEnterEvent( TQDragEnterEvent *event ); int pixmapNum; @@ -73,10 +73,10 @@ class KaimanStyleMasked : public KaimanStyleElement { Q_OBJECT public: - KaimanStyleMasked(QWidget *parent, const char *name=0) + KaimanStyleMasked(TQWidget *parent, const char *name=0) : KaimanStyleElement( parent, name ) {}; - virtual void loadPixmaps(QString &val_s_filename) + virtual void loadPixmaps(TQString &val_s_filename) { KaimanStyleElement::loadPixmaps( val_s_filename ); if(pixmaps[0]->mask()) @@ -89,13 +89,13 @@ class KaimanStyleButton : public KaimanStyleMasked { Q_OBJECT public: - KaimanStyleButton(QWidget *parent, const char *name=0); + KaimanStyleButton(TQWidget *parent, const char *name=0); ~KaimanStyleButton(); // Button states. enum { NormalUp=0, NormalDown, LitUp, LitDown, PrelightUp, PrelightLitUp, StateListEND }; - QPtrVector<int> I_pmIndex; + TQPtrVector<int> I_pmIndex; void setLit(bool); void setPrelight(bool); @@ -109,10 +109,10 @@ signals: void clicked(); protected: - void mousePressEvent(QMouseEvent *qme); - void mouseReleaseEvent(QMouseEvent *qme); - void enterEvent(QEvent * ); - void leaveEvent ( QEvent * ); + void mousePressEvent(TQMouseEvent *qme); + void mouseReleaseEvent(TQMouseEvent *qme); + void enterEvent(TQEvent * ); + void leaveEvent ( TQEvent * ); private: int i_i_currentState; @@ -126,7 +126,7 @@ class KaimanStyleSlider : public KaimanStyleMasked { Q_OBJECT public: - KaimanStyleSlider(int min, int max, QWidget *parent, const char *name=0); + KaimanStyleSlider(int min, int max, TQWidget *parent, const char *name=0); ~KaimanStyleSlider(); int value() { return _value; }; @@ -144,12 +144,12 @@ signals: void newValueDrop( int value ); protected: - void mouseMoveEvent(QMouseEvent *qme); - void mousePressEvent(QMouseEvent *qme); - void mouseReleaseEvent(QMouseEvent *qme); - void paintEvent(QPaintEvent *qpe); - void enterEvent(QEvent * ); - void leaveEvent ( QEvent * ); + void mouseMoveEvent(TQMouseEvent *qme); + void mousePressEvent(TQMouseEvent *qme); + void mouseReleaseEvent(TQMouseEvent *qme); + void paintEvent(TQPaintEvent *qpe); + void enterEvent(TQEvent * ); + void leaveEvent ( TQEvent * ); int pos2value( int x, int y ); @@ -164,18 +164,18 @@ class KaimanStyleBackground : public KaimanStyleMasked { Q_OBJECT public: - KaimanStyleBackground(QWidget *parent, const char *name=0); + KaimanStyleBackground(TQWidget *parent, const char *name=0); ~KaimanStyleBackground(); protected: - void mousePressEvent(QMouseEvent *qme); - void mouseReleaseEvent(QMouseEvent *qme); - void mouseMoveEvent(QMouseEvent *qme); + void mousePressEvent(TQMouseEvent *qme); + void mouseReleaseEvent(TQMouseEvent *qme); + void mouseMoveEvent(TQMouseEvent *qme); private: bool i_b_move; - QPoint i_point_dragStart; - QPoint i_point_lastPos; + TQPoint i_point_dragStart; + TQPoint i_point_lastPos; }; @@ -183,7 +183,7 @@ class KaimanStyleValue : public KaimanStyleMasked { Q_OBJECT public: - KaimanStyleValue(int min, int max, QWidget *parent, const char *name=0); + KaimanStyleValue(int min, int max, TQWidget *parent, const char *name=0); ~KaimanStyleValue(); int value() { return _value; }; @@ -201,7 +201,7 @@ class KaimanStyleState : public KaimanStyleMasked { Q_OBJECT public: - KaimanStyleState(QWidget *parent, const char *name=0); + KaimanStyleState(TQWidget *parent, const char *name=0); ~KaimanStyleState(); int value() { return _value; }; @@ -213,7 +213,7 @@ signals: void clicked(); protected: - void mousePressEvent(QMouseEvent *qme); + void mousePressEvent(TQMouseEvent *qme); private: int _value; @@ -224,10 +224,10 @@ class KaimanStyleNumber : public KaimanStyleElement { Q_OBJECT public: - KaimanStyleNumber(QWidget *parent, const char *name=0); + KaimanStyleNumber(TQWidget *parent, const char *name=0); ~KaimanStyleNumber(); - virtual void loadPixmaps(QString &val_s_filename); + virtual void loadPixmaps(TQString &val_s_filename); static const bool optionCentered = 1; @@ -237,7 +237,7 @@ public slots: void setValue( int value ); protected: - void paintEvent(QPaintEvent *qpe); + void paintEvent(TQPaintEvent *qpe); private: int _value; @@ -248,33 +248,33 @@ class KaimanStyleText : public KaimanStyleElement { Q_OBJECT public: - KaimanStyleText(QWidget *parent, const char *name=0); + KaimanStyleText(TQWidget *parent, const char *name=0); ~KaimanStyleText(); - virtual void loadPixmaps(QString &val_s_filename); + virtual void loadPixmaps(TQString &val_s_filename); static const bool optionExtended; - QString value() { return _value; }; + TQString value() { return _value; }; void startAnimation( int delay ); void stopAnimation(); public slots: - void setValue( QString value ); + void setValue( TQString value ); protected: - void paintEvent(QPaintEvent *qpe); + void paintEvent(TQPaintEvent *qpe); protected slots: void timeout(); private: - QString _value; + TQString _value; int _pos; int _direction; int _delay; - QTimer *_timer; + TQTimer *_timer; }; @@ -282,7 +282,7 @@ class KaimanStyleAnimation : public KaimanStyleMasked { Q_OBJECT public: - KaimanStyleAnimation(int delay, QWidget *parent, const char *name=0); + KaimanStyleAnimation(int delay, TQWidget *parent, const char *name=0); ~KaimanStyleAnimation(); public slots: @@ -295,14 +295,14 @@ protected: private: int _delay,_frame; - QTimer *_timer; + TQTimer *_timer; }; class KaimanStyle : public QWidget { Q_OBJECT public: - KaimanStyle(QWidget *parent, const char *name=0); + KaimanStyle(TQWidget *parent, const char *name=0); ~KaimanStyle(); enum { background, mask, play_Button, stop_Button, pause_Button, prev_Button, next_Button, repeat_Button, shuffle_Button, playlist_Button, mixer_Button, exit_Button, Iconify_Button, Config_Button, Alt_Skin_Button, Minute_Number, Second_Number, in_Rate_Number, in_Hz_Number, song_Number, status_Item, cPU_Number, digit_Large, digit_Small_Default, title, volume_Item, volume_Slider, position_Item, position_Slider }; @@ -313,43 +313,43 @@ public: KaimanStyleElement* find(const char* val_s_elemName); /// Tries to load the given style and returns success (true) or failure (false) - bool loadStyle(const QString &styleName, const QString &descFile="skindata" ); - QString skinName() { return i_skinName; }; + bool loadStyle(const TQString &styleName, const TQString &descFile="skindata" ); + TQString skinName() { return i_skinName; }; /// Returns the mask - QBitmap* Mask(); + TQBitmap* Mask(); - virtual bool eventFilter( QObject *o, QEvent *e ); + virtual bool eventFilter( TQObject *o, TQEvent *e ); private: // Parses the "skindata" file and returns success (true) or failure (false) - int parseStyleFile(QString &l_s_tmpName); - QString getToken(QString &val_s_string, char val_c_separator); - void interpretTokens(QStringList& ref_s_tokens); + int parseStyleFile(TQString &l_s_tmpName); + TQString getToken(TQString &val_s_string, char val_c_separator); + void interpretTokens(TQStringList& ref_s_tokens); bool loadPixmaps(); /// The name of the style, e.g. "k9" - QString i_s_styleName; + TQString i_s_styleName; /// The base directory, where the style is found. For example /// "/opt/kde/share/apps/kaiman/Skins/k9/" or "/opt/kde/share/apps/kaiman/Skins/k9.tgz" - QString i_s_styleBase; + TQString i_s_styleBase; // The mask of the complete style. Used for doing shaped windows - QBitmap i_bitmap_Mask; + TQBitmap i_bitmap_Mask; /// All style elements are stored here. - QPtrVector<KaimanStyleElement> I_styleElem; + TQPtrVector<KaimanStyleElement> I_styleElem; // The parent window. In other words: The container that holds all the KaimanStyleElement's - QWidget* i_qw_parent; + TQWidget* i_qw_parent; - QPtrList<QWidget> i_sliders; + TQPtrList<TQWidget> i_sliders; bool i_eventSemaphore; - QString i_smallFont; - QString i_largeFont; - QString i_skinName; + TQString i_smallFont; + TQString i_largeFont; + TQString i_skinName; }; diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp index 08036a59..b1ae2570 100644 --- a/noatun/modules/kaiman/userinterface.cpp +++ b/noatun/modules/kaiman/userinterface.cpp @@ -30,13 +30,13 @@ #include "userinterface.h" #include "pref.h" -#include <qcursor.h> -#include <qpixmap.h> -#include <qbitmap.h> -#include <qimage.h> -#include <qdropsite.h> -#include <qdragobject.h> -#include <qtimer.h> +#include <tqcursor.h> +#include <tqpixmap.h> +#include <tqbitmap.h> +#include <tqimage.h> +#include <tqdropsite.h> +#include <tqdragobject.h> +#include <tqtimer.h> #include <kfiledialog.h> #include <kdebug.h> @@ -84,7 +84,7 @@ Kaiman::Kaiman() config->setGroup("Kaiman"); // load skin - QString skinName = config->readEntry( "SkinResource", DEFAULT_SKIN ); + TQString skinName = config->readEntry( "SkinResource", DEFAULT_SKIN ); if ( !changeStyle(skinName, "skindata") ) { @@ -92,22 +92,22 @@ Kaiman::Kaiman() if ( !changeStyle( DEFAULT_SKIN, "skindata" ) ) { KMessageBox::error( this, i18n("Cannot load default skin %1.").arg(DEFAULT_SKIN) ); - QTimer::singleShot( 0, this, SLOT(close()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(close()) ); return; } } // global connects - connect( napp, SIGNAL(hideYourself()), this, SLOT(hide()) ); - connect( napp, SIGNAL(showYourself()), this, SLOT(show()) ); + connect( napp, TQT_SIGNAL(hideYourself()), this, TQT_SLOT(hide()) ); + connect( napp, TQT_SIGNAL(showYourself()), this, TQT_SLOT(show()) ); - connect( napp->player(), SIGNAL(playing()), this, SLOT(updateMode())); - connect( napp->player(), SIGNAL(stopped()), this, SLOT(updateMode())); - connect( napp->player(), SIGNAL(paused()), this, SLOT(updateMode())); - connect( napp->player(), SIGNAL(timeout()), this, SLOT(timeout())); - connect( napp->player(), SIGNAL(loopTypeChange(int)), this, SLOT(loopTypeChange(int))); - connect( napp->player(), SIGNAL(newSongLen(int,int)), this, SLOT(newSongLen(int,int))); - connect( napp->player(), SIGNAL(newSong()), this, SLOT(newSong())); + 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())); if( napp->player()->isPlaying() ) newSong(); @@ -123,9 +123,9 @@ Kaiman::~Kaiman() } -bool Kaiman::changeStyle( const QString &style, const QString &desc ) +bool Kaiman::changeStyle( const TQString &style, const TQString &desc ) { - QString ldesc = desc; + TQString ldesc = desc; if ( ldesc.isEmpty() ) ldesc = _altSkin ? "alt_skindata" : "skindata"; @@ -146,7 +146,7 @@ bool Kaiman::changeStyle( const QString &style, const QString &desc ) } -bool Kaiman::loadStyle( const QString &style, const QString &desc ) +bool Kaiman::loadStyle( const TQString &style, const TQString &desc ) { if ( _style ) delete _style; _style = new KaimanStyle(this); @@ -165,7 +165,7 @@ bool Kaiman::loadStyle( const QString &style, const QString &desc ) } KaimanStyleElement* item = _style->find("Background"); - setBackgroundMode(QWidget::NoBackground); + setBackgroundMode(TQWidget::NoBackground); if ( item!=0 ) { _style->resize( item->width(), item->height()); @@ -174,64 +174,64 @@ bool Kaiman::loadStyle( const QString &style, const QString &desc ) } item = _style->find("Playlist_Button"); - if( item!=0 ) connect( item, SIGNAL(clicked()), napp->player(), SLOT(toggleListView()) ); + if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(toggleListView()) ); item = _style->find("Play_Button"); - if( item!=0 ) connect( item, SIGNAL(clicked()), napp->player(), SLOT(playpause()) ); + if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause()) ); item = _style->find("Pause_Button"); - if( item!=0 ) connect( item, SIGNAL(clicked()), napp->player(), SLOT(playpause()) ); + if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause()) ); item = _style->find("Stop_Button"); - if( item!=0 ) connect( item, SIGNAL(clicked()), napp->player(), SLOT(stop()) ); + if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(stop()) ); item = _style->find("Next_Button"); - if( item!=0 ) connect( item, SIGNAL(clicked()), napp->player(), SLOT(forward()) ); + if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward()) ); item = _style->find("Prev_Button"); - if( item!=0 ) connect( item, SIGNAL(clicked()), napp->player(), SLOT(back()) ); + if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(back()) ); item = _style->find("Exit_Button"); - if( item!=0 ) connect( item, SIGNAL(clicked()), this, SLOT(close()) ); + if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(close()) ); item = _style->find("Mixer_Button"); - if( item!=0 ) connect( item, SIGNAL(clicked()), this, SLOT(execMixer()) ); + if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(execMixer()) ); item = _style->find("Iconify_Button"); - if( item!=0 ) connect( item, SIGNAL(clicked()), this, SLOT(showMinimized()) ); + if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMinimized()) ); item = _style->find("Alt_Skin_Button"); - if( item!=0 ) connect( item, SIGNAL(clicked()), this, SLOT(toggleSkin()) ); + if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleSkin()) ); item = _style->find("Repeat_Button"); - if( item!=0 ) connect( item, SIGNAL(clicked()), this, SLOT(toggleLoop()) ); + if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleLoop()) ); item = _style->find("Shuffle_Button"); - if( item!=0 ) connect( item, SIGNAL(clicked()), this, SLOT(toggleShuffle()) ); + if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleShuffle()) ); item = _style->find("Config_Button"); - if( item!=0 ) connect( item, SIGNAL(clicked()), napp, SLOT(preferences()) ); + if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp, TQT_SLOT(preferences()) ); item = _style->find("Volume_Up_Button"); - if( item!=0 ) connect( item, SIGNAL(clicked()), this,SLOT(volumeUp())); + if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this,TQT_SLOT(volumeUp())); item = _style->find("Volume_Down_Button"); - if( item!=0 ) connect( item, SIGNAL(clicked()), this,SLOT(volumeDown())); + if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this,TQT_SLOT(volumeDown())); KaimanStyleSlider* slider = static_cast<KaimanStyleSlider*>(_style->find("Position_Slider")); if( slider!=0 ) { - connect( slider, SIGNAL(newValueDrag(int)), this, SLOT(seekStart(int)) ); - connect( slider, SIGNAL(newValue(int)), this, SLOT(seekDrag(int)) ); - connect( slider, SIGNAL(newValueDrop(int)), this, SLOT(seekStop(int)) ); + 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)) ); slider->setValue( 0, 0, 1000 ); } slider = static_cast<KaimanStyleSlider*>(_style->find("Volume_Slider")); if ( slider!=0 ) { - connect(slider, SIGNAL(newValue(int)), this, SLOT(setVolume(int))); + connect(slider, TQT_SIGNAL(newValue(int)), this, TQT_SLOT(setVolume(int))); slider->setValue( napp->player()->volume(), 0, 100 ); } @@ -247,25 +247,25 @@ bool Kaiman::loadStyle( const QString &style, const QString &desc ) } -void Kaiman::closeEvent(QCloseEvent*) +void Kaiman::closeEvent(TQCloseEvent*) { unload(); } -void Kaiman::dragEnterEvent( QDragEnterEvent *event ) +void Kaiman::dragEnterEvent( TQDragEnterEvent *event ) { event->accept( KURLDrag::canDecode(event) ); } -void Kaiman::dropEvent( QDropEvent *event ) +void Kaiman::dropEvent( TQDropEvent *event ) { doDropEvent(event); } -void Kaiman::doDropEvent(QDropEvent *event) +void Kaiman::doDropEvent(TQDropEvent *event) { KURL::List uri; if (KURLDrag::decode(event, uri)) @@ -330,18 +330,18 @@ void Kaiman::toggleSkin() { _altSkin = !_altSkin; - QString skinName = _style->skinName(); + TQString skinName = _style->skinName(); - QString oldDesc, newDesc; + TQString oldDesc, newDesc; if ( _altSkin ) { - oldDesc = QString::fromLatin1("skindata"); - newDesc = QString::fromLatin1("alt_skindata"); + oldDesc = TQString::fromLatin1("skindata"); + newDesc = TQString::fromLatin1("alt_skindata"); } else { - newDesc = QString::fromLatin1("skindata"); - oldDesc = QString::fromLatin1("alt_skindata"); + newDesc = TQString::fromLatin1("skindata"); + oldDesc = TQString::fromLatin1("alt_skindata"); } if ( !changeStyle(skinName, newDesc) ) @@ -372,7 +372,7 @@ void Kaiman::volumeDown() void Kaiman::execMixer() { - kapp->startServiceByDesktopName ( QString::fromLatin1("kmix"), QString::null ); + kapp->startServiceByDesktopName ( TQString::fromLatin1("kmix"), TQString::null ); } @@ -424,7 +424,7 @@ void Kaiman::timeout() if ( numItem ) numItem->setValue(item.property("bitrate").toInt()); - QString hzString = item.property("samplerate"); + TQString hzString = item.property("samplerate"); hzString.truncate(2); numItem = static_cast<KaimanStyleNumber*>(_style->find("In_Hz_Number")); @@ -513,7 +513,7 @@ void Kaiman::newSong() KaimanStyleText* titleItem = static_cast<KaimanStyleText*>(_style->find("Title")); if ( titleItem ) { - QString title = i18n("Noatun"); + TQString title = i18n("Noatun"); if ( napp->player()->current() ) { title = napp->player()->current().title(); @@ -546,7 +546,7 @@ void Kaiman::toggleLoop() (int)(Player::Random)); loopMenu->setItemChecked((int)napp->player()->loopStyle(), true); // select current loopstyle in menu - selectedItem = loopMenu->exec(QCursor::pos()); + selectedItem = loopMenu->exec(TQCursor::pos()); if (selectedItem != -1) napp->player()->loop(selectedItem); // set new loopstyle diff --git a/noatun/modules/kaiman/userinterface.h b/noatun/modules/kaiman/userinterface.h index 9df9cb3c..63b4133e 100644 --- a/noatun/modules/kaiman/userinterface.h +++ b/noatun/modules/kaiman/userinterface.h @@ -39,12 +39,12 @@ Q_OBJECT Kaiman(); virtual ~Kaiman(); - bool changeStyle( const QString &style, const QString &desc=QString::null ); + bool changeStyle( const TQString &style, const TQString &desc=TQString::null ); public slots: - void dropEvent( QDropEvent * ); - void doDropEvent( QDropEvent * ); - void dragEnterEvent( QDragEnterEvent * ); - void closeEvent(QCloseEvent*); + void dropEvent( TQDropEvent * ); + void doDropEvent( TQDropEvent * ); + void dragEnterEvent( TQDragEnterEvent * ); + void closeEvent(TQCloseEvent*); protected slots: void seekStart( int ); @@ -73,7 +73,7 @@ Q_OBJECT static Kaiman *kaiman; protected: - bool loadStyle( const QString &style, const QString &desc ); + bool loadStyle( const TQString &style, const TQString &desc ); bool _seeking; |