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

1 files changed, 29 insertions, 29 deletions

diff --git a/kmid/kmidframe.cpp b/kmid/kmidframe.cpp
index 54f9d3c5..e986a221 100644
--- a/kmid/kmidframe.cpp
+++ b/kmid/kmidframe.cpp
@@ -68,7 +68,7 @@ kmidFrame::kmidFrame(const char *name)
 /*
     kKeysAccel=new KAccel(this);
     kKeysAccel->insertItem(i18n("Play/Pause"),"Play/Pause", Key_Space);
-    kKeysAccel->connectItem("Play/Pause", this, TQT_SLOT(spacePressed()));
+    kKeysAccel->connectItem("Play/Pause", TQT_TQOBJECT(this), TQT_SLOT(spacePressed()));
     kKeysAccel->insertItem(i18n("Stop"),"Stop", Key_Backspace);
     kKeysAccel->connectItem("Stop",kmidclient,TQT_SLOT(song_Stop()));
     kKeysAccel->insertItem(i18n("Previous Song"),"Previous Song", Key_Left);
@@ -86,34 +86,34 @@ kmidFrame::kmidFrame(const char *name)
 
     kKeysAccel->readSettings();
 */
-    KStdAction::open(this, TQT_SLOT(file_Open()), actionCollection());
-    (void)new KAction(i18n("&Save Lyrics..."), 0, this,
+    KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(file_Open()), actionCollection());
+    (void)new KAction(i18n("&Save Lyrics..."), 0, TQT_TQOBJECT(this),
 	TQT_SLOT(file_SaveLyrics()), actionCollection(), "file_save_lyrics");
-    KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
+    KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
 
-    (void)new KAction(i18n("&Play"), "player_play", Qt::Key_Space,
-		kmidclient, TQT_SLOT(slotPlay()), actionCollection(), "song_play");
-    (void)new KAction(i18n("P&ause"), "player_pause", Qt::Key_P, kmidclient,
+    (void)new KAction(i18n("&Play"), "player_play", TQt::Key_Space,
+		TQT_TQOBJECT(kmidclient), TQT_SLOT(slotPlay()), actionCollection(), "song_play");
+    (void)new KAction(i18n("P&ause"), "player_pause", TQt::Key_P, TQT_TQOBJECT(kmidclient),
 			TQT_SLOT(slotPause()), actionCollection(), "song_pause");
-    (void)new KAction(i18n("&Stop"), "player_stop", Qt::Key_Backspace,
-		kmidclient, TQT_SLOT(slotStop()), actionCollection(), "song_stop");
+    (void)new KAction(i18n("&Stop"), "player_stop", TQt::Key_Backspace,
+		TQT_TQOBJECT(kmidclient), TQT_SLOT(slotStop()), actionCollection(), "song_stop");
 
     (void)new KAction(i18n("P&revious Song"), "player_start", Key_Left,
-		kmidclient, TQT_SLOT(slotPrevSong()), actionCollection(),
+		TQT_TQOBJECT(kmidclient), TQT_SLOT(slotPrevSong()), actionCollection(),
 		"song_previous");
     (void)new KAction(i18n("&Next Song"), "player_end", Key_Right,
-		kmidclient, TQT_SLOT(slotNextSong()), actionCollection(),
+		TQT_TQOBJECT(kmidclient), TQT_SLOT(slotNextSong()), actionCollection(),
 		"song_next");
-    (void)new KToggleAction(i18n("&Loop"), 0, this, TQT_SLOT(song_Loop()),
+    (void)new KToggleAction(i18n("&Loop"), 0, TQT_TQOBJECT(this), TQT_SLOT(song_Loop()),
 		actionCollection(), "song_loop");
 
-    (void)new KAction(i18n("Rewind"), "2leftarrow", 0, kmidclient,
+    (void)new KAction(i18n("Rewind"), "2leftarrow", 0, TQT_TQOBJECT(kmidclient),
 		TQT_SLOT(slotRewind()), actionCollection(), "song_rewind");
 
-    (void)new KAction(i18n("Forward"), "2rightarrow", 0, kmidclient,
+    (void)new KAction(i18n("Forward"), "2rightarrow", 0, TQT_TQOBJECT(kmidclient),
 		TQT_SLOT(slotForward()), actionCollection(), "song_forward");
 
-    (void)new KAction(i18n("&Organize..."), 0, this, TQT_SLOT(collect_organize()),
+    (void)new KAction(i18n("&Organize..."), 0, TQT_TQOBJECT(this), TQT_SLOT(collect_organize()),
 		actionCollection(), "collect_organize");
 
     TQStringList playmodes;
@@ -125,7 +125,7 @@ kmidFrame::kmidFrame(const char *name)
     connect(act,TQT_SIGNAL(activated(int)),this, TQT_SLOT(collect_PlayOrder(int)));
     act->setItems(playmodes);
 
-    (void)new KToggleAction(i18n("Auto-Add to Collection"), 0, this,
+    (void)new KToggleAction(i18n("Auto-Add to Collection"), 0, TQT_TQOBJECT(this),
 	TQT_SLOT(collect_AutoAdd()), actionCollection(), "collect_autoadd");
 
     playmodes.clear();
@@ -147,29 +147,29 @@ kmidFrame::kmidFrame(const char *name)
     connect(act,TQT_SIGNAL(activated(int)),this, TQT_SLOT(options_DisplayEvents(int)));
     act->setItems(playmodes);
 
-    (void)new KToggleAction(i18n("Automatic Text Chooser"), 0, this,
+    (void)new KToggleAction(i18n("Automatic Text Chooser"), 0, TQT_TQOBJECT(this),
 		TQT_SLOT(options_AutomaticText()), actionCollection(),
 		"option_automatictext");
 
     KToggleAction* togact = new KToggleAction(i18n("Show &Volume Bar"), "volume",
-		0, this, TQT_SLOT(options_ShowVolumeBar()), actionCollection(),
+		0, TQT_TQOBJECT(this), TQT_SLOT(options_ShowVolumeBar()), actionCollection(),
 		"toggle_volumebar");
     togact->setCheckedState(i18n("Hide &Volume Bar"));
 
     togact = new KToggleAction(i18n("Show &Channel View"), "piano",
-		0, this, TQT_SLOT(options_ShowChannelView()), actionCollection(),
+		0, TQT_TQOBJECT(this), TQT_SLOT(options_ShowChannelView()), actionCollection(),
 		"toggle_channelview");
     togact->setCheckedState(i18n("Hide &Channel View"));
 
-    (void)new KAction(i18n("Channel View &Options..."), 0, this,
+    (void)new KAction(i18n("Channel View &Options..."), 0, TQT_TQOBJECT(this),
 		TQT_SLOT(options_ChannelViewOptions()), actionCollection(),
 		"channelview_options");
 
-    (void)new KAction(i18n("&Font Change..."), 0, this,
+    (void)new KAction(i18n("&Font Change..."), 0, TQT_TQOBJECT(this),
 		TQT_SLOT(options_FontChange()), actionCollection(),
 		"change_font");
 
-    (void)new KAction(i18n("MIDI &Setup..."), 0, this,
+    (void)new KAction(i18n("MIDI &Setup..."), 0, TQT_TQOBJECT(this),
 		TQT_SLOT(options_MidiSetup()), actionCollection(), "midi_setup");
 
 
@@ -276,7 +276,7 @@ kmidFrame::~kmidFrame()
 
 void kmidFrame::file_Open()
 {
-  KURL url = KFileDialog::getOpenURL(TQString::null, "*.kar *.mid *.kar.gz *.mid.gz\n*.kar *.kar.gz\n*.mid *.mid.gz\n*",this);
+  KURL url = KFileDialog::getOpenURL(TQString(), "*.kar *.mid *.kar.gz *.mid.gz\n*.kar *.kar.gz\n*.mid *.mid.gz\n*",this);
 
   if( url.isEmpty() )
     return;
@@ -316,7 +316,7 @@ void kmidFrame::options_DisplayEvents(int i)
   cfg->setGroup("KMid");
   cfg->writeEntry("TypeOfTextEvents",(i==0)?1:5);
   cfg->sync();
-  kmidclient->repaintText((i==0)?1:5);
+  kmidclient->tqrepaintText((i==0)?1:5);
 }
 
 void kmidFrame::options_AutomaticText()
@@ -480,7 +480,7 @@ void kmidFrame::options_MidiSetup()
     kmidclient->setMidiDevice(MidiConfigDialog::selecteddevice);
     cfg->setGroup("Midimapper");
     cfg->writePathEntry("LoadFile",
-	(MidiConfigDialog::selectedmap==NULL)? TQString::null:MidiConfigDialog::selectedmap);
+	(MidiConfigDialog::selectedmap==NULL)? TQString():MidiConfigDialog::selectedmap);
     kmidclient->setMidiMapFilename(MidiConfigDialog::selectedmap);
   }
   delete dlg;
@@ -514,7 +514,7 @@ void kmidFrame::rechooseTextEvent()
   if ((cfg->readNumEntry("AutomaticTextEventChooser",1))==1)
   {
     int t=kmidclient->ChooseTypeOfTextEvents();
-    kmidclient->repaintText(t);
+    kmidclient->tqrepaintText(t);
     if (t==1)
       ((KSelectAction*)actionCollection()->action("display_events"))->setCurrentItem(0);
     else
@@ -551,7 +551,7 @@ void kmidFrame::collect_AutoAdd()
 
 void kmidFrame::file_SaveLyrics()
 {
-  KURL url = KFileDialog::getSaveURL(TQString::null,"*",this);
+  KURL url = KFileDialog::getSaveURL(TQString(),"*",this);
 
   if( url.isEmpty() )
     return;
@@ -567,8 +567,8 @@ void kmidFrame::file_SaveLyrics()
 
   if (stat(TQFile::encodeName(filename), &statbuf)!=-1)
   {
-    TQString s = i18n("File %1 already exists\nDo you want to overwrite it?").arg(filename);
-    if (KMessageBox::warningYesNo(this,s,TQString::null,i18n("Overwrite"),KStdGuiItem::cancel())==1)
+    TQString s = i18n("File %1 already exists\nDo you want to overwrite it?").tqarg(filename);
+    if (KMessageBox::warningYesNo(this,s,TQString(),i18n("Overwrite"),KStdGuiItem::cancel())==1)
       return;
   }