Enable compilation with TQt for Qt4 3.4.0 TP2

This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

3 files changed, 12 insertions, 12 deletions

diff --git a/kioslave/media/medianotifier/medianotifier.cpp b/kioslave/media/medianotifier/medianotifier.cpp
index b0596e31d..ad9d00db8 100644
--- a/kioslave/media/medianotifier/medianotifier.cpp
+++ b/kioslave/media/medianotifier/medianotifier.cpp
@@ -113,7 +113,7 @@ bool MediaNotifier::autostart( const KFileItem &medium )
 	TQString mimetype = medium.mimetype();
 
 	bool is_cdrom = mimetype.startsWith( "media/cd" ) || mimetype.startsWith( "media/dvd" );
-	bool is_mounted = mimetype.contains( "_mounted" );
+	bool is_mounted = mimetype.tqcontains( "_mounted" );
 	
 	// We autorun only on CD/DVD or removable disks (USB, Firewire)
 	if ( !( is_cdrom || is_mounted )
@@ -222,7 +222,7 @@ bool MediaNotifier::execAutoopen( const KFileItem &medium, const TQString &path,
 
 	// The relative path MUST NOT contain path components that
 	// refer to a parent directory ( ../ )
-	if ( relative_path.startsWith( "/" ) || relative_path.contains( "../" ) )
+	if ( relative_path.startsWith( "/" ) || relative_path.tqcontains( "../" ) )
 	{
 		return false;
 	}
@@ -369,7 +369,7 @@ void MediaNotifier::slotFreeCancel()
 
 void MediaNotifier::slotFreeFinished( KMessageBox::ButtonCode res )
 {
-    TQCheckBox *checkbox = ::qt_cast<TQCheckBox*>( m_freeDialog->child( 0, "TQCheckBox" ) );
+    TQCheckBox *checkbox = ::tqqt_cast<TQCheckBox*>( m_freeDialog->child( 0, "TQCheckBox" ) );
     if ( checkbox && checkbox->isChecked() )
         KMessageBox::saveDontShowAgainYesNo("dontagainfreespace", res);
     m_freeDialog->delayedDestruct();
diff --git a/kioslave/media/medianotifier/notificationdialog.cpp b/kioslave/media/medianotifier/notificationdialog.cpp
index 7ba172601..9913f033d 100644
--- a/kioslave/media/medianotifier/notificationdialog.cpp
+++ b/kioslave/media/medianotifier/notificationdialog.cpp
@@ -53,7 +53,7 @@ NotificationDialog::NotificationDialog( KFileItem medium, NotifierSettings *sett
 
 	updateActionsListBox();
 
-	resize( TQSize(400,400).expandedTo( minimumSizeHint() ) );
+	resize( TQSize(400,400).expandedTo( tqminimumSizeHint() ) );
 
 
 	m_actionWatcher = new KDirWatch();
diff --git a/kioslave/media/medianotifier/notificationdialogview.ui b/kioslave/media/medianotifier/notificationdialogview.ui
index f37a007b2..032ea1f10 100644
--- a/kioslave/media/medianotifier/notificationdialogview.ui
+++ b/kioslave/media/medianotifier/notificationdialogview.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>NotificationDialogView</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>NotificationDialogView</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="spacing">
             <number>15</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>layout2</cstring>
             </property>
@@ -30,7 +30,7 @@
                 <property name="spacing">
                     <number>20</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>iconLabel</cstring>
                     </property>
@@ -42,13 +42,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>64</width>
                             <height>64</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>64</width>
                             <height>64</height>
@@ -61,7 +61,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -74,7 +74,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>mimetypeLabel</cstring>
             </property>
@@ -95,7 +95,7 @@
                 <cstring>actionsList</cstring>
             </property>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>autoActionCheck</cstring>
             </property>