Rename a number of classes to enhance compatibility with KDE4

8 files changed, 62 insertions, 62 deletions

diff --git a/tdemid/channelview.cpp b/tdemid/channelview.cpp
index d97fdee9..3bc76c25 100644
--- a/tdemid/channelview.cpp
+++ b/tdemid/channelview.cpp
@@ -31,7 +31,7 @@
 #include <tdeconfig.h>
 
 
-ChannelView::ChannelView(void) : KMainWindow(0, "ChannelView")
+ChannelView::ChannelView(void) : TDEMainWindow(0, "ChannelView")
 {
     setCaption(i18n("Channel View"));
     for (int i=0;i<16;i++)
diff --git a/tdemid/channelview.h b/tdemid/channelview.h
index 9ef7301e..a7d6e32d 100644
--- a/tdemid/channelview.h
+++ b/tdemid/channelview.h
@@ -30,7 +30,7 @@
 #include "channel.h"
 
 
-class ChannelView : public KMainWindow
+class ChannelView : public TDEMainWindow
 {
     Q_OBJECT
   
diff --git a/tdemid/history.txt b/tdemid/history.txt
index 896bdeb1..4c19dd76 100644
--- a/tdemid/history.txt
+++ b/tdemid/history.txt
@@ -361,7 +361,7 @@ Saturday 15-8-98
  I've finished the changing instrument feature and so the channel view.
  I've also improved speed a little by supressing some parses to the midi file.
  I have improved consoletdemid, now it is much more usuable.
- Finally, I've changed the sources to use the KAccel class.
+ Finally, I've changed the sources to use the TDEAccel class.
 
 Monday 31-8-98
 - I've fixed some bugs, the most important one being that tdemid left its player
diff --git a/tdemid/tdemid_part.cpp b/tdemid/tdemid_part.cpp
index d6e22474..e85281e1 100644
--- a/tdemid/tdemid_part.cpp
+++ b/tdemid/tdemid_part.cpp
@@ -77,20 +77,20 @@ TDEInstance *KMidFactory::instance()
   setWidget(widget);
 
   // create and connect our actions
-   (void)new KAction(i18n("Play"), "player_play", 0, this,
+   (void)new TDEAction(i18n("Play"), "player_play", 0, this,
       TQT_SLOT(slotPlay()), actionCollection(),
       "play");
 
-   (void)new KAction(i18n("Stop"), "player_stop", 0, this,
+   (void)new TDEAction(i18n("Stop"), "player_stop", 0, this,
       TQT_SLOT(slotStop()), actionCollection(),
       "stop");
 
-   (void)new KAction(i18n("Backward"),
+   (void)new TDEAction(i18n("Backward"),
       "2leftarrow", 0, this,
       TQT_SLOT(slotBackward()), actionCollection(),
       "backward");
 
-   (void)new KAction(i18n("Forward"),
+   (void)new TDEAction(i18n("Forward"),
         "2rightarrow", 0, this,
       TQT_SLOT(slotForward()), actionCollection(),
       "forward");
diff --git a/tdemid/tdemidclient.cpp b/tdemid/tdemidclient.cpp
index 07edf700..3450dbf2 100644
--- a/tdemid/tdemidclient.cpp
+++ b/tdemid/tdemidclient.cpp
@@ -65,7 +65,7 @@
 //#define TEMPHACK
 
 
-tdemidClient::tdemidClient(TQWidget *parent, KActionCollection *ac, const char *name)
+tdemidClient::tdemidClient(TQWidget *parent, TDEActionCollection *ac, const char *name)
     :  DCOPObject("KMidIface"), TQWidget(parent,name)
 {
     actionCollection=ac;
@@ -1576,15 +1576,15 @@ void tdemidClient::setTempo(int i)
 }
 void tdemidClient::setSongEncoding( int i )
 {
-   KListAction *tmplistaction=
-    ((KListAction*)actionCollection->action("file_type"));
+   TDEListAction *tmplistaction=
+    ((TDEListAction*)actionCollection->action("file_type"));
 
   tmplistaction->setCurrentItem(i);
 }
 void tdemidClient::setLyricEvents( int i )
 {
-   KListAction *tmplistaction=
-    ((KListAction*)actionCollection->action("display_events"));
+   TDEListAction *tmplistaction=
+    ((TDEListAction*)actionCollection->action("display_events"));
   tmplistaction->setCurrentItem(i);
 }
 void tdemidClient::setCurrentSong(int i)
@@ -1594,7 +1594,7 @@ void tdemidClient::setCurrentSong(int i)
 }
 void tdemidClient::setPlayListMode(int i)
 {
-  ((KListAction*)actionCollection->action("play_order"))->setCurrentItem(i);
+  ((TDEListAction*)actionCollection->action("play_order"))->setCurrentItem(i);
 }
 void tdemidClient::slotSelectEncoding(int i)
 {
diff --git a/tdemid/tdemidclient.h b/tdemid/tdemidclient.h
index 5a6ee79b..65fa4e36 100644
--- a/tdemid/tdemidclient.h
+++ b/tdemid/tdemidclient.h
@@ -96,7 +96,7 @@ private:
     int *collectionplaylist; // the list of songs ordered in the
 				// user selected mode
 
-    class KActionCollection *actionCollection;
+    class TDEActionCollection *actionCollection;
    
     void generateCPL(void);
     int searchInCPL(int song); // Returns the index of song
@@ -106,7 +106,7 @@ private:
     int openFile(const char *filename);
     void allNotesOff(void);
 public:
-    tdemidClient(TQWidget *parent, KActionCollection *ac, const char *name=0);
+    tdemidClient(TQWidget *parent, TDEActionCollection *ac, const char *name=0);
     ~tdemidClient();
 
     char *midiFileName(void) {return midifile_opened;};
diff --git a/tdemid/tdemidframe.cpp b/tdemid/tdemidframe.cpp
index edcfbfe0..2b340131 100644
--- a/tdemid/tdemidframe.cpp
+++ b/tdemid/tdemidframe.cpp
@@ -59,14 +59,14 @@
 #include "version.h"
 
 tdemidFrame::tdemidFrame(const char *name)
-    :KMainWindow(0, name)
+    :TDEMainWindow(0, name)
 {
     tdemidclient=new tdemidClient(this,actionCollection(), "KMidClient");
     tdemidclient->setSongType(1);
     tdemidclient->show();
     setCentralWidget( tdemidclient );
 /*
-    kKeysAccel=new KAccel(this);
+    kKeysAccel=new TDEAccel(this);
     kKeysAccel->insertItem(i18n("Play/Pause"),"Play/Pause", Key_Space);
     kKeysAccel->connectItem("Play/Pause", TQT_TQOBJECT(this), TQT_SLOT(spacePressed()));
     kKeysAccel->insertItem(i18n("Stop"),"Stop", Key_Backspace);
@@ -87,52 +87,52 @@ tdemidFrame::tdemidFrame(const char *name)
     kKeysAccel->readSettings();
 */
     KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(file_Open()), actionCollection());
-    (void)new KAction(i18n("&Save Lyrics..."), 0, TQT_TQOBJECT(this),
+    (void)new TDEAction(i18n("&Save Lyrics..."), 0, TQT_TQOBJECT(this),
 	TQT_SLOT(file_SaveLyrics()), actionCollection(), "file_save_lyrics");
     KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
 
-    (void)new KAction(i18n("&Play"), "player_play", TQt::Key_Space,
+    (void)new TDEAction(i18n("&Play"), "player_play", TQt::Key_Space,
 		TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotPlay()), actionCollection(), "song_play");
-    (void)new KAction(i18n("P&ause"), "player_pause", TQt::Key_P, TQT_TQOBJECT(tdemidclient),
+    (void)new TDEAction(i18n("P&ause"), "player_pause", TQt::Key_P, TQT_TQOBJECT(tdemidclient),
 			TQT_SLOT(slotPause()), actionCollection(), "song_pause");
-    (void)new KAction(i18n("&Stop"), "player_stop", TQt::Key_Backspace,
+    (void)new TDEAction(i18n("&Stop"), "player_stop", TQt::Key_Backspace,
 		TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotStop()), actionCollection(), "song_stop");
 
-    (void)new KAction(i18n("P&revious Song"), "player_start", Key_Left,
+    (void)new TDEAction(i18n("P&revious Song"), "player_start", Key_Left,
 		TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotPrevSong()), actionCollection(),
 		"song_previous");
-    (void)new KAction(i18n("&Next Song"), "player_end", Key_Right,
+    (void)new TDEAction(i18n("&Next Song"), "player_end", Key_Right,
 		TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotNextSong()), actionCollection(),
 		"song_next");
-    (void)new KToggleAction(i18n("&Loop"), 0, TQT_TQOBJECT(this), TQT_SLOT(song_Loop()),
+    (void)new TDEToggleAction(i18n("&Loop"), 0, TQT_TQOBJECT(this), TQT_SLOT(song_Loop()),
 		actionCollection(), "song_loop");
 
-    (void)new KAction(i18n("Rewind"), "2leftarrow", 0, TQT_TQOBJECT(tdemidclient),
+    (void)new TDEAction(i18n("Rewind"), "2leftarrow", 0, TQT_TQOBJECT(tdemidclient),
 		TQT_SLOT(slotRewind()), actionCollection(), "song_rewind");
 
-    (void)new KAction(i18n("Forward"), "2rightarrow", 0, TQT_TQOBJECT(tdemidclient),
+    (void)new TDEAction(i18n("Forward"), "2rightarrow", 0, TQT_TQOBJECT(tdemidclient),
 		TQT_SLOT(slotForward()), actionCollection(), "song_forward");
 
-    (void)new KAction(i18n("&Organize..."), 0, TQT_TQOBJECT(this), TQT_SLOT(collect_organize()),
+    (void)new TDEAction(i18n("&Organize..."), 0, TQT_TQOBJECT(this), TQT_SLOT(collect_organize()),
 		actionCollection(), "collect_organize");
 
     TQStringList playmodes;
     playmodes.append(i18n("In Order"));
     playmodes.append(i18n("Shuffle"));
 
-    KSelectAction *act=new KSelectAction(i18n("Play Order"), 0, /*this, TQT_SLOT(collect_PlayOrder(int)),*/
+    TDESelectAction *act=new TDESelectAction(i18n("Play Order"), 0, /*this, TQT_SLOT(collect_PlayOrder(int)),*/
                       actionCollection(), "play_order");
     connect(act,TQT_SIGNAL(activated(int)),this, TQT_SLOT(collect_PlayOrder(int)));
     act->setItems(playmodes);
 
-    (void)new KToggleAction(i18n("Auto-Add to Collection"), 0, TQT_TQOBJECT(this),
+    (void)new TDEToggleAction(i18n("Auto-Add to Collection"), 0, TQT_TQOBJECT(this),
 	TQT_SLOT(collect_AutoAdd()), actionCollection(), "collect_autoadd");
 
     playmodes.clear();
     playmodes.append(i18n("&General MIDI"));
     playmodes.append(i18n("&MT-32"));
 
-    act=new KSelectAction(i18n("File Type"), 0,/* this, TQT_SLOT(options_FileType(int)),*/
+    act=new TDESelectAction(i18n("File Type"), 0,/* this, TQT_SLOT(options_FileType(int)),*/
                       actionCollection(), "file_type");
     connect(act,TQT_SIGNAL(activated(int)),this, TQT_SLOT(options_FileType(int)));
     act->setItems(playmodes);
@@ -141,35 +141,35 @@ tdemidFrame::tdemidFrame(const char *name)
     playmodes.append(i18n("&Text Events"));
     playmodes.append(i18n("&Lyric Events"));
 
-    act=new KSelectAction(i18n("Display Events"), Key_T, /*this,
+    act=new TDESelectAction(i18n("Display Events"), Key_T, /*this,
 		TQT_SLOT(options_DisplayEvents(int)),*/ actionCollection(),
 		"display_events");
     connect(act,TQT_SIGNAL(activated(int)),this, TQT_SLOT(options_DisplayEvents(int)));
     act->setItems(playmodes);
 
-    (void)new KToggleAction(i18n("Automatic Text Chooser"), 0, TQT_TQOBJECT(this),
+    (void)new TDEToggleAction(i18n("Automatic Text Chooser"), 0, TQT_TQOBJECT(this),
 		TQT_SLOT(options_AutomaticText()), actionCollection(),
 		"option_automatictext");
 
-    KToggleAction* togact = new KToggleAction(i18n("Show &Volume Bar"), "volume",
+    TDEToggleAction* togact = new TDEToggleAction(i18n("Show &Volume Bar"), "volume",
 		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",
+    togact = new TDEToggleAction(i18n("Show &Channel View"), "piano",
 		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, TQT_TQOBJECT(this),
+    (void)new TDEAction(i18n("Channel View &Options..."), 0, TQT_TQOBJECT(this),
 		TQT_SLOT(options_ChannelViewOptions()), actionCollection(),
 		"channelview_options");
 
-    (void)new KAction(i18n("&Font Change..."), 0, TQT_TQOBJECT(this),
+    (void)new TDEAction(i18n("&Font Change..."), 0, TQT_TQOBJECT(this),
 		TQT_SLOT(options_FontChange()), actionCollection(),
 		"change_font");
 
-    (void)new KAction(i18n("MIDI &Setup..."), 0, TQT_TQOBJECT(this),
+    (void)new TDEAction(i18n("MIDI &Setup..."), 0, TQT_TQOBJECT(this),
 		TQT_SLOT(options_MidiSetup()), actionCollection(), "midi_setup");
 
 
@@ -177,38 +177,38 @@ tdemidFrame::tdemidFrame(const char *name)
 
     TDEConfig *cfg=kapp->config();
     cfg->setGroup("KMid");
-    KSelectAction *tmplistaction=
-		((KSelectAction*)actionCollection()->action("display_events"));
+    TDESelectAction *tmplistaction=
+		((TDESelectAction*)actionCollection()->action("display_events"));
 
     if (cfg->readNumEntry("TypeOfTextEvents",5)==5)
         tmplistaction->setCurrentItem(1);
     else
         tmplistaction->setCurrentItem(0);
 
-    tmplistaction=((KSelectAction*)actionCollection()->action("file_type"));
+    tmplistaction=((TDESelectAction*)actionCollection()->action("file_type"));
     if (cfg->readNumEntry("TypeOfMidiFile",0)==0)
         tmplistaction->setCurrentItem(0);
     else
         tmplistaction->setCurrentItem(1);
 
     if (cfg->readNumEntry("Loop",0)==1)
-	((KToggleAction*)actionCollection()->action("song_loop"))->setChecked(true);
+	((TDEToggleAction*)actionCollection()->action("song_loop"))->setChecked(true);
 
     if (cfg->readNumEntry("ShowVolumeBar",0)==1)
-	((KToggleAction*)actionCollection()->action("toggle_volumebar"))->setChecked(true);
+	((TDEToggleAction*)actionCollection()->action("toggle_volumebar"))->setChecked(true);
 
 
-    tmplistaction=((KSelectAction*)actionCollection()->action("play_order"));
+    tmplistaction=((TDESelectAction*)actionCollection()->action("play_order"));
     if (cfg->readNumEntry("CollectionPlayMode",0)==0)
         tmplistaction->setCurrentItem(0);
     else
         tmplistaction->setCurrentItem(1);
 
     if ((cfg->readNumEntry("AutoAddToCollection",0))==1)
-	((KToggleAction*)actionCollection()->action("collect_autoadd"))->setChecked(true);
+	((TDEToggleAction*)actionCollection()->action("collect_autoadd"))->setChecked(true);
 
     if ((cfg->readNumEntry("AutomaticTextEventChooser",1))==1)
-	((KToggleAction*)actionCollection()->action("option_automatictext"))->setChecked(true);
+	((TDEToggleAction*)actionCollection()->action("option_automatictext"))->setChecked(true);
 
     setAcceptDrops(true);
 
@@ -297,7 +297,7 @@ void tdemidFrame::song_stopPause()
   if (tdemidclient->isPaused())
   {
     //   song_Pause();
-    ((KToggleAction*)actionCollection()->action("song_pause"))->setChecked(false);
+    ((TDEToggleAction*)actionCollection()->action("song_pause"))->setChecked(false);
     tdemidclient->pause();
   }
 }
@@ -328,7 +328,7 @@ void tdemidFrame::options_AutomaticText()
 
 void tdemidFrame::options_FontChange()
 {
-  KFontDialog *kfd=new KFontDialog(this);
+  TDEFontDialog *kfd=new TDEFontDialog(this);
   TQFont font;
   font=*tdemidclient->getFont();
   kfd->getFont(font);
@@ -516,9 +516,9 @@ void tdemidFrame::rechooseTextEvent()
     int t=tdemidclient->ChooseTypeOfTextEvents();
     tdemidclient->repaintText(t);
     if (t==1)
-      ((KSelectAction*)actionCollection()->action("display_events"))->setCurrentItem(0);
+      ((TDESelectAction*)actionCollection()->action("display_events"))->setCurrentItem(0);
     else
-      ((KSelectAction*)actionCollection()->action("display_events"))->setCurrentItem(1);
+      ((TDESelectAction*)actionCollection()->action("display_events"))->setCurrentItem(1);
   }
 }
 
@@ -593,7 +593,7 @@ void tdemidFrame::options_ShowVolumeBar()
 
 void tdemidFrame::options_ShowChannelView()
 {
-  if (!((KToggleAction*)actionCollection()->action("toggle_channelview"))->isChecked())
+  if (!((TDEToggleAction*)actionCollection()->action("toggle_channelview"))->isChecked())
   {
     tdemidclient->visibleChannelView(0);
   } else
@@ -607,7 +607,7 @@ void tdemidFrame::options_ShowChannelView()
 void tdemidFrame::channelViewDestroyed()
 {
   tdemidclient->channelViewDestroyed();
-  ((KToggleAction*)actionCollection()->action("toggle_channelview"))->setChecked(false);
+  ((TDEToggleAction*)actionCollection()->action("toggle_channelview"))->setChecked(false);
 }
 
 void tdemidFrame::options_ChannelViewOptions()
@@ -638,7 +638,7 @@ void tdemidFrame::openURL( const TQString url )
 void tdemidFrame::pause()
 {
 //  tdemidclient->pause();
-  ((KAction*)actionCollection()->action("pause"))->activate();
+  ((TDEAction*)actionCollection()->action("pause"))->activate();
 }
 
 void tdemidFrame::stop()
@@ -673,7 +673,7 @@ void tdemidFrame::nextSong()
 
 void tdemidFrame::setSongLoop(int i)
 {
-  ((KToggleAction*)actionCollection()->action("song_loop"))->setChecked(i!=0);
+  ((TDEToggleAction*)actionCollection()->action("song_loop"))->setChecked(i!=0);
 }
 
 void tdemidFrame::setVolume(int i)
@@ -688,16 +688,16 @@ void tdemidFrame::setTempo(int i)
 
 void tdemidFrame::setSongType( int i )
 {
-  KSelectAction *tmplistaction=
-    ((KSelectAction*)actionCollection()->action("file_type"));
+  TDESelectAction *tmplistaction=
+    ((TDESelectAction*)actionCollection()->action("file_type"));
 
   tmplistaction->setCurrentItem(i);
 }
 
 void tdemidFrame::setLyricEvents( int i )
 {
-  KSelectAction *tmplistaction=
-    ((KSelectAction*)actionCollection()->action("display_events"));
+  TDESelectAction *tmplistaction=
+    ((TDESelectAction*)actionCollection()->action("display_events"));
   tmplistaction->setCurrentItem(i);
 }
 
@@ -714,7 +714,7 @@ void tdemidFrame::setActiveCollection( int i )
 
 void tdemidFrame::setCollectionPlayMode(int i)
 {
-  ((KSelectAction*)actionCollection()->action("play_order"))->setCurrentItem(i);
+  ((TDESelectAction*)actionCollection()->action("play_order"))->setCurrentItem(i);
 }
 
 void tdemidFrame::setMidiDevice(int i)
diff --git a/tdemid/tdemidframe.h b/tdemid/tdemidframe.h
index e146762e..e181b96d 100644
--- a/tdemid/tdemidframe.h
+++ b/tdemid/tdemidframe.h
@@ -35,11 +35,11 @@
 class TDEApplication;
 class TDEConfig;
 class tdemidClient;
-class KToolBar;
+class TDEToolBar;
 class TQDragEvent;
-class KAccel;
+class TDEAccel;
 
-class KDE_EXPORT tdemidFrame : public KMainWindow
+class KDE_EXPORT tdemidFrame : public TDEMainWindow
 {
     Q_OBJECT
   
@@ -62,7 +62,7 @@ private:
     TQPopupMenu *m_options;
     TQPopupMenu *m_help;
 */
-    KAccel *kKeysAccel;
+    TDEAccel *kKeysAccel;
 protected:
     int autoAddSongToCollection(const TQString& filename=TQString(),int setactive=1);