diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-18 17:00:31 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-18 17:00:31 +0000 |
| commit | 395a904bff7b4d6ead445c342f7ac0c5fbf29121 (patch) | |
| tree | 9829cadb79d2cc7c29a940627fadb28b11e54150 /kicker-applets | |
| parent | 399f47c376fdf4d19192732a701ea9578d11619d (diff) | |
| download | tdeaddons-395a904bff7b4d6ead445c342f7ac0c5fbf29121.tar.gz tdeaddons-395a904bff7b4d6ead445c342f7ac0c5fbf29121.zip | |
TQt4 port kdeaddons
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaddons@1237404 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kicker-applets')
43 files changed, 391 insertions, 369 deletions
diff --git a/kicker-applets/kbinaryclock/datepicker.cpp b/kicker-applets/kbinaryclock/datepicker.cpp index c87e11a..7adef9e 100644 --- a/kicker-applets/kbinaryclock/datepicker.cpp +++ b/kicker-applets/kbinaryclock/datepicker.cpp @@ -29,8 +29,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <klocale.h> #include <kwin.h> -DatePicker::DatePicker(TQWidget *parent, const TQDate& date) - : TQVBox( parent, 0, WType_TopLevel | WDestructiveClose | +DatePicker::DatePicker(TQWidget *tqparent, const TQDate& date) + : TQVBox( tqparent, 0, WType_TopLevel | WDestructiveClose | WStyle_Customize | WStyle_StaysOnTop | WStyle_NoBorder ) { setFrameStyle( TQFrame::PopupPanel | TQFrame::Raised ); @@ -46,6 +46,6 @@ DatePicker::DatePicker(TQWidget *parent, const TQDate& date) void DatePicker::keyReleaseEvent(TQKeyEvent *e) { DATEPICKER_INHERITED::keyReleaseEvent(e); - if (e->key() == Qt::Key_Escape) + if (e->key() == TQt::Key_Escape) close(); } diff --git a/kicker-applets/kbinaryclock/datepicker.h b/kicker-applets/kbinaryclock/datepicker.h index b21cafe..d83b8a0 100644 --- a/kicker-applets/kbinaryclock/datepicker.h +++ b/kicker-applets/kbinaryclock/datepicker.h @@ -29,8 +29,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class TQDate; class KDatePicker; -#define DATEPICKER_INHERITED QVBox -class DatePicker : public QVBox +#define DATEPICKER_INHERITED TQVBox +class DatePicker : public TQVBox { public: DatePicker(TQWidget*, const TQDate&); diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp index 30682e4..2e46273 100644 --- a/kicker-applets/kbinaryclock/kbinaryclock.cpp +++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp @@ -41,15 +41,15 @@ extern "C" { - KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile ) { + KDE_EXPORT KPanelApplet* init( TQWidget *tqparent, const TQString& configFile ) { KGlobal::locale()->insertCatalogue( "kbinaryclock"); return new KBinaryClock( configFile, KPanelApplet::Normal, - KPanelApplet::Preferences, parent, "kbinaryclock"); + KPanelApplet::Preferences, tqparent, "kbinaryclock"); } } -KConfigDialogImp::KConfigDialogImp( TQWidget *parent, const char *name, KConfigSkeleton *prefs, KDialogBase::DialogType dialogType, KDialogBase::ButtonCode defaultButton, bool modal) : - KConfigDialog(parent, name, prefs, dialogType,(KDialogBase::ButtonCode) (KDialogBase::Default | KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel ), defaultButton, modal) +KConfigDialogImp::KConfigDialogImp( TQWidget *tqparent, const char *name, KConfigSkeleton *prefs, KDialogBase::DialogType dialogType, KDialogBase::ButtonCode defaultButton, bool modal) : + KConfigDialog(tqparent, name, prefs, dialogType,(KDialogBase::ButtonCode) (KDialogBase::Default | KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel ), defaultButton, modal) { // As a temporary mesure until the kicker applet's app name is set to the // applets name so KDialogBase gets the right info. @@ -61,14 +61,14 @@ KConfigDialogImp::KConfigDialogImp( TQWidget *parent, const char *name, KConfigS connect(this, TQT_SIGNAL(widgetModified()), settings, TQT_SLOT(updatePreview())); } -SettingsImp::SettingsImp(TQWidget* parent, const char* name, WFlags fl): Settings(parent, name, fl){ +SettingsImp::SettingsImp(TQWidget* tqparent, const char* name, WFlags fl): Settings(tqparent, name, fl){ } /** * Update the preview */ void SettingsImp::updatePreview(){ - int shape = Shape_Circular->isChecked() ? Prefs::EnumShape::Circular : Prefs::EnumShape::Rectangular; + int tqshape = Shape_Circular->isChecked() ? Prefs::EnumShape::Circular : Prefs::EnumShape::Rectangular; int look = KLed::Raised; look = Look_Flat->isChecked() ? Prefs::EnumLook::Flat : look; look = Look_Sunken->isChecked() ? Prefs::EnumLook::Sunken : look; @@ -84,12 +84,12 @@ void SettingsImp::updatePreview(){ kLed5->setBackgroundColor(backgroundColor); kLed6->setBackgroundColor(backgroundColor); - kLed1->setShape((KLed::Shape)shape); - kLed2->setShape((KLed::Shape)shape); - kLed3->setShape((KLed::Shape)shape); - kLed4->setShape((KLed::Shape)shape); - kLed5->setShape((KLed::Shape)shape); - kLed6->setShape((KLed::Shape)shape); + kLed1->setShape((KLed::Shape)tqshape); + kLed2->setShape((KLed::Shape)tqshape); + kLed3->setShape((KLed::Shape)tqshape); + kLed4->setShape((KLed::Shape)tqshape); + kLed5->setShape((KLed::Shape)tqshape); + kLed6->setShape((KLed::Shape)tqshape); kLed1->setColor(color); kLed2->setColor(color); @@ -116,8 +116,8 @@ void SettingsImp::updatePreview(){ /** * Constructor, create LED's */ -KBinaryClock::KBinaryClock(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name) - : KPanelApplet(configFile, type, actions, parent, name), ledWidth(6), +KBinaryClock::KBinaryClock(const TQString& configFile, Type type, int actions, TQWidget *tqparent, const char *name) + : KPanelApplet(configFile, type, actions, tqparent, name), ledWidth(6), _calendar(NULL), _disableCalendar(false), prefs( new Prefs(sharedConfig())), m_tooltip(this) { @@ -173,14 +173,14 @@ void KBinaryClock::resizeEvent( TQResizeEvent *e ) { * Load the settings for the clock. */ void KBinaryClock::loadSettings(){ - int shape = prefs->shape(); + int tqshape = prefs->shape(); int look = prefs->look(); TQColor color = prefs->color(); int darkFactor = prefs->darkFactor(); TQColor backgroundColor = prefs->background(); bool modifyBackground = false; - if(backgroundColor != KApplication::palette().active().background()){ + if(backgroundColor != KApplication::tqpalette().active().background()){ setPaletteBackgroundColor(backgroundColor); modifyBackground = true; } @@ -197,7 +197,7 @@ void KBinaryClock::loadSettings(){ } for(int i=0; i < 4; i++){ for(int j=0; j < ledWidth;j++){ - ledMatrix[j][i]->setShape((KLed::Shape)shape); + ledMatrix[j][i]->setShape((KLed::Shape)tqshape); ledMatrix[j][i]->setColor(color); ledMatrix[j][i]->setLook((KLed::Look)look); ledMatrix[j][i]->setDarkFactor(darkFactor); @@ -264,15 +264,15 @@ void KBinaryClock::updateClock(){ */ void KBinaryClock::mousePressEvent(TQMouseEvent *event) { switch (event->button()) { - case TQMouseEvent::RightButton: + case Qt::RightButton: TQToolTip::remove(this); openContextMenu(); break; - case TQMouseEvent::LeftButton: + case Qt::LeftButton: toggleCalendar(); TQToolTip::remove(this); break; - case TQMouseEvent::MidButton: + case Qt::MidButton: TQToolTip::remove(this); break; default: @@ -290,7 +290,7 @@ void KBinaryClock::openContextMenu() { menu->insertTitle( SmallIcon( "clock" ), i18n( "KBinaryClock" ) ); KLocale *loc = KGlobal::locale(); - TQDateTime dt = TQDateTime::currentDateTime(); + TQDateTime dt = TQDateTime::tqcurrentDateTime(); KPopupMenu *copyMenu = new KPopupMenu( menu ); copyMenu->insertItem(loc->formatDateTime(dt), 201); @@ -329,8 +329,8 @@ void KBinaryClock::openContextMenu() { proc << locate("exe", "kdesu"); proc << "--nonewdcop"; proc << TQString("%1 clock --lang %2") - .arg(locate("exe", "kcmshell")) - .arg(KGlobal::locale()->language()); + .tqarg(locate("exe", "kcmshell")) + .tqarg(KGlobal::locale()->language()); proc.start(KProcess::DontCare); break; case 104: @@ -348,7 +348,7 @@ void KBinaryClock::openContextMenu() { void KBinaryClock::slotCopyMenuActivated( int id ) { TQPopupMenu *m = (TQPopupMenu *) sender(); TQString s = m->text(id); - TQApplication::clipboard()->setText(s); + TQApplication::tqclipboard()->setText(s); } void KBinaryClock::toggleCalendar() @@ -361,15 +361,15 @@ void KBinaryClock::toggleCalendar() if (_calendar || _disableCalendar){ return; } - _calendar = new DatePicker(this, TQDateTime::currentDateTime().date()); + _calendar = new DatePicker(this, TQDateTime::tqcurrentDateTime().date()); connect( _calendar, TQT_SIGNAL( destroyed() ), TQT_SLOT( slotCalendarDeleted() )); // some extra spacing is included if aligned on a desktop edge TQPoint c = mapToGlobal(TQPoint(0,0)); - int w = _calendar->sizeHint().width() + 28; + int w = _calendar->tqsizeHint().width() + 28; // Added 28 px. to size poperly as said in API - int h = _calendar->sizeHint().height(); + int h = _calendar->tqsizeHint().height(); switch (position()) { case KPanelApplet::pLeft: c.setX(c.x()+width()+2); break; @@ -405,7 +405,7 @@ ClockAppletToolTip::ClockAppletToolTip( KBinaryClock *clock ) : TQToolTip( clock void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ ) { - tip(m_clock->geometry(), KGlobal::locale()->formatDate(TQDateTime::currentDateTime().date(), false)); + tip(m_clock->tqgeometry(), KGlobal::locale()->formatDate(TQDateTime::tqcurrentDateTime().date(), false)); } #include "kbinaryclock.moc" diff --git a/kicker-applets/kbinaryclock/kbinaryclock.h b/kicker-applets/kbinaryclock/kbinaryclock.h index 387288d..cfa8422 100644 --- a/kicker-applets/kbinaryclock/kbinaryclock.h +++ b/kicker-applets/kbinaryclock/kbinaryclock.h @@ -38,8 +38,9 @@ class KBinaryClock; class SettingsImp : public Settings { Q_OBJECT + TQ_OBJECT public: - SettingsImp(TQWidget* parent=0, + SettingsImp(TQWidget* tqparent=0, const char* name=0, WFlags fl=0); public slots: @@ -49,7 +50,7 @@ public slots: class KConfigDialogImp : public KConfigDialog { public: - KConfigDialogImp(TQWidget *parent, const char *name, + KConfigDialogImp(TQWidget *tqparent, const char *name, KConfigSkeleton *prefs, KDialogBase::DialogType dialogType = KDialogBase::IconList, KDialogBase::ButtonCode defaultButton = Ok, @@ -57,7 +58,7 @@ public: SettingsImp *settings; }; -class ClockAppletToolTip : public QToolTip +class ClockAppletToolTip : public TQToolTip { public: ClockAppletToolTip( KBinaryClock* clock ); @@ -71,8 +72,9 @@ class ClockAppletToolTip : public QToolTip class KBinaryClock : public KPanelApplet { Q_OBJECT + TQ_OBJECT public: - KBinaryClock(const TQString& configFile, Type t = Normal, int actions = 0, TQWidget *parent = 0, const char *name = 0); + KBinaryClock(const TQString& configFile, Type t = Normal, int actions = 0, TQWidget *tqparent = 0, const char *name = 0); ~KBinaryClock(); virtual int widthForHeight (int height) const; diff --git a/kicker-applets/kbinaryclock/kbinaryclock.kcfg b/kicker-applets/kbinaryclock/kbinaryclock.kcfg index b5a5fb3..84f35c3 100644 --- a/kicker-applets/kbinaryclock/kbinaryclock.kcfg +++ b/kicker-applets/kbinaryclock/kbinaryclock.kcfg @@ -35,7 +35,7 @@ </entry> <entry name="Background" type="Color"> <label>Background color</label> - <default code="true">KApplication::palette().active().background()</default> + <default code="true">KApplication::tqpalette().active().background()</default> </entry> <entry name="Show_Seconds" type="Bool"> <label>Whether to show seconds</label> diff --git a/kicker-applets/kbinaryclock/settings.ui b/kicker-applets/kbinaryclock/settings.ui index 43462af..0b94ee9 100644 --- a/kicker-applets/kbinaryclock/settings.ui +++ b/kicker-applets/kbinaryclock/settings.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>Settings</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Settings</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>groupBox6</cstring> </property> @@ -41,7 +41,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -49,7 +49,7 @@ <string>Light</string> </property> </widget> - <widget class="QSlider" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQSlider" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>kcfg_DarkFactor</cstring> </property> @@ -96,27 +96,27 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>textLabel6</cstring> </property> <property name="text"> <string>Dark</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -127,7 +127,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -135,7 +135,7 @@ <string>Background:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -169,7 +169,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -178,7 +178,7 @@ </spacer> </grid> </widget> - <widget class="QButtonGroup" row="2" column="2"> + <widget class="TQButtonGroup" row="2" column="2"> <property name="name"> <cstring>kcfg_Shape</cstring> </property> @@ -189,7 +189,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>Shape_Rectangular</cstring> </property> @@ -197,7 +197,7 @@ <string>&Rectangular</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>Shape_Circular</cstring> </property> @@ -210,7 +210,7 @@ </widget> </vbox> </widget> - <widget class="QButtonGroup" row="1" column="2"> + <widget class="TQButtonGroup" row="1" column="2"> <property name="name"> <cstring>kcfg_Look</cstring> </property> @@ -221,7 +221,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>Look_Flat</cstring> </property> @@ -229,7 +229,7 @@ <string>&Flat</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>Look_Raised</cstring> </property> @@ -240,7 +240,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>Look_Sunken</cstring> </property> @@ -250,15 +250,15 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="0" column="4" rowspan="3" colspan="1"> + <widget class="TQLayoutWidget" row="0" column="4" rowspan="3" colspan="1"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>preview</cstring> </property> @@ -287,14 +287,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame1</cstring> </property> @@ -332,7 +332,7 @@ <property name="name"> <cstring>kLed1</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> @@ -346,7 +346,7 @@ <property name="name"> <cstring>kLed2</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> @@ -357,7 +357,7 @@ <property name="name"> <cstring>kLed4</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> @@ -368,7 +368,7 @@ <property name="name"> <cstring>kLed3</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> @@ -382,7 +382,7 @@ <property name="name"> <cstring>kLed6</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> @@ -396,7 +396,7 @@ <property name="name"> <cstring>kLed5</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> @@ -415,7 +415,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> @@ -434,7 +434,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>84</height> @@ -443,7 +443,7 @@ </spacer> </vbox> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>kcfg_Show_Seconds</cstring> </property> @@ -451,7 +451,7 @@ <string>Show seconds</string> </property> </widget> - <widget class="QCheckBox" row="0" column="1" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="0" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_Hide_Off_Leds</cstring> </property> @@ -475,7 +475,7 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kled.h</includehint> diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp index cadbb2d..b415032 100644 --- a/kicker-applets/kolourpicker/kolourpicker.cpp +++ b/kicker-applets/kolourpicker/kolourpicker.cpp @@ -48,18 +48,18 @@ $Id$ // Applet initialization function extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) + KDE_EXPORT KPanelApplet* init(TQWidget *tqparent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("kolourpicker"); return new KolourPicker(configFile, KPanelApplet::Normal, KPanelApplet::About, - parent, "kolourpicker"); + tqparent, "kolourpicker"); } } KolourPicker::KolourPicker(const TQString& configFile, Type type, - int actions, TQWidget *parent, const char *name) - : KPanelApplet(configFile, type, actions, parent, name), + int actions, TQWidget *tqparent, const char *name) + : KPanelApplet(configFile, type, actions, tqparent, name), m_picking(0) { KAboutData *about = new KAboutData("kolourpicker", @@ -140,7 +140,7 @@ void KolourPicker::slotHistory() TQPopupMenu *sub = copyPopup(*it, false); subMenus.append(sub); popup.insertItem(colorPixmap(*it), - TQString("%1, %2, %3").arg((*it).red()).arg((*it).green()).arg((*it).blue()), + TQString("%1, %2, %3").tqarg((*it).red()).tqarg((*it).green()).tqarg((*it).blue()), sub); } popup.insertSeparator(); @@ -157,7 +157,7 @@ void KolourPicker::slotHistory() conf->sync(); } else if (id != -1) - setClipboard(popup.findItem(id)->text()); + setClipboard(popup.tqfindItem(id)->text()); } void KolourPicker::mouseReleaseEvent(TQMouseEvent *e) @@ -167,14 +167,14 @@ void KolourPicker::mouseReleaseEvent(TQMouseEvent *e) m_picking = false; releaseMouse(); releaseKeyboard(); - TQWidget *desktop = TQApplication::desktop(); + TQWidget *desktop = TQT_TQWIDGET(TQApplication::desktop()); TQPixmap pm = TQPixmap::grabWindow(desktop->winId(), e->globalPos().x(), e->globalPos().y(), 1, 1); TQImage img = pm.convertToImage(); TQColor color(img.pixel(0, 0)); // eventually remove a dupe - TQValueListIterator<TQColor> dupe = m_history.find(color); + TQValueListIterator<TQColor> dupe = m_history.tqfind(color); if (dupe != m_history.end()) m_history.remove(dupe); @@ -198,7 +198,7 @@ void KolourPicker::mouseReleaseEvent(TQMouseEvent *e) TQPopupMenu *popup = copyPopup(color, true); int id = popup->exec(e->globalPos()); if (id != -1) - setClipboard( popup->findItem(id)->text() ); + setClipboard( popup->tqfindItem(id)->text() ); delete popup; } else @@ -208,7 +208,7 @@ void KolourPicker::mouseReleaseEvent(TQMouseEvent *e) // set both clipboard and selection void KolourPicker::setClipboard(const TQString& text) { - QClipboard *clip = TQApplication::clipboard(); + TQClipboard *clip = TQApplication::tqclipboard(); bool oldMode = clip->selectionModeEnabled(); clip->setSelectionMode(true); clip->setText(text); @@ -242,19 +242,19 @@ void KolourPicker::arrangeButtons() { int h, w, p; - if (orientation() == Horizontal) + if (orientation() ==Qt::Horizontal) { h = height(); if (h > 40) { - // vertical layout + // vertical tqlayout p = (h - 40)/3; m_colourButton->setGeometry(2, p, 20, 20); m_historyButton->setGeometry(2, 2*p+20, 20, 20); } else { - // horizontal layout + // horizontal tqlayout p = (h - 20)/2; m_colourButton->setGeometry(2, p, 20, 20); m_historyButton->setGeometry(24, p, 20, 20); @@ -265,14 +265,14 @@ void KolourPicker::arrangeButtons() w = width(); if (w > 40) { - // horizontal layout + // horizontal tqlayout p = (w - 40)/3; m_colourButton->setGeometry(p, 2, 20, 20); m_historyButton->setGeometry(2*p+20, 2, 20, 20); } else { - // vertical layout + // vertical tqlayout p = (w - 20)/2; m_colourButton->setGeometry(p, 2, 20, 20); m_historyButton->setGeometry(p, 24, 20, 20); @@ -294,7 +294,7 @@ TQPopupMenu *KolourPicker::copyPopup(const TQColor &c, bool title) const // HTML, lower case hex chars value.sprintf("#%.2x%.2x%.2x", c.red(), c.green(), c.blue()); popup->insertItem(SmallIcon("html"), value); - if (value.find(TQRegExp("[a-f]")) >= 0) + if (value.tqfind(TQRegExp("[a-f]")) >= 0) { // HTML, upper case hex chars value.sprintf("#%.2X%.2X%.2X", c.red(), c.green(), c.blue()); @@ -303,7 +303,7 @@ TQPopupMenu *KolourPicker::copyPopup(const TQColor &c, bool title) const // lower case hex chars value.sprintf( "%.2x%.2x%.2x", c.red(), c.green(), c.blue() ); popup->insertItem( SmallIcon( "html" ), value ); - if ( value.find( TQRegExp( "[a-f]" ) ) >= 0 ) + if ( value.tqfind( TQRegExp( "[a-f]" ) ) >= 0 ) { // upper case hex chars value.sprintf( "%.2X%.2X%.2X", c.red(), c.green(), c.blue() ); @@ -336,19 +336,19 @@ TQPixmap KolourPicker::colorPixmap(const TQColor &c) const if (d < (36 * AAFACTOR * AAFACTOR)) img.setPixel(x, y, c.pixel()); else if (d < (56.25 * AAFACTOR * AAFACTOR)) - img.setPixel(x, y, qRgba(128, 128, 128, 255)); + img.setPixel(x, y, tqRgba(128, 128, 128, 255)); } - TQBitmap mask(16, 16); - mask.fill(Qt::color0); - TQPainter p(&mask); - p.setPen(Qt::NoPen); - p.setBrush(Qt::color1); + TQBitmap tqmask(16, 16); + tqmask.fill(TQt::color0); + TQPainter p(&tqmask); + p.setPen(TQt::NoPen); + p.setBrush(TQt::color1); p.drawEllipse(0, 0, 15, 15); p.end(); TQPixmap pm = TQPixmap(img.smoothScale(16, 16)); - pm.setMask(mask); + pm.setMask(tqmask); return pm; } diff --git a/kicker-applets/kolourpicker/kolourpicker.h b/kicker-applets/kolourpicker/kolourpicker.h index 8340d2d..c223339 100644 --- a/kicker-applets/kolourpicker/kolourpicker.h +++ b/kicker-applets/kolourpicker/kolourpicker.h @@ -34,9 +34,10 @@ class TQPopupMenu; class KolourPicker : public KPanelApplet { Q_OBJECT + TQ_OBJECT public: KolourPicker(const TQString& configFile, Type t = Normal, int actions = 0, - TQWidget *parent = 0, const char *name = 0); + TQWidget *tqparent = 0, const char *name = 0); ~KolourPicker(); virtual int heightForWidth(int) const; virtual int widthForHeight(int) const; diff --git a/kicker-applets/kolourpicker/simplebutton.cpp b/kicker-applets/kolourpicker/simplebutton.cpp index 478ca2d..8e6c8ec 100644 --- a/kicker-applets/kolourpicker/simplebutton.cpp +++ b/kicker-applets/kolourpicker/simplebutton.cpp @@ -32,8 +32,8 @@ #include <kipc.h> #include <kstandarddirs.h> -SimpleButton::SimpleButton(TQWidget *parent, const char *name) - : TQButton(parent, name), +SimpleButton::SimpleButton(TQWidget *tqparent, const char *name) + : TQButton(tqparent, name), m_highlight(false), m_orientation(Qt::Horizontal) { @@ -63,22 +63,22 @@ void SimpleButton::setOrientation(Qt::Orientation orientation) update(); } -TQSize SimpleButton::sizeHint() const +TQSize SimpleButton::tqsizeHint() const { const TQPixmap* pm = pixmap(); if (!pm) - return TQButton::sizeHint(); + return TQButton::tqsizeHint(); else return TQSize(pm->width() + KDialog::spacingHint(), pm->height() + KDialog::spacingHint()); } -TQSize SimpleButton::minimumSizeHint() const +TQSize SimpleButton::tqminimumSizeHint() const { const TQPixmap* pm = pixmap(); if (!pm) - return TQButton::minimumSizeHint(); + return TQButton::tqminimumSizeHint(); else return TQSize(pm->width(), pm->height()); } @@ -174,7 +174,7 @@ void SimpleButton::enterEvent( TQEvent *e ) { m_highlight = true; - repaint( false ); + tqrepaint( false ); TQButton::enterEvent( e ); } @@ -182,7 +182,7 @@ void SimpleButton::leaveEvent( TQEvent *e ) { m_highlight = false; - repaint( false ); + tqrepaint( false ); TQButton::enterEvent( e ); } @@ -192,20 +192,20 @@ void SimpleButton::resizeEvent( TQResizeEvent * ) } -SimpleArrowButton::SimpleArrowButton(TQWidget *parent, Qt::ArrowType arrow, const char *name) - : SimpleButton(parent, name) +SimpleArrowButton::SimpleArrowButton(TQWidget *tqparent, TQt::ArrowType arrow, const char *name) + : SimpleButton(tqparent, name) { setBackgroundOrigin(AncestorOrigin); _arrow = arrow; _inside = false; } -TQSize SimpleArrowButton::sizeHint() const +TQSize SimpleArrowButton::tqsizeHint() const { return TQSize( 12, 12 ); } -void SimpleArrowButton::setArrowType(Qt::ArrowType a) +void SimpleArrowButton::setArrowType(TQt::ArrowType a) { if (_arrow != a) { @@ -214,7 +214,7 @@ void SimpleArrowButton::setArrowType(Qt::ArrowType a) } } -Qt::ArrowType SimpleArrowButton::arrowType() const +TQt::ArrowType SimpleArrowButton::arrowType() const { return _arrow; } @@ -226,15 +226,15 @@ void SimpleArrowButton::drawButton( TQPainter *p ) TQStyle::PrimitiveElement pe = TQStyle::PE_ArrowLeft; switch (_arrow) { - case Qt::LeftArrow: pe = TQStyle::PE_ArrowLeft; break; - case Qt::RightArrow: pe = TQStyle::PE_ArrowRight; break; - case Qt::UpArrow: pe = TQStyle::PE_ArrowUp; break; - case Qt::DownArrow: pe = TQStyle::PE_ArrowDown; break; + case TQt::LeftArrow: pe = TQStyle::PE_ArrowLeft; break; + case TQt::RightArrow: pe = TQStyle::PE_ArrowRight; break; + case TQt::UpArrow: pe = TQStyle::PE_ArrowUp; break; + case TQt::DownArrow: pe = TQStyle::PE_ArrowDown; break; } int flags = TQStyle::Style_Default | TQStyle::Style_Enabled; if (isDown() || isOn()) flags |= TQStyle::Style_Down; - style().drawPrimitive(pe, p, r, colorGroup(), flags); + tqstyle().tqdrawPrimitive(pe, p, r, tqcolorGroup(), flags); } void SimpleArrowButton::enterEvent( TQEvent *e ) diff --git a/kicker-applets/kolourpicker/simplebutton.h b/kicker-applets/kolourpicker/simplebutton.h index 1ea5c7a..9b4e231 100644 --- a/kicker-applets/kolourpicker/simplebutton.h +++ b/kicker-applets/kolourpicker/simplebutton.h @@ -26,16 +26,17 @@ #include <kdemacros.h> -class KDE_EXPORT SimpleButton : public QButton +class KDE_EXPORT SimpleButton : public TQButton { Q_OBJECT + TQ_OBJECT public: - SimpleButton(TQWidget *parent, const char *name = 0); + SimpleButton(TQWidget *tqparent, const char *name = 0); void setPixmap(const TQPixmap &pix); void setOrientation(Qt::Orientation orientaton); - TQSize sizeHint() const; - TQSize minimumSizeHint() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; protected: void drawButton( TQPainter *p ); @@ -63,23 +64,24 @@ class KDE_EXPORT SimpleButton : public QButton class KDE_EXPORT SimpleArrowButton: public SimpleButton { Q_OBJECT + TQ_OBJECT public: - SimpleArrowButton(TQWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow, const char *name = 0); + SimpleArrowButton(TQWidget *tqparent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0); virtual ~SimpleArrowButton() {}; - TQSize sizeHint() const; + TQSize tqsizeHint() const; protected: virtual void enterEvent( TQEvent *e ); virtual void leaveEvent( TQEvent *e ); virtual void drawButton(TQPainter *p); - Qt::ArrowType arrowType() const; + TQt::ArrowType arrowType() const; public slots: - void setArrowType(Qt::ArrowType a); + void setArrowType(TQt::ArrowType a); private: - Qt::ArrowType _arrow; + TQt::ArrowType _arrow; bool _inside; }; diff --git a/kicker-applets/ktimemon/confdlg.cc b/kicker-applets/ktimemon/confdlg.cc index df3fffe..c694f5c 100644 --- a/kicker-applets/ktimemon/confdlg.cc +++ b/kicker-applets/ktimemon/confdlg.cc @@ -170,7 +170,7 @@ KConfDialog::KConfDialog(KTimeMon *t) bl->addWidget(b); bl->addStretch(); - TQVBoxLayout *vbox = new TQVBoxLayout( b->layout() ); + TQVBoxLayout *vbox = new TQVBoxLayout( b->tqlayout() ); gl = new TQGridLayout(b, MAX_MOUSE_ACTIONS + 1, 3, 0, 6 ); diff --git a/kicker-applets/ktimemon/confdlg.h b/kicker-applets/ktimemon/confdlg.h index a21c73c..d7451f3 100644 --- a/kicker-applets/ktimemon/confdlg.h +++ b/kicker-applets/ktimemon/confdlg.h @@ -48,6 +48,7 @@ class KConfDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: KConfDialog(KTimeMon *timemon); diff --git a/kicker-applets/ktimemon/sample.cc b/kicker-applets/ktimemon/sample.cc index 99ea20b..54d1edf 100644 --- a/kicker-applets/ktimemon/sample.cc +++ b/kicker-applets/ktimemon/sample.cc @@ -102,7 +102,7 @@ KSample::KSample(KTimeMon *t, bool a, unsigned p, unsigned s, unsigned c) : KMessageBox::error(timemon, i18n("Unable to open the file '%1'. The diagnostics are:\n%2.\n" "This file is required to determine current memory usage.\n" - "Maybe your proc filesystem is non-Linux standard?").arg(MEMINFO_NAME).arg(strerror(errno))); + "Maybe your proc filesystem is non-Linux standard?").tqarg(MEMINFO_NAME).tqarg(strerror(errno))); exit(1); } @@ -112,7 +112,7 @@ KSample::KSample(KTimeMon *t, bool a, unsigned p, unsigned s, unsigned c) : KMessageBox::error(timemon, i18n("Unable to open the file '%1'. The diagnostics are:\n%2.\n" "This file is required to determine current system info. " - "Maybe your proc filesystem is non-Linux standard?").arg(MEMINFO_NAME).arg(strerror(errno))); + "Maybe your proc filesystem is non-Linux standard?").tqarg(MEMINFO_NAME).tqarg(strerror(errno))); exit(1); } @@ -125,7 +125,7 @@ KSample::KSample(KTimeMon *t, bool a, unsigned p, unsigned s, unsigned c) : "The diagnostics are:\n%1.\n" "Are you really running Solaris? " "Please contact the maintainer at mueller@kde.org " - "who will try to figure out what went wrong.").arg(strerror(errno))); + "who will try to figure out what went wrong.").tqarg(strerror(errno))); exit(1); } #endif @@ -210,7 +210,7 @@ void KSample::readSample() if ((l = read(memFD, buffer, sizeof(buffer) - 1)) < 0) { fatal(i18n("Unable to read the memory usage file '%1'.\n" - "The diagnostics are: %2").arg(MEMINFO_NAME).arg(strerror(errno))); + "The diagnostics are: %2").tqarg(MEMINFO_NAME).tqarg(strerror(errno))); } buffer[l] = '\0'; l = 0; @@ -223,7 +223,7 @@ void KSample::readSample() "different file format than expected.\n" "Maybe your version of the proc filesystem is " "incompatible with supported versions. " - "Please contact the developer at http://bugs.kde.org/ who will try to sort this out.").arg(MEMINFO_NAME)); + "Please contact the developer at http://bugs.kde.org/ who will try to sort this out.").tqarg(MEMINFO_NAME)); l++; } @@ -237,7 +237,7 @@ void KSample::readSample() lseek(statFD, 0, 0); if ((l = read(statFD, buffer, sizeof(buffer)-1)) < 0) fatal(i18n("Unable to read the system usage file '%1'.\n" - "The diagnostics are: %2").arg(STAT_NAME).arg(strerror(errno))); + "The diagnostics are: %2").tqarg(STAT_NAME).tqarg(strerror(errno))); buffer[l] = '\0'; @@ -271,7 +271,7 @@ void KSample::readSample() struct tbl_sysinfo sysinfo; if (table(TBL_SYSINFO, 0, &sysinfo, 1, sizeof(sysinfo)) != 1) - fatal(msg.arg("TBL_SYSINFO")); + fatal(msg.tqarg("TBL_SYSINFO")); sample.user = sysinfo.si_user; sample.nice = sysinfo.si_nice; @@ -281,7 +281,7 @@ void KSample::readSample() struct tbl_vmstats vmstats; if (table(TBL_VMSTATS, 0, &vmstats, 1, sizeof(vmstats)) != 1) - fatal(msg.arg("TBL_VMSTATS")); + fatal(msg.tqarg("TBL_VMSTATS")); sample.mtotal = vmstats.free_count + vmstats.active_count + vmstats.inactive_count + vmstats.wire_count; @@ -291,7 +291,7 @@ void KSample::readSample() struct tbl_swapinfo swapinfo; if (table(TBL_SWAPINFO, -1, &swapinfo, 1, sizeof(swapinfo)) != 1) - fatal(msg.arg("TBL_SWAPINFO")); + fatal(msg.tqarg("TBL_SWAPINFO")); sample.stotal = swapinfo.size; sample.sfree = swapinfo.free; @@ -324,7 +324,7 @@ void KSample::readSample() kstat_read(kc, ksp, &cstat) == -1) // and read into buffer fatal(i18n("Unable to read the CPU statistics entry " "from the 'kstat' library. The diagnostics are '%1'.\n" - "Please contact the maintainer via http://bugs.kde.org/ who will try to sort this out.").arg(strerror(errno))); + "Please contact the maintainer via http://bugs.kde.org/ who will try to sort this out.").tqarg(strerror(errno))); // fields are: idle user kernel iowait (no nice info?) sample.user += cstat.cpu_sysinfo.cpu[1] / sample.cpus; @@ -338,7 +338,7 @@ void KSample::readSample() fatal(i18n("The number of CPUs appears to have changed at " "very short notice, or the 'kstat' library returns " "inconsistent results (%1 vs. %2 CPUs).\n" - "Please contact the maintainer via http://bugs.kde.org/ who will try to sort this out.").arg(sample.cpus).arg(cpus)); + "Please contact the maintainer via http://bugs.kde.org/ who will try to sort this out.").tqarg(sample.cpus).tqarg(cpus)); // availrmem = pages of core for user-proc ( == physmem - kernelmem) // freemem = no of free pages @@ -350,7 +350,7 @@ void KSample::readSample() fatal(i18n("Unable to read the memory statistics entry " "from the 'kstat' library. The diagnostics are '%1'\n" "You might want to contact the maintainer at " - "http://bugs.kde.org/ who will try to sort this out.").arg(strerror(errno))); + "http://bugs.kde.org/ who will try to sort this out.").tqarg(strerror(errno))); int i; unsigned long physmem = 0, freemem = 0, availrmem = 0; @@ -367,7 +367,7 @@ void KSample::readSample() fatal(i18n("There seems to be a problem with KTimeMon's handling " "of the 'kstat' library: 0 bytes of physical memory determined!\n" "Free memory is %1, available memory is %2.\n" - "Please contact the maintainer at mueller@kde.org who will try to sort this out.").arg(freemem).arg(availrmem)); + "Please contact the maintainer at mueller@kde.org who will try to sort this out.").tqarg(freemem).tqarg(availrmem)); sample.mtotal = physmem; sample.free = freemem; @@ -378,7 +378,7 @@ void KSample::readSample() if ((swapentries = swapctl(SC_GETNSWP, 0)) == -1) fatal(i18n("Unable to determine the number of " "swap spaces. The diagnostics are '%1'.\n" - "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").arg(strerror(errno))); + "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").tqarg(strerror(errno))); if (swapentries != 0) { // 2* to get some space for padding?? @@ -389,8 +389,8 @@ void KSample::readSample() "trying to determine the swap usage.\n" "Attempted to allocate %1 bytes of memory (2 * %2 + %3 * %4).\n" "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.") - .arg(2 * sizeof(int) + swapentries * sizeof(struct swapent)) - .arg(sizeof(int)).arg(swapentries).arg(sizeof(struct swapent))); + .tqarg(2 * sizeof(int) + swapentries * sizeof(struct swapent)) + .tqarg(sizeof(int)).tqarg(swapentries).tqarg(sizeof(struct swapent))); char path[1024]; stbl->swt_n = swapentries; @@ -399,7 +399,7 @@ void KSample::readSample() if ((swapentries = swapctl(SC_LIST, stbl)) == -1) fatal(i18n("Unable to determine the swap usage.\n" "The diagnostics are '%1'.\n" - "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").arg(strerror(errno))); + "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").tqarg(strerror(errno))); if (!warned && swapentries != stbl->swt_n) { @@ -407,7 +407,7 @@ void KSample::readSample() nonfatal(i18n("Information was requested for " "%1 swap spaces, but only %2 swap entries were returned.\n" "KTimeMon will attempt to continue.\n" - "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").arg(stbl->swt_n).arg(swapentries)); + "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").tqarg(stbl->swt_n).tqarg(swapentries)); } for (i = 0; i < swapentries; i++) { diff --git a/kicker-applets/ktimemon/timemon.cc b/kicker-applets/ktimemon/timemon.cc index 75164f4..4b791ff 100644 --- a/kicker-applets/ktimemon/timemon.cc +++ b/kicker-applets/ktimemon/timemon.cc @@ -35,11 +35,11 @@ extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) + KDE_EXPORT KPanelApplet* init(TQWidget *tqparent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("ktimemon"); KTimeMon *mon = new KTimeMon(configFile, KPanelApplet::Normal, - KPanelApplet::Preferences, parent, "ktimemon"); + KPanelApplet::Preferences, tqparent, "ktimemon"); return mon; } } @@ -111,7 +111,7 @@ void KTimeMon::paintEvent(TQPaintEvent *) b = r / 3; // bar width r -= b; - if (bgColour != colorGroup().background()) + if (bgColour != tqcolorGroup().background()) { paintRect(x, 0, b, h, bgColour, &painter); } @@ -125,7 +125,7 @@ void KTimeMon::paintEvent(TQPaintEvent *) b = r / 2; r -= b; - if (bgColour != colorGroup().background()) + if (bgColour != tqcolorGroup().background()) { paintRect(x, 0, b, h, bgColour, &painter); } @@ -138,7 +138,7 @@ void KTimeMon::paintEvent(TQPaintEvent *) x += b; b = r; - if (bgColour != colorGroup().background()) + if (bgColour != tqcolorGroup().background()) { paintRect(x, 0, b, h, bgColour, &painter); } @@ -164,18 +164,18 @@ void KTimeMon::paintRect(int x, int y, int w, int h, TQColor c, TQPainter *p) void KTimeMon::maybeTip(const TQPoint& p) { if (sample == 0) return; // no associated sample... - if(!rect().contains(p)) return; + if(!TQT_TQRECT_OBJECT(rect()).tqcontains(p)) return; KSample::Sample s = sample->getSample(100); // scale to 100(%) int idle = 100 - s.kernel - s.user - s.nice; if ( idle < 0 ) idle = 0; TQString str = i18n("cpu: %1% idle\nmem: %2 MB %3% free\nswap: %4 MB %5% free") - .arg(idle) - .arg(KGlobal::locale()->formatNumber(s.used/100.*s.mtotal, 0)) - .arg(100-s.used) - .arg(KGlobal::locale()->formatNumber(s.stotal, 0)) - .arg(100-s.sused); + .tqarg(idle) + .tqarg(KGlobal::locale()->formatNumber(s.used/100.*s.mtotal, 0)) + .tqarg(100-s.used) + .tqarg(KGlobal::locale()->formatNumber(s.stotal, 0)) + .tqarg(100-s.sused); tip(rect(), str); } @@ -185,14 +185,14 @@ void KTimeMon::maybeTip(const TQPoint& p) // Initialise the member variables, read the configuration data base, // set up the widget, and start the timer. KTimeMon::KTimeMon(const TQString& configFile, Type type, int actions, - TQWidget *parent, const char *name) - : KPanelApplet(configFile, type, actions, parent, name, WRepaintNoErase), TQToolTip(this), + TQWidget *tqparent, const char *name) + : KPanelApplet(configFile, type, actions, tqparent, name, WRepaintNoErase), TQToolTip(this), configDialog(0), bgProcess(0), kernelColour("red1"), userColour("blue"), niceColour("yellow"), iowaitColour("darkgreen"), usedColour("blue1"), buffersColour("yellow"), cachedColour("darkgreen"), mkernelColour("red1"), - swapColour("cyan3"), bgColour(colorGroup().background()) + swapColour("cyan3"), bgColour(tqcolorGroup().background()) { mouseAction[0] = NOTHING; mouseAction[1] = NOTHING; @@ -337,7 +337,7 @@ void KTimeMon::writeConfiguration() conf->sync(); } -// Make the KSample object update its internal sample and repaint the +// Make the KSample object update its internal sample and tqrepaint the // object. void KTimeMon::timeout() { @@ -385,9 +385,9 @@ void KTimeMon::mousePressEvent(TQMouseEvent *event) if (event == 0) return; int index = -1; - if (event->button() == LeftButton) index = 0; - else if (event->button() == MidButton) index = 1; - else if (event->button() == RightButton) index = 2; + if (event->button() == Qt::LeftButton) index = 0; + else if (event->button() == Qt::MidButton) index = 1; + else if (event->button() == Qt::RightButton) index = 2; if (index == -1) return; diff --git a/kicker-applets/ktimemon/timemon.h b/kicker-applets/ktimemon/timemon.h index 1f81db1..12fc6ba 100644 --- a/kicker-applets/ktimemon/timemon.h +++ b/kicker-applets/ktimemon/timemon.h @@ -46,11 +46,12 @@ class KPopupMenu; class KTimeMon : public KPanelApplet, TQToolTip { Q_OBJECT + TQ_OBJECT public: enum MouseAction { NOTHING, SWITCH, MENU, COMMAND }; KTimeMon(const TQString& configFile, Type t = Normal, int actions = 0, - TQWidget *parent = 0, const char *name = 0); + TQWidget *tqparent = 0, const char *name = 0); virtual ~KTimeMon(); void writeConfiguration(); // write back the configuration data diff --git a/kicker-applets/math/mathapplet.cpp b/kicker-applets/math/mathapplet.cpp index 9d7ca38..8274bb6 100644 --- a/kicker-applets/math/mathapplet.cpp +++ b/kicker-applets/math/mathapplet.cpp @@ -49,16 +49,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) + KDE_EXPORT KPanelApplet* init(TQWidget *tqparent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("kmathapplet"); - return new MathApplet(configFile, KPanelApplet::Stretch, 0, parent, "kmathapplet"); + return new MathApplet(configFile, KPanelApplet::Stretch, 0, tqparent, "kmathapplet"); } } MathApplet::MathApplet(const TQString& configFile, Type type, int actions, - TQWidget *parent, const char *name) - : KPanelApplet(configFile, type, actions, parent, name), + TQWidget *tqparent, const char *name) + : KPanelApplet(configFile, type, actions, tqparent, name), m_hasFocus(false) { // setBackgroundMode(X11ParentRelative); @@ -151,20 +151,20 @@ void MathApplet::useRadians() { void MathApplet::resizeEvent(TQResizeEvent*) { - if(orientation() == Horizontal) + if(orientation() ==Qt::Horizontal) { _btn->hide(); _input->reparent(this, TQPoint(0,0), true); _label->setGeometry(0,0, width(), _label->height()); - if(height() >= _input->sizeHint().height() + _label->height()) + if(height() >= _input->tqsizeHint().height() + _label->height()) { - int inputVOffset = height() - _input->sizeHint().height() - 2; - int labelHeight = _label->sizeHint().height(); + int inputVOffset = height() - _input->tqsizeHint().height() - 2; + int labelHeight = _label->tqsizeHint().height(); _label->setGeometry(0, inputVOffset - labelHeight, width(), labelHeight); _input->setGeometry(0, inputVOffset, - width(), _input->sizeHint().height()); + width(), _input->tqsizeHint().height()); _label->show(); } else @@ -174,7 +174,7 @@ void MathApplet::resizeEvent(TQResizeEvent*) // make it as high as the combobox naturally wants to be // but no taller than the panel is! // don't forget to center it vertically either. - int newHeight = _input->sizeHint().height(); + int newHeight = _input->tqsizeHint().height(); if (newHeight > height()) newHeight = height(); _input->setGeometry(0, (height() - newHeight) / 2, @@ -269,13 +269,13 @@ void MathApplet::evaluate(const TQString& command) } } - if (orientation() == Vertical) + if (orientation() ==Qt::Vertical) _hbox->hide(); } void MathApplet::mousePressEvent(TQMouseEvent *e) { - if ( e->button() != RightButton ) + if ( e->button() != Qt::RightButton ) { KPanelApplet::mousePressEvent( e ); return; diff --git a/kicker-applets/math/mathapplet.h b/kicker-applets/math/mathapplet.h index f8c91a0..97e4270 100644 --- a/kicker-applets/math/mathapplet.h +++ b/kicker-applets/math/mathapplet.h @@ -38,10 +38,11 @@ class KPopupMenu; class MathApplet : public KPanelApplet { Q_OBJECT + TQ_OBJECT public: MathApplet(const TQString& configFile, Type t = Stretch, int actions = 0, - TQWidget *parent = 0, const char *name = 0); + TQWidget *tqparent = 0, const char *name = 0); virtual ~MathApplet(); int widthForHeight(int height) const; diff --git a/kicker-applets/math/parser.cpp b/kicker-applets/math/parser.cpp index 8a58064..c49cbab 100644 --- a/kicker-applets/math/parser.cpp +++ b/kicker-applets/math/parser.cpp @@ -243,9 +243,9 @@ int Parser::addfkt(TQString str) err=0; errpos=1; str.remove(" " ); - const int p1=str.find('('); - int p2=str.find(','); - const int p3=str.find(")="); + const int p1=str.tqfind('('); + int p2=str.tqfind(','); + const int p3=str.tqfind(")="); //insert '*' when it is needed for(int i=p1+3; i < (int) str.length();i++) @@ -656,41 +656,41 @@ int Parser::getfix(TQString name) int Parser::errmsg() { switch(err) { case 1: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Syntax error").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); + "Syntax error").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 2: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Missing parenthesis").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); + "Missing tqparenthesis").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 3: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Function name unknown").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); + "Function name unknown").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 4: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Void function variable").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); + "Void function variable").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 5: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Too many functions").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); + "Too many functions").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 6: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Token-memory overflow").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); + "Token-memory overflow").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 7: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Stack overflow").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); + "Stack overflow").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 8: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Name of function not free").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); + "Name of function not free").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 9: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "recursive function not allowed").arg(TQString::number(errpos)), i18n("Math Expression Evaluator")); + "recursive function not allowed").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; - case 10: KMessageBox::error(0, i18n("Could not find a defined constant at position %1" ).arg(TQString::number(errpos)), + case 10: KMessageBox::error(0, i18n("Could not find a defined constant at position %1" ).tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator")); break; case 11: KMessageBox::error(0, i18n("Empty function"), i18n("Math Expression Evaluator")); diff --git a/kicker-applets/math/parser.h b/kicker-applets/math/parser.h index 4ee0e7d..319c470 100644 --- a/kicker-applets/math/parser.h +++ b/kicker-applets/math/parser.h @@ -29,7 +29,7 @@ /** @file parser.h * \brief Contains the parser core class Parser. */ -// Qt includes +// TQt includes #include <tqstring.h> #include <tqvaluevector.h> @@ -187,7 +187,7 @@ public: unsigned char *mem; ///< Pointer to the allocated memory for the tokens. unsigned char *mptr; ///< Pointer to the token. - QString fname; ///< Name of the function. + TQString fname; ///< Name of the function. TQString fvar; ///< Dummy variable. TQString fpar; ///< Parameter. TQString fstr; ///< Function expression. diff --git a/kicker-applets/mediacontrol/amarokInterface.cpp b/kicker-applets/mediacontrol/amarokInterface.cpp index f52ae4b..a89e693 100644 --- a/kicker-applets/mediacontrol/amarokInterface.cpp +++ b/kicker-applets/mediacontrol/amarokInterface.cpp @@ -68,7 +68,7 @@ void AmarokInterface::myInit() void AmarokInterface::appRegistered ( const TQCString &appId ) { - if(appId.contains("amarok",false) ) + if(appId.tqcontains("amarok",false) ) { mAppId = appId; emit playerStarted(); @@ -78,7 +78,7 @@ void AmarokInterface::appRegistered ( const TQCString &appId ) void AmarokInterface::appRemoved ( const TQCString &appId ) { - if ( appId.contains("amarok",false) ) + if ( appId.tqcontains("amarok",false) ) { // is there still another amarok alive? if ( findRunningAmarok() ) @@ -146,7 +146,7 @@ void AmarokInterface::updateSlider ( ) time = 0; } emit newSliderPosition(len,time); - emit playingStatusChanged(playingStatus()); + emit playingStatusChanged(playingtqStatus()); } // Drag-n-Drop stuff ================================================================= @@ -242,7 +242,7 @@ const TQString AmarokInterface::getTrackTitle() const else { TQDataStream reply(replyData, IO_ReadOnly); - if (replyType == "TQString") + if (replyType == TQSTRING_OBJECT_NAME_STRING) { reply >> title; return title; @@ -264,7 +264,7 @@ bool AmarokInterface::findRunningAmarok() for (iterator = allApps.constBegin(); iterator != allApps.constEnd(); ++iterator) { - if ((*iterator).contains("amarok",false)) + if ((*iterator).tqcontains("amarok",false)) { if (kapp->dcopClient()->call((*iterator), "player", "interfaces()", data, replyType, replyData) ) { @@ -274,7 +274,7 @@ bool AmarokInterface::findRunningAmarok() QCStringList list; reply >> list; - if ( list.contains("AmarokPlayerInterface") ) + if ( list.tqcontains("AmarokPlayerInterface") ) { kdDebug(90200) << "mediacontrol: amarok found" << endl; mAppId = *iterator; @@ -289,7 +289,7 @@ bool AmarokInterface::findRunningAmarok() } -int AmarokInterface::playingStatus() +int AmarokInterface::playingtqStatus() { TQByteArray data, replyData; TQCString replyType; diff --git a/kicker-applets/mediacontrol/amarokInterface.h b/kicker-applets/mediacontrol/amarokInterface.h index 53f1ac6..f863208 100644 --- a/kicker-applets/mediacontrol/amarokInterface.h +++ b/kicker-applets/mediacontrol/amarokInterface.h @@ -29,6 +29,7 @@ class AmarokInterface : public PlayerInterface { Q_OBJECT + TQ_OBJECT public: AmarokInterface(); ~AmarokInterface(); @@ -47,7 +48,7 @@ class AmarokInterface : public PlayerInterface virtual void dragEnterEvent(TQDragEnterEvent* event); virtual void dropEvent(TQDropEvent* event); virtual const TQString getTrackTitle() const; - virtual int playingStatus(); + virtual int playingtqStatus(); private slots: void myInit(); diff --git a/kicker-applets/mediacontrol/configfrontend.cpp b/kicker-applets/mediacontrol/configfrontend.cpp index 4deab8b..971d4d5 100644 --- a/kicker-applets/mediacontrol/configfrontend.cpp +++ b/kicker-applets/mediacontrol/configfrontend.cpp @@ -23,7 +23,7 @@ ConfigFrontend::ConfigFrontend() : TQObject(0, 0) { - _config = new KConfig(TQString::null, true, false); + _config = new KConfig(TQString(), true, false); _ownConfig = true; } diff --git a/kicker-applets/mediacontrol/configfrontend.h b/kicker-applets/mediacontrol/configfrontend.h index b625c70..fc5f346 100644 --- a/kicker-applets/mediacontrol/configfrontend.h +++ b/kicker-applets/mediacontrol/configfrontend.h @@ -24,9 +24,10 @@ #include <kconfig.h> #include <klocale.h> -class ConfigFrontend : public QObject +class ConfigFrontend : public TQObject { Q_OBJECT + TQ_OBJECT public: ConfigFrontend(); ConfigFrontend(KConfig *); diff --git a/kicker-applets/mediacontrol/jukInterface.cpp b/kicker-applets/mediacontrol/jukInterface.cpp index be99528..533ba20 100644 --- a/kicker-applets/mediacontrol/jukInterface.cpp +++ b/kicker-applets/mediacontrol/jukInterface.cpp @@ -68,7 +68,7 @@ void JuKInterface::myInit() void JuKInterface::appRegistered ( const TQCString &appId ) { - if(appId.contains("juk",false) ) + if(appId.tqcontains("juk",false) ) { mAppId = appId; @@ -93,7 +93,7 @@ void JuKInterface::appRegistered ( const TQCString &appId ) void JuKInterface::appRemoved ( const TQCString &appId ) { - if ( appId.contains("juk",false) ) + if ( appId.tqcontains("juk",false) ) { // is there still another juk alive? if ( findRunningJuK() ) @@ -148,7 +148,7 @@ void JuKInterface::updateSlider () time = 0; } emit ( newSliderPosition(len,time) ); - emit playingStatusChanged(playingStatus()); + emit playingStatusChanged(playingtqStatus()); } // Drag-n-Drop stuff ================================================================= @@ -185,7 +185,7 @@ void JuKInterface::dropEvent(TQDropEvent* event) kdDebug(90200) << "Couldn't send drop to juk" << endl; } - // Apparently we should auto-play? + // Aptqparently we should auto-play? TQByteArray strData; TQDataStream strArg(strData, IO_WriteOnly); strArg << *fileList.begin(); @@ -265,7 +265,7 @@ const TQString JuKInterface::getTrackTitle() const replyType, replyData)) { TQDataStream reply(replyData, IO_ReadOnly); - if (replyType == "TQString") + if (replyType == TQSTRING_OBJECT_NAME_STRING) { reply >> title; return title; @@ -282,7 +282,7 @@ bool JuKInterface::findRunningJuK() for (iterator = allApps.constBegin(); iterator != allApps.constEnd(); ++iterator) { - if ((*iterator).contains("juk",false)) + if ((*iterator).tqcontains("juk",false)) { mAppId = *iterator; return true; @@ -291,7 +291,7 @@ bool JuKInterface::findRunningJuK() return false; } -int JuKInterface::playingStatus() +int JuKInterface::playingtqStatus() { TQByteArray data, replyData; TQCString replyType; diff --git a/kicker-applets/mediacontrol/jukInterface.h b/kicker-applets/mediacontrol/jukInterface.h index 55874f6..fa74fba 100644 --- a/kicker-applets/mediacontrol/jukInterface.h +++ b/kicker-applets/mediacontrol/jukInterface.h @@ -30,6 +30,7 @@ class TQProcess; class JuKInterface : public PlayerInterface { Q_OBJECT + TQ_OBJECT public: JuKInterface(); ~JuKInterface(); @@ -48,7 +49,7 @@ class JuKInterface : public PlayerInterface void dragEnterEvent(TQDragEnterEvent* event); void dropEvent(TQDropEvent* event); const TQString getTrackTitle() const; - int playingStatus(); + int playingtqStatus(); private slots: void myInit(); diff --git a/kicker-applets/mediacontrol/kscdInterface.cpp b/kicker-applets/mediacontrol/kscdInterface.cpp index fea1048..d14d609 100644 --- a/kicker-applets/mediacontrol/kscdInterface.cpp +++ b/kicker-applets/mediacontrol/kscdInterface.cpp @@ -126,7 +126,7 @@ void KsCDInterface::updateSlider() time = 0; } emit newSliderPosition(len,time); - emit playingStatusChanged(playingStatus()); + emit playingStatusChanged(playingtqStatus()); } // Drag-n-Drop stuff ================================================================= @@ -213,7 +213,7 @@ const TQString KsCDInterface::getTrackTitle() const replyType, replyData)) { TQDataStream reply(replyData, IO_ReadOnly); - if (replyType == "TQString") + if (replyType == TQSTRING_OBJECT_NAME_STRING) { reply >> title; } @@ -224,7 +224,7 @@ const TQString KsCDInterface::getTrackTitle() const replyType, replyData)) { TQDataStream reply(replyData, IO_ReadOnly); - if (replyType == "TQString") + if (replyType == TQSTRING_OBJECT_NAME_STRING) { reply >> album; } @@ -235,7 +235,7 @@ const TQString KsCDInterface::getTrackTitle() const replyType, replyData)) { TQDataStream reply(replyData, IO_ReadOnly); - if (replyType == "TQString") + if (replyType == TQSTRING_OBJECT_NAME_STRING) { reply >> artist; } @@ -256,7 +256,7 @@ const TQString KsCDInterface::getTrackTitle() const } else { - result = i18n("artist - trackname", "%1 - %2").arg(artist, title); + result = i18n("artist - trackname", "%1 - %2").tqarg(artist, title); } } } @@ -270,18 +270,18 @@ const TQString KsCDInterface::getTrackTitle() const } else { - result = i18n("(album) - trackname", "(%1) - %2").arg(artist, title); + result = i18n("(album) - trackname", "(%1) - %2").tqarg(artist, title); } } else // artist is non-empty { if(title.isEmpty()) { - result = i18n("artistname (albumname)", "%1 (%2)").arg(artist, album); + result = i18n("artistname (albumname)", "%1 (%2)").tqarg(artist, album); } else { - result = i18n("artistname (albumname) - trackname", "%1 (%2) - %3").arg(artist, album, title); + result = i18n("artistname (albumname) - trackname", "%1 (%2) - %3").tqarg(artist, album, title); } } } @@ -305,12 +305,12 @@ bool KsCDInterface::findRunningKsCD() return false; } -int KsCDInterface::playingStatus() +int KsCDInterface::playingtqStatus() { TQByteArray data, replyData; TQCString replyType; - if (kapp->dcopClient()->call(mAppId, "CDPlayer", "getStatus()", data, replyType, + if (kapp->dcopClient()->call(mAppId, "CDPlayer", "gettqStatus()", data, replyType, replyData)) { int status = 0; diff --git a/kicker-applets/mediacontrol/kscdInterface.h b/kicker-applets/mediacontrol/kscdInterface.h index 8af0d1d..2d37e42 100644 --- a/kicker-applets/mediacontrol/kscdInterface.h +++ b/kicker-applets/mediacontrol/kscdInterface.h @@ -29,6 +29,7 @@ class KsCDInterface : public PlayerInterface { Q_OBJECT + TQ_OBJECT public: KsCDInterface(); ~KsCDInterface(); @@ -47,7 +48,7 @@ class KsCDInterface : public PlayerInterface void dragEnterEvent(TQDragEnterEvent* event); void dropEvent(TQDropEvent* event); const TQString getTrackTitle() const; - int playingStatus(); + int playingtqStatus(); private slots: void myInit(); diff --git a/kicker-applets/mediacontrol/mcslider.cpp b/kicker-applets/mediacontrol/mcslider.cpp index cad953d..147dc5a 100644 --- a/kicker-applets/mediacontrol/mcslider.cpp +++ b/kicker-applets/mediacontrol/mcslider.cpp @@ -19,8 +19,8 @@ #include "mcslider.h" -MCSlider::MCSlider( Orientation orientation, TQWidget *parent, const char *name ) - : TQSlider( orientation, parent, name ) +MCSlider::MCSlider( Qt::Orientation orientation, TQWidget *tqparent, const char *name ) + : TQSlider( orientation, tqparent, name ) { setBackgroundOrigin(WidgetOrigin); setBackground(); @@ -36,17 +36,17 @@ void MCSlider::setBackground() { unsetPalette(); - if (parentWidget()->paletteBackgroundPixmap()) + if (tqparentWidget()->paletteBackgroundPixmap()) { TQPixmap pm(width(), height()); - pm.fill(parentWidget(), pos()); + pm.fill(tqparentWidget(), pos()); setPaletteBackgroundPixmap(pm); } } void MCSlider::wheelEvent(TQWheelEvent *e) { - if (e->orientation() == Horizontal) + if (e->orientation() ==Qt::Horizontal) return; if (e->state() == ShiftButton) diff --git a/kicker-applets/mediacontrol/mcslider.h b/kicker-applets/mediacontrol/mcslider.h index d58aac0..0c4a784 100644 --- a/kicker-applets/mediacontrol/mcslider.h +++ b/kicker-applets/mediacontrol/mcslider.h @@ -20,12 +20,13 @@ #include <tqslider.h> -class MCSlider : public QSlider +class MCSlider : public TQSlider { Q_OBJECT + TQ_OBJECT public: - MCSlider( Orientation orientation, TQWidget *parent, const char *name = 0 ); + MCSlider( Qt::Orientation orientation, TQWidget *tqparent, const char *name = 0 ); ~MCSlider(); void setBackground(); private: diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp index 433f52d..9068aeb 100644 --- a/kicker-applets/mediacontrol/mediacontrol.cpp +++ b/kicker-applets/mediacontrol/mediacontrol.cpp @@ -57,18 +57,18 @@ const int NO_BUTTONS = 4; extern "C" { - KDE_EXPORT KPanelApplet *init( TQWidget *parent, const TQString &configFile) + KDE_EXPORT KPanelApplet *init( TQWidget *tqparent, const TQString &configFile) { KGlobal::locale()->insertCatalogue("mediacontrol"); return new MediaControl(configFile, KPanelApplet::Normal, KPanelApplet::About | KPanelApplet::Preferences | - KPanelApplet::ReportBug, parent, "mediacontrol"); + KPanelApplet::ReportBug, tqparent, "mediacontrol"); } } // ============================================================================= -class MediaControlToolTip : public QToolTip +class MediaControlToolTip : public TQToolTip { public: MediaControlToolTip(TQWidget *widget, PlayerInterface *pl_obj) : @@ -78,7 +78,7 @@ class MediaControlToolTip : public QToolTip virtual void maybeTip(const TQPoint &pt) { TQRect rc( mWidget->rect()); - if (rc.contains(pt)) + if (rc.tqcontains(pt)) { tip ( rc, mPlayer->getTrackTitle() ); } @@ -91,9 +91,9 @@ class MediaControlToolTip : public QToolTip // ============================================================================= MediaControl::MediaControl(const TQString &configFile, Type t, int actions, - TQWidget *parent, const char *name) + TQWidget *tqparent, const char *name) : DCOPObject("MediaControl"), - KPanelApplet(configFile, t, actions, parent, name), + KPanelApplet(configFile, t, actions, tqparent, name), mInstance(new KInstance("mediacontrol")), mAboutData(new KAboutData("mediacontrol", I18N_NOOP("MediaControl"), @@ -124,7 +124,7 @@ MediaControl::MediaControl(const TQString &configFile, Type t, int actions, "tisch.crix@gmx.de", "http://www.crixensgfxcorner.de.vu/"); mAboutData->addCredit("Ulrik Mikaelsson", I18N_NOOP("Fix for Noatun-Support"), "rawler@rsn.bth.se", 0); - mAboutData->addCredit("Anthony J Moulen", I18N_NOOP("Fix for Vertical Slider"), + mAboutData->addCredit("Anthony J Moulen", I18N_NOOP("Fix forQt::Vertical Slider"), "ajmoulen@moulen.org", 0); mAboutData->addCredit("Teemu Rytilahti", I18N_NOOP("Volume Control Implementation"), "teemu.rytilahti@kde-fi.org", 0); @@ -139,7 +139,7 @@ MediaControl::MediaControl(const TQString &configFile, Type t, int actions, playpause_button = new TrayButton (this, "PLAYPAUSE"); stop_button = new TrayButton (this, "STOP"); next_button = new TrayButton (this, "NEXT"); - time_slider = new MCSlider (TQSlider::Horizontal, this, "time_slider" ); + time_slider = new MCSlider (Qt::Horizontal, this, "time_slider" ); time_slider->setRange(0,0); time_slider->setValue(0); time_slider->setTracking( false ); @@ -184,7 +184,7 @@ void MediaControl::dropEvent(TQDropEvent* event) void MediaControl::setSliderPosition(int len ,int time) { time_slider->blockSignals(true); - if(orientation() == Vertical) + if(orientation() ==Qt::Vertical) time = len - time; if (mLastLen != len) @@ -226,10 +226,10 @@ void MediaControl::disableAll() void MediaControl::slotPlayingStatusChanged(int status) { - if (mLastStatus == status) + if (mLasttqStatus == status) return; - mLastStatus = status; + mLasttqStatus = status; TQString skindir = locate("data", "mediacontrol/"+_configFrontend->theme()+"/"); switch (status) @@ -255,7 +255,7 @@ void MediaControl::slotIconChanged() if(!_configFrontend->useCustomTheme()) { prev_button->setIconSet(SmallIconSet("player_start")); - if (_player->playingStatus() == PlayerInterface::Playing) + if (_player->playingtqStatus() == PlayerInterface::Playing) playpause_button->setIconSet(SmallIconSet("player_pause")); else playpause_button->setIconSet(SmallIconSet("player_play")); @@ -318,7 +318,7 @@ void MediaControl::reportBug() // Fixing the orientation problem in qslider. void MediaControl::adjustTime(int time) { - if(orientation() == Vertical) + if(orientation() ==Qt::Vertical) emit(newJumpToTime(mLastLen - time)); else emit(newJumpToTime(time)); @@ -350,7 +350,7 @@ void MediaControl::reparseConfig() mLastLen = -1; mLastTime = -1; - mLastStatus = -1; + mLasttqStatus = -1; TQString playerString = _configFrontend->player(); @@ -413,7 +413,7 @@ void MediaControl::reparseConfig() if (TQFile(skindir+"play.png").exists()) { prev_button->setIconSet(SmallIconSet(locate("data",skindir+"prev.png"))); - if (_player->playingStatus() == PlayerInterface::Playing) + if (_player->playingtqStatus() == PlayerInterface::Playing) playpause_button->setIconSet(SmallIconSet(locate("data",skindir+"play.png"))); else playpause_button->setIconSet(SmallIconSet(locate("data",skindir+"pause.png"))); @@ -424,7 +424,7 @@ void MediaControl::reparseConfig() { KNotifyClient::event(winId(), KNotifyClient::warning, i18n("There was trouble loading theme %1. Please choose" \ - " a different theme.").arg(skindir)); + " a different theme.").tqarg(skindir)); // default to kde-icons, they have to be installed :) slotIconChanged(); @@ -461,10 +461,10 @@ void MediaControl::reparseConfig() int MediaControl::widthForHeight(int height) const { // kdDebug(90200) << "kicker height: " << height << endl; -// kdDebug(90200) << "slider needs: " << time_slider->minimumSizeHint().height() << endl; +// kdDebug(90200) << "slider needs: " << time_slider->tqminimumSizeHint().height() << endl; // slider height + button height - if ( height >= (time_slider->minimumSizeHint().height()+MC_BUTTONSIZE) ) + if ( height >= (time_slider->tqminimumSizeHint().height()+MC_BUTTONSIZE) ) { // slider UNDER buttons // (5 * button width + spaces between them); return (4*MC_BUTTONSIZE+10); @@ -483,7 +483,7 @@ int MediaControl::heightForWidth(int width) const // kdDebug(90200) << "kicker width: " << width << endl; // slider height + button height - if ( width >= (time_slider->minimumSizeHint().width()+MC_BUTTONSIZE) ) + if ( width >= (time_slider->tqminimumSizeHint().width()+MC_BUTTONSIZE) ) { // slider ASIDE icons // (5 * button width + spaces between them); return (4*MC_BUTTONSIZE+10); @@ -498,7 +498,7 @@ int MediaControl::heightForWidth(int width) const void MediaControl::mousePressEvent(TQMouseEvent* e) { - if (e->button() == TQMouseEvent::RightButton) + if (e->button() == Qt::RightButton) rmbMenu->popup(e->globalPos()); } @@ -506,8 +506,8 @@ bool MediaControl::eventFilter(TQObject *, TQEvent *e) { if (e->type() == TQEvent::MouseButtonPress) { - TQMouseEvent *me = static_cast<TQMouseEvent *>(e); - if (me->button() == TQMouseEvent::RightButton) + TQMouseEvent *me = TQT_TQMOUSEEVENT(e); + if (me->button() == Qt::RightButton) { rmbMenu->popup(me->globalPos()); return true; @@ -532,10 +532,10 @@ void MediaControl::resizeEvent( TQResizeEvent* ) // kdDebug(90200) << "resizeEvent()" << endl; int w = width(); int h = height(); - if ( orientation() == Vertical ) + if ( orientation() ==Qt::Vertical ) { // ====== VERTICAL ================================================= - time_slider->setOrientation(TQSlider::Vertical); - int slider_width = time_slider->minimumSizeHint().width(); + time_slider->setOrientation(Qt::Vertical); + int slider_width = time_slider->tqminimumSizeHint().width(); // some styles need more space for sliders than avilable in very small panels :( if ( slider_width > w ) slider_width = w; @@ -566,8 +566,8 @@ void MediaControl::resizeEvent( TQResizeEvent* ) } else // ====== HORIZONTAL =============================================== { - time_slider->setOrientation(TQSlider::Horizontal); - int slider_height = time_slider->minimumSizeHint().height(); + time_slider->setOrientation(Qt::Horizontal); + int slider_height = time_slider->tqminimumSizeHint().height(); // some styles need more space for sliders than avilable in very small panels :( if ( slider_height > h ) slider_height = h; @@ -600,8 +600,8 @@ void MediaControl::resizeEvent( TQResizeEvent* ) // Our Button ======================================================================== -TrayButton::TrayButton(TQWidget* parent, const char* name) - : SimpleButton (parent, name) +TrayButton::TrayButton(TQWidget* tqparent, const char* name) + : SimpleButton (tqparent, name) { setBackgroundMode(PaletteBackground); setBackgroundOrigin(AncestorOrigin); diff --git a/kicker-applets/mediacontrol/mediacontrol.h b/kicker-applets/mediacontrol/mediacontrol.h index c6ec47b..887ebb4 100644 --- a/kicker-applets/mediacontrol/mediacontrol.h +++ b/kicker-applets/mediacontrol/mediacontrol.h @@ -53,9 +53,10 @@ class MediaControlToolTip; class TrayButton : public SimpleButton { Q_OBJECT + TQ_OBJECT public: - TrayButton(TQWidget* parent, const char* name); + TrayButton(TQWidget* tqparent, const char* name); virtual ~TrayButton() {} void setIconSet(const TQIconSet &iconSet); }; @@ -65,6 +66,7 @@ class TrayButton : public SimpleButton class MediaControl : public KPanelApplet, virtual public MediaControlIface { Q_OBJECT + TQ_OBJECT public: MediaControl(const TQString&, Type, int ,TQWidget * = 0, const char * = 0); @@ -93,7 +95,7 @@ class MediaControl : public KPanelApplet, virtual public MediaControlIface TrayButton *stop_button; // Stop the music TrayButton *next_button; // GoTo Next Playlist-Item MCSlider *time_slider; - int mLastLen, mLastTime, mLastStatus; + int mLastLen, mLastTime, mLasttqStatus; KPopupMenu *rmbMenu; virtual void mousePressEvent(TQMouseEvent* e); diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.cpp b/kicker-applets/mediacontrol/mediacontrolconfig.cpp index 0217a25..5f5d06a 100644 --- a/kicker-applets/mediacontrol/mediacontrolconfig.cpp +++ b/kicker-applets/mediacontrol/mediacontrolconfig.cpp @@ -42,8 +42,8 @@ #include <knuminput.h> #include <kstandarddirs.h> -MediaControlConfig::MediaControlConfig( ConfigFrontend *cfg, TQWidget *parent, const char* name) -: KDialogBase( parent, name, false, i18n("MediaControl"), Ok | Apply | Cancel, Ok, false ) +MediaControlConfig::MediaControlConfig( ConfigFrontend *cfg, TQWidget *tqparent, const char* name) +: KDialogBase( tqparent, name, false, i18n("MediaControl"), Ok | Apply | Cancel, Ok, false ) { _configFrontend = cfg; if (!_configFrontend) // emergency!!! @@ -87,8 +87,8 @@ void MediaControlConfig::readSkinDir( const TQString &dir ) if (!directory.exists()) return; - const QFileInfoList *list = directory.entryInfoList(); - QFileInfoListIterator it(*list); + const TQFileInfoList *list = directory.entryInfoList(); + TQFileInfoListIterator it(*list); while ( it.current() ) { @@ -106,7 +106,7 @@ void MediaControlConfig::load() // find the playerstring from config in the playerlist and select it if found TQListBoxItem *item = 0; - item = _child->playerListBox->findItem( _configFrontend->player() ); + item = _child->playerListBox->tqfindItem( _configFrontend->player() ); if ( item ) _child->playerListBox->setCurrentItem ( item ); else @@ -118,7 +118,7 @@ void MediaControlConfig::load() _child->mWheelScrollAmount->setValue( _configFrontend->mouseWheelSpeed() ); // Select the used Theme - item = _child->themeListBox->findItem( _configFrontend->theme() ); + item = _child->themeListBox->tqfindItem( _configFrontend->theme() ); if ( item ) _child->themeListBox->setCurrentItem( item ); else diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.h b/kicker-applets/mediacontrol/mediacontrolconfig.h index 4467177..4d5c388 100644 --- a/kicker-applets/mediacontrol/mediacontrolconfig.h +++ b/kicker-applets/mediacontrol/mediacontrolconfig.h @@ -28,8 +28,9 @@ class KConfig; class MediaControlConfig: public KDialogBase { Q_OBJECT + TQ_OBJECT public: - MediaControlConfig(ConfigFrontend *cfg, TQWidget *parent = 0, const char* name = "MediaControlConfig"); + MediaControlConfig(ConfigFrontend *cfg, TQWidget *tqparent = 0, const char* name = "MediaControlConfig"); void readSkinDir(const TQString &dir); void load(); diff --git a/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui b/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui index 9f5c662..8386754 100644 --- a/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui +++ b/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui @@ -2,7 +2,7 @@ <class>MediaControlConfigWidget</class> <comment>Preferences-Dialog for MediaControl </comment> <author>Stefan Gehn <metz@gehn.net></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>MediaControlConfigWidget</cstring> </property> @@ -14,9 +14,9 @@ <height>245</height> </rect> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <property name="toolTip" stdset="0"> <string></string> @@ -34,11 +34,11 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tabGeneral</cstring> </property> @@ -49,7 +49,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>gbMediaPlayer</cstring> </property> @@ -70,7 +70,7 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -78,7 +78,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lmousewheelscrollingamount</cstring> </property> @@ -101,7 +101,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>themes</cstring> </property> @@ -112,7 +112,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>mUseThemes</cstring> </property> @@ -138,7 +138,7 @@ </sizepolicy> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -156,23 +156,23 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> </size> </property> </spacer> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>previewGroupBox</cstring> </property> <property name="title"> <string>Preview</string> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <property name="whatsThis" stdset="0"> <string>Shows you how the selected theme will look</string> @@ -187,7 +187,7 @@ <property name="spacing"> <number>2</number> </property> - <widget class="QToolButton" row="0" column="0"> + <widget class="TQToolButton" row="0" column="0"> <property name="name"> <cstring>previewPrev</cstring> </property> @@ -199,13 +199,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>18</width> <height>18</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>18</width> <height>18</height> @@ -215,7 +215,7 @@ <string><</string> </property> </widget> - <widget class="QToolButton" row="0" column="1"> + <widget class="TQToolButton" row="0" column="1"> <property name="name"> <cstring>previewPlay</cstring> </property> @@ -227,13 +227,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>18</width> <height>18</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>18</width> <height>18</height> @@ -243,7 +243,7 @@ <string>></string> </property> </widget> - <widget class="QToolButton" row="0" column="2"> + <widget class="TQToolButton" row="0" column="2"> <property name="name"> <cstring>previewPause</cstring> </property> @@ -255,13 +255,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>18</width> <height>18</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>18</width> <height>18</height> @@ -271,7 +271,7 @@ <string>o</string> </property> </widget> - <widget class="QToolButton" row="0" column="3"> + <widget class="TQToolButton" row="0" column="3"> <property name="name"> <cstring>previewStop</cstring> </property> @@ -283,13 +283,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>18</width> <height>18</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>18</width> <height>18</height> @@ -299,7 +299,7 @@ <string>O</string> </property> </widget> - <widget class="QToolButton" row="0" column="4"> + <widget class="TQToolButton" row="0" column="4"> <property name="name"> <cstring>previewNext</cstring> </property> @@ -311,13 +311,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>18</width> <height>18</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>18</width> <height>18</height> @@ -339,7 +339,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -362,10 +362,10 @@ <include location="global" impldecl="in declaration">klistview.h</include> <include location="global" impldecl="in declaration">klistbox.h</include> </includes> -<signals> +<Q_SIGNALS> <signal>toggled(bool)</signal> -</signals> -<layoutdefaults spacing="6" margin="11"/> +</Q_SIGNALS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistbox.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kicker-applets/mediacontrol/mpdInterface.cpp b/kicker-applets/mediacontrol/mpdInterface.cpp index 98ba0cb..e9be885 100644 --- a/kicker-applets/mediacontrol/mpdInterface.cpp +++ b/kicker-applets/mediacontrol/mpdInterface.cpp @@ -118,7 +118,7 @@ void MpdInterface::connected() { //kdDebug(90200) << "Connected ok\n"; emit playerStarted(); - emit playingStatusChanged(playingStatus()); + emit playingStatusChanged(playingtqStatus()); } else { @@ -137,10 +137,10 @@ void MpdInterface::connectionError(int e) switch (e) { case TQSocket::ErrConnectionRefused: - message=i18n("Connection refused to %1:%2.\nIs mpd running?").arg(hostname).arg(port); + message=i18n("Connection refused to %1:%2.\nIs mpd running?").tqarg(hostname).tqarg(port); break; case TQSocket::ErrHostNotFound: - message=i18n("Host '%1' not found.").arg(hostname); + message=i18n("Host '%1' not found.").tqarg(hostname); break; case TQSocket::ErrSocketRead: message=i18n("Error reading socket."); @@ -265,7 +265,7 @@ void MpdInterface::updateSlider() } else if (time_re.search(res)>=0) { - TQStringList timeinfo=time_re.capturedTexts(); + TQStringList timeinfo=time_re.tqcapturedTexts(); timeinfo.pop_front(); int elapsed_seconds=timeinfo.first().toInt(); timeinfo.pop_front(); @@ -298,7 +298,7 @@ void MpdInterface::jumpToTime(int sec) { if (songid_re.search(res)>=0) { - TQStringList songidinfo=songid_re.capturedTexts(); + TQStringList songidinfo=songid_re.tqcapturedTexts(); songidinfo.pop_front(); songid=songidinfo.first().toInt(); } @@ -306,7 +306,7 @@ void MpdInterface::jumpToTime(int sec) if (songid>-1) { - if (dispatch(TQString("seekid %1 %2\n").arg(songid).arg(sec).latin1())) + if (dispatch(TQString("seekid %1 %2\n").tqarg(songid).tqarg(sec).latin1())) { fetchOk(); // unlocks } @@ -316,7 +316,7 @@ void MpdInterface::jumpToTime(int sec) void MpdInterface::playpause() { reconnect(); - if (playingStatus()==Stopped ? dispatch("play\n") : dispatch("pause\n")) + if (playingtqStatus()==Stopped ? dispatch("play\n") : dispatch("pause\n")) { fetchOk(); } @@ -355,7 +355,7 @@ void MpdInterface::changeVolume(int delta) { if (volume_re.search(res)>=0) { - TQStringList info=volume_re.capturedTexts(); + TQStringList info=volume_re.tqcapturedTexts(); info.pop_front(); volume=info.first().toInt(); } @@ -366,7 +366,7 @@ void MpdInterface::changeVolume(int delta) volume+=delta; if (volume<0) volume=0; if (volume>100) volume=100; - if (dispatch(TQString("setvol %1\n").arg(volume).latin1())) + if (dispatch(TQString("setvol %1\n").tqarg(volume).latin1())) { fetchOk(); } @@ -411,7 +411,7 @@ void MpdInterface::dropEvent(TQDropEvent* event) TQRegExp id_re("Id: (.+)"); if (file.isEmpty() && file_re.search(res)>=0) { - TQStringList info=file_re.capturedTexts(); + TQStringList info=file_re.tqcapturedTexts(); info.pop_front(); // if the dropped file ends with the same name, record it if (list.front().path().endsWith(info.first())) @@ -422,7 +422,7 @@ void MpdInterface::dropEvent(TQDropEvent* event) else if (!file.isEmpty() && id_re.search(res)>=0) { // when we have the file, pick up the id (file scomes first) - TQStringList info=id_re.capturedTexts(); + TQStringList info=id_re.tqcapturedTexts(); info.pop_front(); songid=info.first().toInt(); fetchOk(); // skip to the end @@ -433,7 +433,7 @@ void MpdInterface::dropEvent(TQDropEvent* event) // found song, so lets play it if (songid>-1) { - if (dispatch((TQString("playid %1\n").arg(songid)).latin1())) + if (dispatch((TQString("playid %1\n").tqarg(songid)).latin1())) { if (fetchOk()) list.pop_front(); return; @@ -452,7 +452,7 @@ void MpdInterface::dropEvent(TQDropEvent* event) while (!path.empty()) { if (dispatch((TQString("add \"") - +path.join("/").replace("\"","\\\"") + +path.join("/").tqreplace("\"","\\\"") +TQString("\"\n")).latin1())) { if (fetchOk()) break; @@ -483,7 +483,7 @@ const TQString MpdInterface::getTrackTitle() const TQRegExp songid_re("songid: (\\d+)"); if (songid_re.search(res)>=0) { - TQStringList songidinfo=songid_re.capturedTexts(); + TQStringList songidinfo=songid_re.tqcapturedTexts(); songidinfo.pop_front(); songid=songidinfo.first().toInt(); } @@ -491,7 +491,7 @@ const TQString MpdInterface::getTrackTitle() const if (!(songid>-1)) return result; - if (!dispatch(TQString("playlistid %1\n").arg(songid).latin1())) + if (!dispatch(TQString("playlistid %1\n").tqarg(songid).latin1())) return result; TQString artist; @@ -508,31 +508,31 @@ const TQString MpdInterface::getTrackTitle() const TQRegExp file_re("file: (.+)"); if (artist_re.search(res)>=0) { - TQStringList info=artist_re.capturedTexts(); + TQStringList info=artist_re.tqcapturedTexts(); info.pop_front(); artist=info.first(); } else if (album_re.search(res)>=0) { - TQStringList info=album_re.capturedTexts(); + TQStringList info=album_re.tqcapturedTexts(); info.pop_front(); album=info.first(); } else if (title_re.search(res)>=0) { - TQStringList info=title_re.capturedTexts(); + TQStringList info=title_re.tqcapturedTexts(); info.pop_front(); title=info.first(); } else if (track_re.search(res)>=0) { - TQStringList info=track_re.capturedTexts(); + TQStringList info=track_re.tqcapturedTexts(); info.pop_front(); track=info.first(); } else if (file_re.search(res)>=0) { - TQStringList info=file_re.capturedTexts(); + TQStringList info=file_re.tqcapturedTexts(); info.pop_front(); file=info.first(); } @@ -559,15 +559,15 @@ const TQString MpdInterface::getTrackTitle() const else return album; } - return i18n("No tags: %1").arg(file); + return i18n("No tags: %1").tqarg(file); } -int MpdInterface::playingStatus() +int MpdInterface::playingtqStatus() { //kdDebug(90200) << "looking up playing status\n"; if (!dispatch("status\n")) return Stopped; - PlayingStatus status=Stopped; + PlayingtqStatus status=Stopped; TQString res; while(fetchLine(res)) { diff --git a/kicker-applets/mediacontrol/mpdInterface.h b/kicker-applets/mediacontrol/mpdInterface.h index ab95637..b7512b9 100644 --- a/kicker-applets/mediacontrol/mpdInterface.h +++ b/kicker-applets/mediacontrol/mpdInterface.h @@ -32,6 +32,7 @@ class MpdInterface : public PlayerInterface { Q_OBJECT + TQ_OBJECT public: MpdInterface(); ~MpdInterface(); @@ -50,7 +51,7 @@ class MpdInterface virtual void dragEnterEvent(TQDragEnterEvent* event); virtual void dropEvent(TQDropEvent* event); virtual const TQString getTrackTitle() const; - virtual int playingStatus(); + virtual int playingtqStatus(); void changeVolume(int delta); diff --git a/kicker-applets/mediacontrol/noatunInterface.cpp b/kicker-applets/mediacontrol/noatunInterface.cpp index c7355dc..4047eb6 100644 --- a/kicker-applets/mediacontrol/noatunInterface.cpp +++ b/kicker-applets/mediacontrol/noatunInterface.cpp @@ -66,7 +66,7 @@ void NoatunInterface::myInit() void NoatunInterface::appRegistered(const TQCString &appId) { - if (appId.contains("noatun",false)) + if (appId.tqcontains("noatun",false)) { mAppId = appId; emit playerStarted(); @@ -76,7 +76,7 @@ void NoatunInterface::appRegistered(const TQCString &appId) void NoatunInterface::appRemoved(const TQCString &appId) { - if (appId.contains("noatun",false)) + if (appId.tqcontains("noatun",false)) { // is there still another noatun alive? if (findRunningNoatun()) @@ -145,10 +145,10 @@ void NoatunInterface::updateSlider() time = 0; } emit newSliderPosition(len/1000,time/1000); - emit playingStatusChanged(playingStatus()); + emit playingStatusChanged(playingtqStatus()); } -int NoatunInterface::playingStatus() +int NoatunInterface::playingtqStatus() { TQByteArray data, replyData; TQCString replyType; @@ -220,34 +220,34 @@ void NoatunInterface::playpause() { if (!findRunningNoatun()) startPlayer("noatun"); - kapp->dcopClient()->send(mAppId, "Noatun", "playpause()", TQString::null); + kapp->dcopClient()->send(mAppId, "Noatun", "playpause()", TQString()); } void NoatunInterface::stop() { - kapp->dcopClient()->send(mAppId, "Noatun", "stop()", TQString::null); + kapp->dcopClient()->send(mAppId, "Noatun", "stop()", TQString()); } void NoatunInterface::next() { // fastForward() is noatun from kde2 - //kapp->dcopClient()->send("noatun", "Noatun", "fastForward()", TQString::null); - kapp->dcopClient()->send(mAppId, "Noatun", "forward()", TQString::null); + //kapp->dcopClient()->send("noatun", "Noatun", "fastForward()", TQString()); + kapp->dcopClient()->send(mAppId, "Noatun", "forward()", TQString()); } void NoatunInterface::prev() { - kapp->dcopClient()->send(mAppId, "Noatun", "back()", TQString::null); + kapp->dcopClient()->send(mAppId, "Noatun", "back()", TQString()); } void NoatunInterface::volumeUp() { - kapp->dcopClient()->send(mAppId, "Noatun", "volumeDown()", TQString::null); + kapp->dcopClient()->send(mAppId, "Noatun", "volumeDown()", TQString()); } void NoatunInterface::volumeDown() { - kapp->dcopClient()->send(mAppId, "Noatun", "volumeUp()", TQString::null); + kapp->dcopClient()->send(mAppId, "Noatun", "volumeUp()", TQString()); } const TQString NoatunInterface::getTrackTitle() const @@ -259,7 +259,7 @@ const TQString NoatunInterface::getTrackTitle() const replyData, false, 200)) { TQDataStream reply(replyData, IO_ReadOnly); - if (replyType == "TQString") + if (replyType == TQSTRING_OBJECT_NAME_STRING) reply >> title; } return title; @@ -273,7 +273,7 @@ bool NoatunInterface::findRunningNoatun() for (iterator = allApps.constBegin(); iterator != allApps.constEnd(); ++iterator) { - if ((*iterator).contains("noatun", false)) + if ((*iterator).tqcontains("noatun", false)) { mAppId = *iterator; return true; diff --git a/kicker-applets/mediacontrol/noatunInterface.h b/kicker-applets/mediacontrol/noatunInterface.h index 36fa21c..64f9ab9 100644 --- a/kicker-applets/mediacontrol/noatunInterface.h +++ b/kicker-applets/mediacontrol/noatunInterface.h @@ -28,6 +28,7 @@ class NoatunInterface : public PlayerInterface { Q_OBJECT + TQ_OBJECT public: NoatunInterface(); ~NoatunInterface(); @@ -48,7 +49,7 @@ class NoatunInterface : public PlayerInterface const TQString getTrackTitle() const; void appRegistered(const TQCString &appId); void appRemoved(const TQCString &appId); - int playingStatus(); + int playingtqStatus(); void myInit(void); diff --git a/kicker-applets/mediacontrol/playerInterface.h b/kicker-applets/mediacontrol/playerInterface.h index 4d7fa7c..916d387 100644 --- a/kicker-applets/mediacontrol/playerInterface.h +++ b/kicker-applets/mediacontrol/playerInterface.h @@ -21,14 +21,15 @@ #include <tqobject.h> #include <tqdragobject.h> -class PlayerInterface : public QObject +class PlayerInterface : public TQObject { Q_OBJECT + TQ_OBJECT public: PlayerInterface(); virtual ~PlayerInterface(); - enum PlayingStatus { Stopped=0, Playing, Paused }; + enum PlayingtqStatus { Stopped=0, Playing, Paused }; public slots: virtual void updateSlider()=0; // gets called on timer-timeout @@ -44,7 +45,7 @@ class PlayerInterface : public QObject virtual void dragEnterEvent(TQDragEnterEvent* event)=0; virtual void dropEvent(TQDropEvent* event)=0; virtual const TQString getTrackTitle() const=0; - virtual int playingStatus()=0; + virtual int playingtqStatus()=0; void startPlayer(const TQString &desktopname); diff --git a/kicker-applets/mediacontrol/simplebutton.cpp b/kicker-applets/mediacontrol/simplebutton.cpp index 478ca2d..8e6c8ec 100644 --- a/kicker-applets/mediacontrol/simplebutton.cpp +++ b/kicker-applets/mediacontrol/simplebutton.cpp @@ -32,8 +32,8 @@ #include <kipc.h> #include <kstandarddirs.h> -SimpleButton::SimpleButton(TQWidget *parent, const char *name) - : TQButton(parent, name), +SimpleButton::SimpleButton(TQWidget *tqparent, const char *name) + : TQButton(tqparent, name), m_highlight(false), m_orientation(Qt::Horizontal) { @@ -63,22 +63,22 @@ void SimpleButton::setOrientation(Qt::Orientation orientation) update(); } -TQSize SimpleButton::sizeHint() const +TQSize SimpleButton::tqsizeHint() const { const TQPixmap* pm = pixmap(); if (!pm) - return TQButton::sizeHint(); + return TQButton::tqsizeHint(); else return TQSize(pm->width() + KDialog::spacingHint(), pm->height() + KDialog::spacingHint()); } -TQSize SimpleButton::minimumSizeHint() const +TQSize SimpleButton::tqminimumSizeHint() const { const TQPixmap* pm = pixmap(); if (!pm) - return TQButton::minimumSizeHint(); + return TQButton::tqminimumSizeHint(); else return TQSize(pm->width(), pm->height()); } @@ -174,7 +174,7 @@ void SimpleButton::enterEvent( TQEvent *e ) { m_highlight = true; - repaint( false ); + tqrepaint( false ); TQButton::enterEvent( e ); } @@ -182,7 +182,7 @@ void SimpleButton::leaveEvent( TQEvent *e ) { m_highlight = false; - repaint( false ); + tqrepaint( false ); TQButton::enterEvent( e ); } @@ -192,20 +192,20 @@ void SimpleButton::resizeEvent( TQResizeEvent * ) } -SimpleArrowButton::SimpleArrowButton(TQWidget *parent, Qt::ArrowType arrow, const char *name) - : SimpleButton(parent, name) +SimpleArrowButton::SimpleArrowButton(TQWidget *tqparent, TQt::ArrowType arrow, const char *name) + : SimpleButton(tqparent, name) { setBackgroundOrigin(AncestorOrigin); _arrow = arrow; _inside = false; } -TQSize SimpleArrowButton::sizeHint() const +TQSize SimpleArrowButton::tqsizeHint() const { return TQSize( 12, 12 ); } -void SimpleArrowButton::setArrowType(Qt::ArrowType a) +void SimpleArrowButton::setArrowType(TQt::ArrowType a) { if (_arrow != a) { @@ -214,7 +214,7 @@ void SimpleArrowButton::setArrowType(Qt::ArrowType a) } } -Qt::ArrowType SimpleArrowButton::arrowType() const +TQt::ArrowType SimpleArrowButton::arrowType() const { return _arrow; } @@ -226,15 +226,15 @@ void SimpleArrowButton::drawButton( TQPainter *p ) TQStyle::PrimitiveElement pe = TQStyle::PE_ArrowLeft; switch (_arrow) { - case Qt::LeftArrow: pe = TQStyle::PE_ArrowLeft; break; - case Qt::RightArrow: pe = TQStyle::PE_ArrowRight; break; - case Qt::UpArrow: pe = TQStyle::PE_ArrowUp; break; - case Qt::DownArrow: pe = TQStyle::PE_ArrowDown; break; + case TQt::LeftArrow: pe = TQStyle::PE_ArrowLeft; break; + case TQt::RightArrow: pe = TQStyle::PE_ArrowRight; break; + case TQt::UpArrow: pe = TQStyle::PE_ArrowUp; break; + case TQt::DownArrow: pe = TQStyle::PE_ArrowDown; break; } int flags = TQStyle::Style_Default | TQStyle::Style_Enabled; if (isDown() || isOn()) flags |= TQStyle::Style_Down; - style().drawPrimitive(pe, p, r, colorGroup(), flags); + tqstyle().tqdrawPrimitive(pe, p, r, tqcolorGroup(), flags); } void SimpleArrowButton::enterEvent( TQEvent *e ) diff --git a/kicker-applets/mediacontrol/simplebutton.h b/kicker-applets/mediacontrol/simplebutton.h index 1ea5c7a..9b4e231 100644 --- a/kicker-applets/mediacontrol/simplebutton.h +++ b/kicker-applets/mediacontrol/simplebutton.h @@ -26,16 +26,17 @@ #include <kdemacros.h> -class KDE_EXPORT SimpleButton : public QButton +class KDE_EXPORT SimpleButton : public TQButton { Q_OBJECT + TQ_OBJECT public: - SimpleButton(TQWidget *parent, const char *name = 0); + SimpleButton(TQWidget *tqparent, const char *name = 0); void setPixmap(const TQPixmap &pix); void setOrientation(Qt::Orientation orientaton); - TQSize sizeHint() const; - TQSize minimumSizeHint() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; protected: void drawButton( TQPainter *p ); @@ -63,23 +64,24 @@ class KDE_EXPORT SimpleButton : public QButton class KDE_EXPORT SimpleArrowButton: public SimpleButton { Q_OBJECT + TQ_OBJECT public: - SimpleArrowButton(TQWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow, const char *name = 0); + SimpleArrowButton(TQWidget *tqparent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0); virtual ~SimpleArrowButton() {}; - TQSize sizeHint() const; + TQSize tqsizeHint() const; protected: virtual void enterEvent( TQEvent *e ); virtual void leaveEvent( TQEvent *e ); virtual void drawButton(TQPainter *p); - Qt::ArrowType arrowType() const; + TQt::ArrowType arrowType() const; public slots: - void setArrowType(Qt::ArrowType a); + void setArrowType(TQt::ArrowType a); private: - Qt::ArrowType _arrow; + TQt::ArrowType _arrow; bool _inside; }; diff --git a/kicker-applets/mediacontrol/xmmsInterface.cpp b/kicker-applets/mediacontrol/xmmsInterface.cpp index 7d8e236..05fc2b0 100644 --- a/kicker-applets/mediacontrol/xmmsInterface.cpp +++ b/kicker-applets/mediacontrol/xmmsInterface.cpp @@ -79,7 +79,7 @@ void XmmsInterface::updateSlider ( void ) } emit newSliderPosition(len,time); - emit playingStatusChanged(playingStatus()); + emit playingStatusChanged(playingtqStatus()); } @@ -163,7 +163,7 @@ void XmmsInterface::volumeDown() xmms_remote_set_main_volume(XMMS_SESSION, cur-1); } -int XmmsInterface::playingStatus() +int XmmsInterface::playingtqStatus() { if (xmms_remote_is_paused(XMMS_SESSION)) return Paused; diff --git a/kicker-applets/mediacontrol/xmmsInterface.h b/kicker-applets/mediacontrol/xmmsInterface.h index 34db157..59bea23 100644 --- a/kicker-applets/mediacontrol/xmmsInterface.h +++ b/kicker-applets/mediacontrol/xmmsInterface.h @@ -30,6 +30,7 @@ class XmmsInterface : public PlayerInterface { Q_OBJECT + TQ_OBJECT public: XmmsInterface(); ~XmmsInterface(); @@ -48,7 +49,7 @@ class XmmsInterface : public PlayerInterface virtual void dragEnterEvent(TQDragEnterEvent* event); virtual void dropEvent(TQDropEvent* event); virtual const TQString getTrackTitle() const; - virtual int playingStatus(); + virtual int playingtqStatus(); private: TQTimer *xmms_timer; |