From b1057f437bf65300831a0ccb45b920787c6b318d Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 11 Jun 2011 06:00:15 +0000 Subject: TQt4 port kdemultimedia This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kmix/viewapplet.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'kmix/viewapplet.cpp') diff --git a/kmix/viewapplet.cpp b/kmix/viewapplet.cpp index 3948e60e..b26a7374 100644 --- a/kmix/viewapplet.cpp +++ b/kmix/viewapplet.cpp @@ -20,7 +20,7 @@ #include "viewapplet.h" -// Qt +// TQt #include #include #include @@ -36,13 +36,13 @@ #include "mdwslider.h" #include "mixer.h" -ViewApplet::ViewApplet(TQWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KPanelApplet::Position position ) - : ViewBase(parent, name, TQString::null, mixer, WStyle_Customize|WStyle_NoBorder, vflags) +ViewApplet::ViewApplet(TQWidget* tqparent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KPanelApplet::Position position ) + : ViewBase(tqparent, name, TQString(), mixer, WStyle_Customize|WStyle_NoBorder, vflags) { setBackgroundOrigin(AncestorOrigin); // remove the menu bar action, that is put by the "ViewBase" constructor in _actions. //KToggleAction *m = static_cast(KStdAction::showMenubar( this, TQT_SLOT(toggleMenuBarSlot()), _actions )); - _actions->remove( KStdAction::showMenubar(this, TQT_SLOT(toggleMenuBarSlot()), _actions) ); + _actions->remove( KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(toggleMenuBarSlot()), _actions) ); if ( position == KPanelApplet::pLeft || position == KPanelApplet::pRight ) { @@ -56,11 +56,11 @@ ViewApplet::ViewApplet(TQWidget* parent, const char* name, Mixer* mixer, ViewBas if ( _viewOrientation == Qt::Horizontal ) { _layoutMDW = new TQHBoxLayout( this ); - setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); + tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); } else { _layoutMDW = new TQVBoxLayout( this ); - setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); + tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); } @@ -118,8 +118,8 @@ TQWidget* ViewApplet::add(MixDevice *md) false, // Show Mute LED false, // Show Record LED true, // Small - sliderOrientation, // Orientation - this, // parent + sliderOrientation, // Qt::Orientation + this, // tqparent this, // View widget md->name().latin1() ); @@ -139,10 +139,10 @@ void ViewApplet::constructionFinished() { } -TQSize ViewApplet::sizeHint() const { - // Basically out main layout knows very good what the sizes should be - TQSize qsz = _layoutMDW->sizeHint(); - //kdDebug(67100) << "ViewApplet::sizeHint(): NewSize is " << qsz << "\n"; +TQSize ViewApplet::tqsizeHint() const { + // Basically out main tqlayout knows very good what the sizes should be + TQSize qsz = _layoutMDW->tqsizeHint(); + //kdDebug(67100) << "ViewApplet::tqsizeHint(): NewSize is " << qsz << "\n"; return qsz; } @@ -196,7 +196,7 @@ void ViewApplet::resizeEvent(TQResizeEvent *qre) // kdDebug(67100) << "ViewApplet::resizeEvent(). SHOULD resize _layoutMDW to " << qre->size() << endl; //TQWidget::resizeEvent(qre); - // resizing changes our own sizeHint(), because we must take the new PanelSize in account. + // resizing changes our own tqsizeHint(), because we must take the new PanelSize in account. // So updateGeometry() is amust for us. updateGeometry(); } @@ -230,7 +230,7 @@ void ViewApplet::refreshVolumeLevels() { void ViewApplet::configurationUpdate() { updateGeometry(); //_layoutMDW->activate(); - constructionFinished(); // contains "_layoutMDW->activate();" + constructionFinished(); // tqcontains "_layoutMDW->activate();" emit appletContentChanged(); kdDebug(67100) << "ViewApplet::configurationUpdate()" << endl; // the following "emit" is only here to be picked up by KMixApplet, because it has to -- cgit v1.2.1