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

4 files changed, 51 insertions, 50 deletions

diff --git a/noatun/modules/simple/propertiesdialog.ui b/noatun/modules/simple/propertiesdialog.ui
index 08f4f71c..875baa10 100644
--- a/noatun/modules/simple/propertiesdialog.ui
+++ b/noatun/modules/simple/propertiesdialog.ui
@@ -1,11 +1,11 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>PropertiesDialog</class>
 <author>Ewald Snel</author>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>PropertiesDialog</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -26,11 +26,11 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QTabWidget">
+        <widget class="TQTabWidget">
             <property name="name">
                 <cstring>TabWidget2</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>details</cstring>
                 </property>
@@ -47,11 +47,11 @@
                     <property name="spacing">
                         <number>6</number>
                     </property>
-                    <widget class="QLineEdit" row="0" column="2">
+                    <widget class="TQLineEdit" row="0" column="2">
                         <property name="name">
                             <cstring>nameField</cstring>
                         </property>
-                        <property name="minimumSize">
+                        <property name="tqminimumSize">
                             <size>
                                 <width>180</width>
                                 <height>0</height>
@@ -78,15 +78,15 @@
                             <enum>Horizontal</enum>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="0" column="0">
+                    <widget class="TQLabel" row="0" column="0">
                         <property name="name">
                             <cstring>iconLabel</cstring>
                         </property>
-                        <property name="alignment">
+                        <property name="tqalignment">
                             <set>AlignVCenter|AlignLeft</set>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="2" column="2">
+                    <widget class="TQLabel" row="2" column="2">
                         <property name="name">
                             <cstring>typeLabel</cstring>
                         </property>
@@ -109,7 +109,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -130,7 +130,7 @@
                             <enum>Horizontal</enum>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="2" column="0">
+                    <widget class="TQLabel" row="2" column="0">
                         <property name="name">
                             <cstring>TextLabel7_2</cstring>
                         </property>
@@ -138,24 +138,24 @@
                             <string>Type:</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="2" column="1" rowspan="4" colspan="1">
+                    <widget class="TQLabel" row="2" column="1" rowspan="4" colspan="1">
                         <property name="name">
                             <cstring>TextLabel2_2</cstring>
                         </property>
-                        <property name="minimumSize">
+                        <property name="tqminimumSize">
                             <size>
                                 <width>25</width>
                                 <height>0</height>
                             </size>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>25</width>
                                 <height>32767</height>
                             </size>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="3" column="0">
+                    <widget class="TQLabel" row="3" column="0">
                         <property name="name">
                             <cstring>TextLabel5</cstring>
                         </property>
@@ -163,7 +163,7 @@
                             <string>Length:</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="3" column="2">
+                    <widget class="TQLabel" row="3" column="2">
                         <property name="name">
                             <cstring>lengthLabel</cstring>
                         </property>
@@ -176,7 +176,7 @@
                             </sizepolicy>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="4" column="0">
+                    <widget class="TQLabel" row="4" column="0">
                         <property name="name">
                             <cstring>TextLabel6</cstring>
                         </property>
@@ -184,7 +184,7 @@
                             <string>Audio:</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="4" column="2">
+                    <widget class="TQLabel" row="4" column="2">
                         <property name="name">
                             <cstring>audioLabel</cstring>
                         </property>
@@ -197,7 +197,7 @@
                             </sizepolicy>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="5" column="0">
+                    <widget class="TQLabel" row="5" column="0">
                         <property name="name">
                             <cstring>TextLabel7</cstring>
                         </property>
@@ -205,7 +205,7 @@
                             <string>Video:</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="5" column="2">
+                    <widget class="TQLabel" row="5" column="2">
                         <property name="name">
                             <cstring>videoLabel</cstring>
                         </property>
@@ -220,7 +220,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>playobject</cstring>
                 </property>
@@ -237,17 +237,17 @@
                     <property name="spacing">
                         <number>6</number>
                     </property>
-                    <widget class="QLabel" row="0" column="0">
+                    <widget class="TQLabel" row="0" column="0">
                         <property name="name">
                             <cstring>TextLabel2</cstring>
                         </property>
-                        <property name="minimumSize">
+                        <property name="tqminimumSize">
                             <size>
                                 <width>80</width>
                                 <height>0</height>
                             </size>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>80</width>
                                 <height>32767</height>
@@ -257,12 +257,12 @@
                             <string>Description:</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="0" column="1">
+                    <widget class="TQLabel" row="0" column="1">
                         <property name="name">
                             <cstring>descriptionLabel</cstring>
                         </property>
                     </widget>
-                    <widget class="QListView" row="1" column="0" rowspan="1" colspan="2">
+                    <widget class="TQListView" row="1" column="0" rowspan="1" colspan="2">
                         <column>
                             <property name="text">
                                 <string>Capabilities</string>
@@ -281,7 +281,7 @@
                 </grid>
             </widget>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>buttonLayout</cstring>
             </property>
@@ -305,14 +305,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="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>okButton</cstring>
                     </property>
@@ -341,8 +341,8 @@
     <include location="global" impldecl="in declaration">kmimetype.h</include>
     <include location="local" impldecl="in implementation">propertiesdialog.ui.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot specifier="non virtual">setPlayObject( PlaylistItem pi, Arts::PlayObject po )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/noatun/modules/simple/propertiesdialog.ui.h b/noatun/modules/simple/propertiesdialog.ui.h
index ef6f14f9..bf106f24 100644
--- a/noatun/modules/simple/propertiesdialog.ui.h
+++ b/noatun/modules/simple/propertiesdialog.ui.h
@@ -21,14 +21,14 @@ void PropertiesDialog::setPlayObject( PlaylistItem pi, Arts::PlayObject po )
 	descriptionLabel->setText( po.description().c_str() );
 
 	// Determine capabilities
-	if (!(item = (TQCheckListItem *)capsList->findItem( "capSeek", 0 )))
+	if (!(item = (TQCheckListItem *)capsList->tqfindItem( "capSeek", 0 )))
 	{
 	    item = new TQCheckListItem( capsList, "capSeek",
 				       TQCheckListItem::CheckBox );
 	}
 	item->setOn( (ncaps & Arts::capSeek) );
 
-	if (!(item = (TQCheckListItem *)capsList->findItem( "capPause", 0 )))
+	if (!(item = (TQCheckListItem *)capsList->tqfindItem( "capPause", 0 )))
 	{
 	    item = new TQCheckListItem( capsList, "capPause",
 				       TQCheckListItem::CheckBox );
@@ -46,7 +46,7 @@ void PropertiesDialog::setPlayObject( PlaylistItem pi, Arts::PlayObject po )
     // PlaylistItem properties (name and mimetype)
     if (!pi.isNull())
     {
-	setCaption( i18n("Properties for %1").arg(pi.url().fileName()) );
+	setCaption( i18n("Properties for %1").tqarg(pi.url().fileName()) );
 
 	KSharedPtr<KMimeType> mime = KMimeType::mimeType( pi.mimetype() );
 	iconLabel->setPixmap( mime->pixmap( KIcon::Desktop, KIcon::SizeMedium ) );
diff --git a/noatun/modules/simple/userinterface.cpp b/noatun/modules/simple/userinterface.cpp
index 685b2467..591335f9 100644
--- a/noatun/modules/simple/userinterface.cpp
+++ b/noatun/modules/simple/userinterface.cpp
@@ -74,7 +74,7 @@ SimpleUI::SimpleUI()
 
     napp->player()->handleButtons();
 
-    resize( minimumSize() );
+    resize( tqminimumSize() );
 
     // Show UI and calculate video widget frame
     show();
@@ -126,10 +126,10 @@ SimpleUI::~SimpleUI()
 
 void SimpleUI::setupActions()
 {
-    KStdAction::open( napp, TQT_SLOT(fileOpen()), actionCollection(), "_file_open" );
-    new KAction( i18n("&Properties"), 0, propertiesDialog, TQT_SLOT(show()),
+    KStdAction::open( TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actionCollection(), "_file_open" );
+    new KAction( i18n("&Properties"), 0, TQT_TQOBJECT(propertiesDialog), TQT_SLOT(show()),
         actionCollection(), "_file_properties" );
-    KStdAction::quit( napp, TQT_SLOT(quit()), actionCollection(), "_file_quit");
+    KStdAction::quit( TQT_TQOBJECT(napp), TQT_SLOT(quit()), actionCollection(), "_file_quit");
 
      NoatunStdAction::playlist( actionCollection(), "view_playlist" );
     actionCollection()->insert(video->action( "half_size" ));
@@ -139,14 +139,14 @@ void SimpleUI::setupActions()
 
     actionCollection()->insert(napp->pluginActionMenu());
 
-    menubarAction = KStdAction::showMenubar(this, TQT_SLOT(showMenubar()),
+    menubarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(showMenubar()),
         actionCollection());
-    statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(showStatusbar()),
+    statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(showStatusbar()),
         actionCollection());
     NoatunStdAction::effects( actionCollection(), "effects" );
     NoatunStdAction::equalizer( actionCollection(), "equalizer" );
     NoatunStdAction::loop( actionCollection(), "loop_style" );
-    KStdAction::preferences( napp, TQT_SLOT(preferences()), actionCollection() );
+    KStdAction::preferences( TQT_TQOBJECT(napp), TQT_SLOT(preferences()), actionCollection() );
 }
 
 void SimpleUI::showMenubar()
@@ -173,7 +173,7 @@ void SimpleUI::setupCentralWidget()
     npWidget->setSpacing( 0 );
 
     positionLabel = new TQLabel( statusBar() );
-    positionLabel->setAlignment( AlignVCenter | AlignCenter );
+    positionLabel->tqsetAlignment( AlignVCenter | AlignCenter );
     positionLabel->setFixedSize( fontMetrics().size( 0, " 00:00/00:00 " ) );
     statusBar()->addWidget( positionLabel, 0, true );
 
@@ -214,7 +214,7 @@ void SimpleUI::setupCentralWidget()
     TQToolTip::add( forwButton, i18n("Forward") );
     connect( forwButton, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward()) );
 
-    slider = new L33tSlider( 0, 1000, 10, 0, L33tSlider::Horizontal, ctlFrame );
+    slider = new L33tSlider( 0, 1000, 10, 0, Qt::Horizontal, ctlFrame );
     slider->setFixedHeight( 24 );
     slider->setMinimumWidth( 100 );
     slider->setTickmarks( TQSlider::NoMarks );
@@ -238,15 +238,15 @@ void SimpleUI::setupCentralWidget()
 
     volumeLabel = new TQLabel( volumeFrame );
     volumeLabel->setText( "100%" );
-    volumeLabel->setAlignment( AlignCenter );
-    volumeLabel->setFixedSize( volumeLabel->sizeHint() );
+    volumeLabel->tqsetAlignment( AlignCenter );
+    volumeLabel->setFixedSize( volumeLabel->tqsizeHint() );
 
     TQHBox *volumeSubFrame = new TQHBox( volumeFrame );
-    volumeSlider = new L33tSlider( 0, 100, 10, 0, Vertical, volumeSubFrame );
+    volumeSlider = new L33tSlider( 0, 100, 10, 0,Qt::Vertical, volumeSubFrame );
     volumeSlider->setValue( 100 - napp->player()->volume() );
-    volumeSlider->setFixedSize( volumeSlider->sizeHint() );
+    volumeSlider->setFixedSize( volumeSlider->tqsizeHint() );
 
-    volumeFrame->resize( volumeFrame->sizeHint() );
+    volumeFrame->resize( volumeFrame->tqsizeHint() );
 
     connect( volumeSlider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(slotVolumeSliderMoved(int)) );
     connect( volumeSlider, TQT_SIGNAL(userChanged(int)), TQT_SLOT(slotVolumeSliderMoved(int)) );
@@ -254,7 +254,7 @@ void SimpleUI::setupCentralWidget()
 
     setCentralWidget( npWidget );
 
-    video->setMinimumSize( minimumSizeHint().width(), 1 );
+    video->setMinimumSize( tqminimumSizeHint().width(), 1 );
 
     // Create properties dialog
     propertiesDialog = new PropertiesDialog( this );
diff --git a/noatun/modules/simple/userinterface.h b/noatun/modules/simple/userinterface.h
index e3a84f84..251471ee 100644
--- a/noatun/modules/simple/userinterface.h
+++ b/noatun/modules/simple/userinterface.h
@@ -28,6 +28,7 @@
 class SimpleUI : public KMainWindow, public UserInterface
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     SimpleUI();