31 files changed, 683 insertions, 331 deletions
diff --git a/kscd/CMakeL10n.txt b/kscd/CMakeL10n.txt
index b877e6ae..6ce30ed8 100644
--- a/kscd/CMakeL10n.txt
+++ b/kscd/CMakeL10n.txt
@@ -1,3 +1,9 @@
 ##### create translation templates ##############
 
 tde_l10n_create_template( "kscd" )
+
+tde_l10n_create_template(
+    CATALOG "desktop_files/kscd-desktops/"
+    SOURCES *.desktop
+    DESTINATION "${CMAKE_SOURCE_DIR}/translations"
+)
diff --git a/kscd/CMakeLists.txt b/kscd/CMakeLists.txt
index d6f74be7..148585be 100644
--- a/kscd/CMakeLists.txt
+++ b/kscd/CMakeLists.txt
@@ -59,8 +59,23 @@ tde_add_executable( kscd AUTOMOC
 
 install( PROGRAMS workman2cddb.pl DESTINATION ${BIN_INSTALL_DIR} )
 
-install( FILES kscd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install( FILES xmcd.desktop DESTINATION ${MIME_INSTALL_DIR}/text )
+tde_create_translated_desktop(
+  SOURCE kscd.desktop
+  PO_DIR kscd-desktops
+)
+
+tde_create_translated_desktop(
+  SOURCE xmcd.desktop
+  DESTINATION ${MIME_INSTALL_DIR}/text
+  PO_DIR kscd-desktops
+)
+
 install( FILES kscd.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
+
 install( FILES kscd.profile.xml DESTINATION ${DATA_INSTALL_DIR}/profiles )
-install( FILES audiocd_play.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus )
+
+tde_create_translated_desktop(
+  SOURCE audiocd_play.desktop
+  DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus
+  PO_DIR kscd-desktops
+)
diff --git a/kscd/audiocd_play.desktop b/kscd/audiocd_play.desktop
index 1fca3f9a..35636793 100644
--- a/kscd/audiocd_play.desktop
+++ b/kscd/audiocd_play.desktop
@@ -5,51 +5,5 @@ X-TDE-Priority=TopLevel
 
 [Desktop Action Play]
 Name=Play
-Name[bg]=Старт
-Name[bn]=চালাও
-Name[br]=Seniñ
-Name[bs]=Sviraj
-Name[ca]=Reproducció
-Name[cs]=Přehrát
-Name[cy]=Chwarae
-Name[da]=Spil
-Name[de]=Abspielen
-Name[el]=Αναπαραγωγή
-Name[eo]=Ludi
-Name[et]=Esitus
-Name[fa]=پخش
-Name[fi]=Soita
-Name[fr]=Lecture
-Name[ga]=Seinn
-Name[gl]=Reproducir
-Name[he]=נגן
-Name[hu]=Lejátszás
-Name[is]=Spila
-Name[it]=Riproduci
-Name[kk]=Ойнату
-Name[km]=ចាក់
-Name[ko]=재생
-Name[lt]=Groti
-Name[mk]=Пушти
-Name[nb]=Spill
-Name[nds]=Afspelen
-Name[ne]=प्ले
-Name[nl]=Afspelen
-Name[nn]=Spel
-Name[pa]=ਵਜਾਓ
-Name[pl]=Odtwarzaj
-Name[pt]=Tocar
-Name[pt_BR]=DjPlay 
-Name[ru]=Воспроизведение
-Name[sl]=Predvajaj
-Name[sv]=Spela
-Name[ta]=தொடங்கு
-Name[th]=เล่น
-Name[tr]=Çal
-Name[uk]=Пуск
-Name[wa]=Djouwer
-Name[zh_CN]=播放
-Name[zh_HK]=播放
-Name[zh_TW]=播放
 Exec=kscd -s -caption "%c" %i %m %u
 Icon=kscd
diff --git a/kscd/bwlednum.h b/kscd/bwlednum.h
index 3b37ac38..194c5823 100644
--- a/kscd/bwlednum.h
+++ b/kscd/bwlednum.h
@@ -19,7 +19,7 @@
 
 class BW_LED_Number : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/kscd/cddaslave.c b/kscd/cddaslave.c
index 6b65c640..685023e8 100644
--- a/kscd/cddaslave.c
+++ b/kscd/cddaslave.c
@@ -258,8 +258,8 @@ wmcdda_transform(unsigned char *rawbuf, long buflen, struct cdda_block *block)
 {
 	long		i;
 	long		*buf32 = (long *)rawbuf;
-	register short	*buf16 = (short *)rawbuf;
-	register int	aval;
+	short	*buf16 = (short *)rawbuf;
+	int	aval;
 
 	/*
 	 * Loudness transformation.  Basically this is a self-adjusting
diff --git a/kscd/cddbdlg.cpp b/kscd/cddbdlg.cpp
index 40a17cbf..9fc6cbac 100644
--- a/kscd/cddbdlg.cpp
+++ b/kscd/cddbdlg.cpp
@@ -46,15 +46,15 @@ CDDBDlg::CDDBDlg( TQWidget* parent, const char* name )
   setButtonText( User1, i18n( "Upload" ) );
   setButtonText( User2, i18n( "Fetch Info" ) );
 
-  connect( this, TQT_SIGNAL( okClicked() ), TQT_SLOT( save() ) );
-  connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( upload() ) );
-  connect( this, TQT_SIGNAL( user2Clicked() ), TQT_SIGNAL( cddbQuery() ) );
-  connect( m_dlgBase, TQT_SIGNAL( play( int ) ), TQT_SIGNAL( play( int ) ) );
+  connect( this, TQ_SIGNAL( okClicked() ), TQ_SLOT( save() ) );
+  connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( upload() ) );
+  connect( this, TQ_SIGNAL( user2Clicked() ), TQ_SIGNAL( cddbQuery() ) );
+  connect( m_dlgBase, TQ_SIGNAL( play( int ) ), TQ_SIGNAL( play( int ) ) );
 
   cddbClient = new KCDDB::Client();
   cddbClient->setBlockingMode(false);
-  connect (cddbClient, TQT_SIGNAL(finished(CDDB::Result)),
-                       TQT_SLOT(submitFinished(CDDB::Result)));
+  connect (cddbClient, TQ_SIGNAL(finished(CDDB::Result)),
+                       TQ_SLOT(submitFinished(CDDB::Result)));
 }
 
 
diff --git a/kscd/cddbdlg.h b/kscd/cddbdlg.h
index b111fc27..8df7da01 100644
--- a/kscd/cddbdlg.h
+++ b/kscd/cddbdlg.h
@@ -11,7 +11,7 @@ class CDInfoDialogBase;
 
 class CDDBDlg : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/kscd/configWidget.h b/kscd/configWidget.h
index 315508b0..8bec1002 100644
--- a/kscd/configWidget.h
+++ b/kscd/configWidget.h
@@ -30,7 +30,7 @@ class SpecialComboBox;
 
 class configWidget : public configWidgetUI
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 
    public:
diff --git a/kscd/configWidgetUI.ui b/kscd/configWidgetUI.ui
index 8acca09f..14f4435b 100644
--- a/kscd/configWidgetUI.ui
+++ b/kscd/configWidgetUI.ui
@@ -445,20 +445,18 @@
     <tabstop>kcfg_DigitalPlayback</tabstop>
     <tabstop>kcfg_AudioDevice</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
     <slot>kcfg_DigitalPlayback_toggled( bool )</slot>
     <slot>kcfg_SelectEncoding_toggled(bool)</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
     <include location="global" impldecl="in implementation">knuminput.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
     <include location="global" impldecl="in implementation">kurlrequester.h</include>
     <include location="global" impldecl="in implementation">tdefontrequester.h</include>
 </includes>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
 </UI>
diff --git a/kscd/docking.cpp b/kscd/docking.cpp
index e6689b8d..3a45e71a 100644
--- a/kscd/docking.cpp
+++ b/kscd/docking.cpp
@@ -53,11 +53,11 @@ DockWidget::DockWidget( KSCD* parent, const char *name)
     // popup menu for right mouse button
     TQPopupMenu* popup = contextMenu();
 
-    popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-playback-start", TDEIcon::Small), i18n("Play/Pause"), parent, TQT_SLOT(playClicked()));
-    popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-playback-stop", TDEIcon::Small), i18n("Stop"), parent, TQT_SLOT(stopClicked()));
-    popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-skip-forward", TDEIcon::Small), i18n("Next"), parent, TQT_SLOT(nextClicked()));
-    popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-skip-backward", TDEIcon::Small), i18n("Previous"), parent, TQT_SLOT(prevClicked()));
-    popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_eject", TDEIcon::Small), i18n("Eject"), parent, TQT_SLOT(ejectClicked()));
+    popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-playback-start", TDEIcon::Small), i18n("Play/Pause"), parent, TQ_SLOT(playClicked()));
+    popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-playback-stop", TDEIcon::Small), i18n("Stop"), parent, TQ_SLOT(stopClicked()));
+    popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-skip-forward", TDEIcon::Small), i18n("Next"), parent, TQ_SLOT(nextClicked()));
+    popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-skip-backward", TDEIcon::Small), i18n("Previous"), parent, TQ_SLOT(prevClicked()));
+    popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_eject", TDEIcon::Small), i18n("Eject"), parent, TQ_SLOT(ejectClicked()));
 
     TQToolTip::add(this, kapp->aboutData()->programName());
 }
@@ -80,7 +80,7 @@ void DockWidget::createPopup(const TQString &songName, bool addButtons)
     {
         TQPushButton* backButton = new TQPushButton(m_backPix, 0, box, "popup_back");
         backButton->setFlat(true);
-        connect(backButton, TQT_SIGNAL(clicked()), m_backAction, TQT_SLOT(activate()));
+        connect(backButton, TQ_SIGNAL(clicked()), m_backAction, TQ_SLOT(activate()));
     }
 
     TQLabel* l = new TQLabel(songName, box);
@@ -90,7 +90,7 @@ void DockWidget::createPopup(const TQString &songName, bool addButtons)
     {
         TQPushButton* forwardButton = new TQPushButton(m_forwardPix, 0, box, "popup_forward");
         forwardButton->setFlat(true);
-        connect(forwardButton, TQT_SIGNAL(clicked()), m_forwardAction, TQT_SLOT(activate()));
+        connect(forwardButton, TQ_SIGNAL(clicked()), m_forwardAction, TQ_SLOT(activate()));
     }
 
     m_popup->setView(box);
@@ -120,7 +120,7 @@ void DockWidget::setToolTip(const TQString& text)
 
 void DockWidget::wheelEvent(TQWheelEvent *e)
 {
-    if (e->orientation() ==Qt::Horizontal)
+    if (e->orientation() ==TQt::Horizontal)
         return;
 
     KSCD* kscd = dynamic_cast<KSCD*>(parent());
diff --git a/kscd/docking.h b/kscd/docking.h
index b4f84b1c..481bbca7 100644
--- a/kscd/docking.h
+++ b/kscd/docking.h
@@ -45,7 +45,7 @@ class KPassivePopup;
 
 class DockWidget : public KSystemTray
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/kscd/kcompactdisc.cpp b/kscd/kcompactdisc.cpp
index e17fdaa7..5ae482d2 100644
--- a/kscd/kcompactdisc.cpp
+++ b/kscd/kcompactdisc.cpp
@@ -109,7 +109,7 @@ TDECompactDisc::TDECompactDisc(InformationMode infoMode) :
     m_trackArtists.clear();
     m_trackTitles.clear();
     m_trackStartFrames.clear();
-    connect(&timer, TQT_SIGNAL(timeout()), TQT_SLOT(timerExpired()));
+    connect(&timer, TQ_SIGNAL(timeout()), TQ_SLOT(timerExpired()));
 }
 
 TDECompactDisc::~TDECompactDisc()
diff --git a/kscd/kcompactdisc.h b/kscd/kcompactdisc.h
index 2e6830ca..e58aa7c7 100644
--- a/kscd/kcompactdisc.h
+++ b/kscd/kcompactdisc.h
@@ -46,7 +46,7 @@
 class TDECompactDisc :
     public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     enum InformationMode
diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp
index 73eb0ed4..3a8599c4 100644
--- a/kscd/kscd.cpp
+++ b/kscd/kscd.cpp
@@ -103,7 +103,7 @@ KSCD::KSCD( TQWidget *parent, const char *name )
   random_current      = random_list.begin();
 
   cddb = new KCDDB::Client();
-  connect(cddb, TQT_SIGNAL(finished(CDDB::Result)), TQT_TQOBJECT(this), TQT_SLOT(lookupCDDBDone(CDDB::Result)));
+  connect(cddb, TQ_SIGNAL(finished(CDDB::Result)), this, TQ_SLOT(lookupCDDBDone(CDDB::Result)));
 
 #if defined(BUILD_CDDA)
   audio_systems_list
@@ -124,10 +124,10 @@ KSCD::KSCD( TQWidget *parent, const char *name )
 
   // the time slider
   timeIcon->setPixmap(SmallIcon("player_time"));
-  connect(timeSlider, TQT_SIGNAL(sliderPressed()), TQT_SLOT(timeSliderPressed()));
-  connect(timeSlider, TQT_SIGNAL(sliderReleased()), TQT_SLOT(timeSliderReleased()));
-  connect(timeSlider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(timeSliderMoved(int)));
-  connect(timeSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(jumpToTime(int)));
+  connect(timeSlider, TQ_SIGNAL(sliderPressed()), TQ_SLOT(timeSliderPressed()));
+  connect(timeSlider, TQ_SIGNAL(sliderReleased()), TQ_SLOT(timeSliderReleased()));
+  connect(timeSlider, TQ_SIGNAL(sliderMoved(int)), TQ_SLOT(timeSliderMoved(int)));
+  connect(timeSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(jumpToTime(int)));
 
   // the volume slider
   volumeIcon->setPixmap(SmallIcon("player_volume"));
@@ -135,33 +135,33 @@ KSCD::KSCD( TQWidget *parent, const char *name )
   TQString str;
   str = TQString::fromUtf8( TQCString().sprintf(i18n("Vol: %02d%%").utf8(), Prefs::volume()) );
   volumelabel->setText(str);
-  connect(volumeSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(volChanged(int)));
+  connect(volumeSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(volChanged(int)));
 
   /* FIXME check for return value */
   setDevicePaths(/*Prefs::cdDevice(), Prefs::audioSystem(), Prefs::audioDevice()*/);
-  connect(m_cd, TQT_SIGNAL(trackPlaying(unsigned, unsigned)), TQT_TQOBJECT(this), TQT_SLOT(trackUpdate(unsigned, unsigned)));
-  connect(m_cd, TQT_SIGNAL(trackPaused(unsigned, unsigned)), TQT_TQOBJECT(this), TQT_SLOT(trackUpdate(unsigned, unsigned)));
-  connect(m_cd, TQT_SIGNAL(trackChanged(unsigned, unsigned)), TQT_TQOBJECT(this), TQT_SLOT(trackChanged(unsigned, unsigned)));
-  connect(m_cd, TQT_SIGNAL(discStopped()), TQT_TQOBJECT(this), TQT_SLOT(discStopped()));
-  connect(m_cd, TQT_SIGNAL(discChanged(unsigned)), TQT_TQOBJECT(this), TQT_SLOT(discChanged(unsigned)));
-  connect( &queryledtimer, TQT_SIGNAL(timeout()),  TQT_SLOT(togglequeryled()) );
-  connect( &titlelabeltimer, TQT_SIGNAL(timeout()),  TQT_SLOT(titlelabeltimeout()) );
-  connect( &cycletimer, TQT_SIGNAL(timeout()),  TQT_SLOT(cycletimeout()) );
-  connect( &jumpTrackTimer, TQT_SIGNAL(timeout()),  TQT_SLOT(jumpTracks()) );
+  connect(m_cd, TQ_SIGNAL(trackPlaying(unsigned, unsigned)), this, TQ_SLOT(trackUpdate(unsigned, unsigned)));
+  connect(m_cd, TQ_SIGNAL(trackPaused(unsigned, unsigned)), this, TQ_SLOT(trackUpdate(unsigned, unsigned)));
+  connect(m_cd, TQ_SIGNAL(trackChanged(unsigned, unsigned)), this, TQ_SLOT(trackChanged(unsigned, unsigned)));
+  connect(m_cd, TQ_SIGNAL(discStopped()), this, TQ_SLOT(discStopped()));
+  connect(m_cd, TQ_SIGNAL(discChanged(unsigned)), this, TQ_SLOT(discChanged(unsigned)));
+  connect( &queryledtimer, TQ_SIGNAL(timeout()),  TQ_SLOT(togglequeryled()) );
+  connect( &titlelabeltimer, TQ_SIGNAL(timeout()),  TQ_SLOT(titlelabeltimeout()) );
+  connect( &cycletimer, TQ_SIGNAL(timeout()),  TQ_SLOT(cycletimeout()) );
+  connect( &jumpTrackTimer, TQ_SIGNAL(timeout()),  TQ_SLOT(jumpTracks()) );
 /*
   these are always connected in base class
-  connect( playPB, TQT_SIGNAL(clicked()), TQT_SLOT(playClicked()) );
-  connect( nextPB, TQT_SIGNAL(clicked()), TQT_SLOT(nextClicked()) );
-  connect( prevPB, TQT_SIGNAL(clicked()), TQT_SLOT(prevClicked()) );
-  connect( stopPB, TQT_SIGNAL(clicked()), TQT_SLOT(stopClicked()) );
-  connect( ejectPB, TQT_SIGNAL(clicked()), TQT_SLOT(ejectClicked()) );
+  connect( playPB, TQ_SIGNAL(clicked()), TQ_SLOT(playClicked()) );
+  connect( nextPB, TQ_SIGNAL(clicked()), TQ_SLOT(nextClicked()) );
+  connect( prevPB, TQ_SIGNAL(clicked()), TQ_SLOT(prevClicked()) );
+  connect( stopPB, TQ_SIGNAL(clicked()), TQ_SLOT(stopClicked()) );
+  connect( ejectPB, TQ_SIGNAL(clicked()), TQ_SLOT(ejectClicked()) );
 */
-  connect( repeatPB, TQT_SIGNAL(clicked()), TQT_SLOT(loopClicked()) );
-  connect( songListCB, TQT_SIGNAL(activated(int)), TQT_SLOT(trackSelected(int)));
-  connect( shufflePB, TQT_SIGNAL(clicked()), TQT_SLOT(randomSelected()));
-  connect( cddbPB, TQT_SIGNAL(clicked()), TQT_SLOT(CDDialogSelected()));
-  connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_TQOBJECT(this), TQT_SLOT(setColors()));
-  connect(kapp, TQT_SIGNAL(iconChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(setIcons()));
+  connect( repeatPB, TQ_SIGNAL(clicked()), TQ_SLOT(loopClicked()) );
+  connect( songListCB, TQ_SIGNAL(activated(int)), TQ_SLOT(trackSelected(int)));
+  connect( shufflePB, TQ_SIGNAL(clicked()), TQ_SLOT(randomSelected()));
+  connect( cddbPB, TQ_SIGNAL(clicked()), TQ_SLOT(CDDialogSelected()));
+  connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(setColors()));
+  connect(kapp, TQ_SIGNAL(iconChanged(int)), this, TQ_SLOT(setIcons()));
   TQToolTip::remove(songListCB);
   TQToolTip::add(songListCB, i18n("Track list"));
 
@@ -170,24 +170,24 @@ KSCD::KSCD( TQWidget *parent, const char *name )
   m_actions = new TDEActionCollection(this);
 
   TDEAction* action;
-  action = new TDEAction(i18n("Play/Pause"), Key_P, TQT_TQOBJECT(this), TQT_SLOT(playClicked()), m_actions, "Play/Pause");
-  action = new TDEAction(i18n("Stop"), Key_S, TQT_TQOBJECT(this), TQT_SLOT(stopClicked()), m_actions, "Stop");
-  action = new TDEAction(i18n("Previous"), Key_B, TQT_TQOBJECT(this), TQT_SLOT(prevClicked()), m_actions, "Previous");
-  action = new TDEAction(i18n("Next"), Key_N, TQT_TQOBJECT(this), TQT_SLOT(nextClicked()), m_actions, "Next");
-  action = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quitClicked()), m_actions);
-  action = KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureKeys()), m_actions, "options_configure_shortcuts");
-  action = KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureGlobalKeys()), m_actions, "options_configure_globals");
-  action = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showConfig()), m_actions);
-  action = new TDEAction(i18n("Loop"), Key_L, TQT_TQOBJECT(this), TQT_SLOT(loopClicked()), m_actions, "Loop");
-  action = new TDEAction(i18n("Eject"), CTRL + Key_E, TQT_TQOBJECT(this), TQT_SLOT(ejectClicked()), m_actions, "Eject");
-  action = new TDEAction(i18n("Increase Volume"), Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(incVolume()), m_actions, "IncVolume");
+  action = new TDEAction(i18n("Play/Pause"), Key_P, this, TQ_SLOT(playClicked()), m_actions, "Play/Pause");
+  action = new TDEAction(i18n("Stop"), Key_S, this, TQ_SLOT(stopClicked()), m_actions, "Stop");
+  action = new TDEAction(i18n("Previous"), Key_B, this, TQ_SLOT(prevClicked()), m_actions, "Previous");
+  action = new TDEAction(i18n("Next"), Key_N, this, TQ_SLOT(nextClicked()), m_actions, "Next");
+  action = KStdAction::quit(this, TQ_SLOT(quitClicked()), m_actions);
+  action = KStdAction::keyBindings(this, TQ_SLOT(configureKeys()), m_actions, "options_configure_shortcuts");
+  action = KStdAction::keyBindings(this, TQ_SLOT(configureGlobalKeys()), m_actions, "options_configure_globals");
+  action = KStdAction::preferences(this, TQ_SLOT(showConfig()), m_actions);
+  action = new TDEAction(i18n("Loop"), Key_L, this, TQ_SLOT(loopClicked()), m_actions, "Loop");
+  action = new TDEAction(i18n("Eject"), CTRL + Key_E, this, TQ_SLOT(ejectClicked()), m_actions, "Eject");
+  action = new TDEAction(i18n("Increase Volume"), Key_Plus, this, TQ_SLOT(incVolume()), m_actions, "IncVolume");
   TDEShortcut increaseVolume = action->shortcut();
   increaseVolume.append( KKey( Key_Equal ) );
   action->setShortcut( increaseVolume );
-  action = new TDEAction(i18n("Decrease Volume"), Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(decVolume()), m_actions, "DecVolume");
-  action = new TDEAction(i18n("Options"), CTRL + Key_T, TQT_TQOBJECT(this), TQT_SLOT(showConfig()), m_actions, "Options");
-  action = new TDEAction(i18n("Shuffle"), Key_R, TQT_TQOBJECT(this), TQT_SLOT(randomSelected()), m_actions, "Shuffle");
-  action = new TDEAction(i18n("CDDB"), CTRL + Key_D, TQT_TQOBJECT(this), TQT_SLOT(CDDialogSelected()), m_actions, "CDDB");
+  action = new TDEAction(i18n("Decrease Volume"), Key_Minus, this, TQ_SLOT(decVolume()), m_actions, "DecVolume");
+  action = new TDEAction(i18n("Options"), CTRL + Key_T, this, TQ_SLOT(showConfig()), m_actions, "Options");
+  action = new TDEAction(i18n("Shuffle"), Key_R, this, TQ_SLOT(randomSelected()), m_actions, "Shuffle");
+  action = new TDEAction(i18n("CDDB"), CTRL + Key_D, this, TQ_SLOT(CDDialogSelected()), m_actions, "CDDB");
   
   m_actions->readShortcutSettings("Shortcuts");
   
@@ -210,7 +210,7 @@ KSCD::KSCD( TQWidget *parent, const char *name )
 
   setDocking(Prefs::docking());
 
-  setFocusPolicy(TQ_NoFocus);
+  setFocusPolicy(TQWidget::NoFocus);
 
   songListCB->setSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed);
   adjustSize();
@@ -227,25 +227,25 @@ KSCD::~KSCD()
 
 void KSCD::initGlobalShortcuts() {
 
-  m_globalAccel = new TDEGlobalAccel( TQT_TQOBJECT(this) );
+  m_globalAccel = new TDEGlobalAccel( this );
   
   //Definition of global shortcuts is based on 'local' shortcuts which follow
   //the WIN key.
   m_globalAccel->insert("Next", i18n("Next"), 0, KKey("WIN+N"), KKey("WIN+Right"),
-                        TQT_TQOBJECT(this), TQT_SLOT(nextClicked()));
+                        this, TQ_SLOT(nextClicked()));
   //NOTE: WIN+B collidates with amarok's default global shortcut.
   m_globalAccel->insert("Previous", i18n("Previous"), 0, KKey("WIN+B"), KKey("WIN+Left"),
-                        TQT_TQOBJECT(this), TQT_SLOT(prevClicked()));
+                        this, TQ_SLOT(prevClicked()));
   m_globalAccel->insert("Play/Pause", i18n("Play/Pause"), 0, KKey("WIN+P"), 0,
-                        TQT_TQOBJECT(this), TQT_SLOT(playClicked()));
+                        this, TQ_SLOT(playClicked()));
   m_globalAccel->insert("Stop", i18n("Stop"), 0, KKey("WIN+S"), 0,
-                        TQT_TQOBJECT(this), TQT_SLOT(stopClicked()));
+                        this, TQ_SLOT(stopClicked()));
   m_globalAccel->insert("IncVolume", i18n("Increase Volume"), 0, KKey("WIN+Plus"), KKey("WIN+Up"),
-                        TQT_TQOBJECT(this), TQT_SLOT(incVolume()));
+                        this, TQ_SLOT(incVolume()));
   m_globalAccel->insert("DecVolume", i18n("Decrease Volume"), 0, KKey("WIN+Minus"), KKey("WIN+Down"),
-                        TQT_TQOBJECT(this), TQT_SLOT(decVolume()));
+                        this, TQ_SLOT(decVolume()));
   m_globalAccel->insert("Shuffle", i18n("Shuffle"), 0, KKey("WIN+R"), 0,
-                        TQT_TQOBJECT(this), TQT_SLOT(incVolume()));
+                        this, TQ_SLOT(incVolume()));
   
   m_globalAccel->setConfigGroup( "GlobalShortcuts" );
   m_globalAccel->readSettings( kapp->config() );
@@ -312,7 +312,7 @@ void KSCD::drawPanel()
      trackTimeLED[u]->setLEDoffColor(Prefs::backColor());
      trackTimeLED[u]->setLEDColor(Prefs::ledColor(), Prefs::backColor());
      trackTimeLED[u]->setGeometry(2 + u * 18, D, 23,  30);
-     connect(trackTimeLED[u], TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(cycleplaytimemode()));
+     connect(trackTimeLED[u], TQ_SIGNAL(clicked()), this, TQ_SLOT(cycleplaytimemode()));
   }
 
   setLEDs(-1);
@@ -369,7 +369,7 @@ void KSCD::setupPopups()
 
     mainPopup->insertItem(i18n("Artist Information"), infoPopup);
 
-    connect( infoPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(information(int)) );
+    connect( infoPopup, TQ_SIGNAL(activated(int)), TQ_SLOT(information(int)) );
 
     KHelpMenu* helpMenu = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false);
     mainPopup->insertItem(SmallIcon("help"),i18n("&Help"), helpMenu->menu());
@@ -756,16 +756,16 @@ void KSCD::showConfig()
                 cfg->readConfig();
                 configDialog -> addPage(m, cfg, TQString("CDDB"), "application-x-cda", i18n("Configure Fetching Items"));
 
-                connect(configDialog, TQT_SIGNAL(okClicked()), m, TQT_SLOT(save()));
-                connect(configDialog, TQT_SIGNAL(applyClicked()), m, TQT_SLOT(save()));
-                connect(configDialog, TQT_SIGNAL(defaultClicked()), m, TQT_SLOT(defaults()));
+                connect(configDialog, TQ_SIGNAL(okClicked()), m, TQ_SLOT(save()));
+                connect(configDialog, TQ_SIGNAL(applyClicked()), m, TQ_SLOT(save()));
+                connect(configDialog, TQ_SIGNAL(defaultClicked()), m, TQ_SLOT(defaults()));
             }
         }
     }
 
     updateConfigDialog(confWidget);
 
-    connect(configDialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(configDone()));
+    connect(configDialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(configDone()));
     configDialog -> show();
 } // showConfig()
 
@@ -814,14 +814,14 @@ void KSCD::setDocking(bool dock)
         if (!m_dockWidget)
         {
             m_dockWidget = new DockWidget(this, "dockw");
-            connect(m_dockWidget, TQT_SIGNAL(quitSelected()), TQT_TQOBJECT(this), TQT_SLOT(quitClicked()));
+            connect(m_dockWidget, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(quitClicked()));
         }
 
         m_dockWidget->show();
-        connect(this, TQT_SIGNAL(trackChanged(const TQString&)),
-                m_dockWidget, TQT_SLOT(setToolTip(const TQString&)));
-        connect(this, TQT_SIGNAL(trackChanged(const TQString&)),
-                m_dockWidget, TQT_SLOT(createPopup(const TQString&)));
+        connect(this, TQ_SIGNAL(trackChanged(const TQString&)),
+                m_dockWidget, TQ_SLOT(setToolTip(const TQString&)));
+        connect(this, TQ_SIGNAL(trackChanged(const TQString&)),
+                m_dockWidget, TQ_SLOT(createPopup(const TQString&)));
     }
     else
     {
@@ -1155,11 +1155,11 @@ void KSCD::CDDialogSelected()
         cddialog = new CDDBDlg(this);
 
         cddialog->setData(cddbInfo, m_cd->discSignature(), playlist);
-        connect(cddialog,TQT_SIGNAL(cddbQuery()),TQT_SLOT(lookupCDDB()));
-        connect(cddialog,TQT_SIGNAL(newCDInfoStored(KCDDB::CDInfo)),
-            TQT_SLOT(setCDInfo(KCDDB::CDInfo)));
-        connect(cddialog,TQT_SIGNAL(finished()),TQT_SLOT(CDDialogDone()));
-        connect(cddialog,TQT_SIGNAL(play(int)),TQT_SLOT(trackSelected(int)));
+        connect(cddialog,TQ_SIGNAL(cddbQuery()),TQ_SLOT(lookupCDDB()));
+        connect(cddialog,TQ_SIGNAL(newCDInfoStored(KCDDB::CDInfo)),
+            TQ_SLOT(setCDInfo(KCDDB::CDInfo)));
+        connect(cddialog,TQ_SIGNAL(finished()),TQ_SLOT(CDDialogDone()));
+        connect(cddialog,TQ_SIGNAL(play(int)),TQ_SLOT(trackSelected(int)));
     }
 
     cddialog->show();
diff --git a/kscd/kscd.desktop b/kscd/kscd.desktop
index 441a3483..607564c8 100644
--- a/kscd/kscd.desktop
+++ b/kscd/kscd.desktop
@@ -1,79 +1,9 @@
 [Desktop Entry]
-GenericName=CD Player
-GenericName[af]=Cd Speler
-GenericName[ar]=مشغل الأقراص المدمجة
-GenericName[bg]=Плеър за аудио дискове
-GenericName[bn]=সিডি প্লেয়ার
-GenericName[br]=Ur c'hoarier CD
-GenericName[ca]=Reproductor de CD
-GenericName[cs]=CD přehrávač
-GenericName[cy]=Chwaraewr CD
-GenericName[da]=Cd-afspiller
-GenericName[de]=CD-Wiedergabe
-GenericName[el]=Αναπαραγωγέας CD
-GenericName[eo]=Ludilo por muzikaj lumdiskoj
-GenericName[es]=Reproductor de CDs
-GenericName[et]=CD mängija
-GenericName[eu]=CD erreproduzigailua
-GenericName[fa]=پخش‌کنندۀ دیسک فشرده
-GenericName[fi]=CD-soitin
-GenericName[fr]=Lecteur de CD audio
-GenericName[ga]=Seinnteoir Dlúthdhioscaí
-GenericName[gl]=Reproductor de CD
-GenericName[he]=נגן תקליטורים
-GenericName[hi]=सीडी प्लेयर
-GenericName[hu]=CD-lejátszó
-GenericName[is]=CD spilari
-GenericName[it]=Lettore CD
-GenericName[ja]=CD プレーヤ
-GenericName[kk]=CD ойнатқышы
-GenericName[km]=កម្មវិធីចាក់ស៊ីឌី
-GenericName[ko]=CD 재생기
-GenericName[lt]=CD grotuvas
-GenericName[lv]=CD Atskaņotājs
-GenericName[mk]=CD плеер
-GenericName[ms]=Pemain CD
-GenericName[nb]=CD-spiller
-GenericName[nds]=CD-Afspeler
-GenericName[ne]=सीडी प्लेयर
-GenericName[nl]=CD-speler
-GenericName[nn]=CD-spelar
-GenericName[pa]=CD ਪਲੇਅਰ
-GenericName[pl]=Odtwarzacz CD
-GenericName[pt]=Leitor de CDs
-GenericName[pt_BR]=Reprodutor de CDs
-GenericName[ro]=Redare CD audio
-GenericName[ru]=Проигрыватель аудиодисков
-GenericName[se]=CD-čuojaheaddji
-GenericName[sk]=CD prehrávač
-GenericName[sl]=Predvajalnik CD-jev
-GenericName[sr]=CD плејер
-GenericName[sr@Latn]=CD plejer
-GenericName[sv]=Cd-spelare
-GenericName[ta]=குறுந்தகடு இயக்கி
-GenericName[tg]=Бозингари Диски Фишурда
-GenericName[th]=โปรแกรมเล่นซีดี
-GenericName[tr]=CD Çalar
-GenericName[uk]=Програвач КД
-GenericName[uz]=Kompakt-disk pleyer
-GenericName[uz@cyrillic]=Компакт-диск плейер
-GenericName[ven]=Tshitambi tsha CD
-GenericName[wa]=Djoweu di plakes lazer
-GenericName[xh]=Umdlali We CD
-GenericName[zh_CN]=CD 播放器
-GenericName[zh_HK]=CD 播放器
-GenericName[zh_TW]=CD 播放器
-GenericName[zu]=Umdlali we CD
+
 Name=KsCD
-Name[af]=Kscd
-Name[bn]=কে-এস-সিডি
-Name[eo]=Lumdiskludilo
-Name[hi]=के-एससीडी
-Name[sv]=Kscd
-Name[ta]=Ksகுறுந்தகடு
-Name[tg]=KsДиски Фишурда
-Name[tr]=Kscd
-Name[zh_TW]=KsCD 播放器
+
+GenericName=CD Player
+
 Exec=kscd -caption "%c" %i %m
 X-DocPath=kscd/index.html
 Icon=kscd
diff --git a/kscd/kscd.h b/kscd/kscd.h
index 3fa7be5a..376a436b 100644
--- a/kscd/kscd.h
+++ b/kscd/kscd.h
@@ -71,7 +71,7 @@ typedef TQValueList<int> RandomList;
 
 class KSCD : public kscdPanelDlg, public KSessionManaged, virtual public DCOPObject {
 
-    Q_OBJECT
+    TQ_OBJECT
 //    
     K_DCOP
 
diff --git a/kscd/kscd.lsm b/kscd/kscd.lsm
deleted file mode 100644
index a9f0d611..00000000
--- a/kscd/kscd.lsm
+++ /dev/null
@@ -1,14 +0,0 @@
-Begin4
-Title:          Kscd
-Version:        R14.1.0
-Entered-date:   2010-05-10
-Description:    A simple CD Player
-Keywords:       TDE, Qt, gui, X11, CD player, sound
-Author:         <wuebben@math.cornell.edu> Bernd Johannes Wuebben
-Maintained-by:  The Trinity Desktop Environment (TDE) http://www.trinitydesktop.org/
-Primary-site:   http://git.trinitydesktop.org/cgit/
-Alternate-site:
-Original-site:  http://www.kde.org/
-Platforms:      Linux and other Unices running TDE
-Copying-policy: GPL
-End
diff --git a/kscd/kscdmagic/core.cpp b/kscd/kscdmagic/core.cpp
index 937ac8b9..1b03534f 100644
--- a/kscd/kscdmagic/core.cpp
+++ b/kscd/kscdmagic/core.cpp
@@ -116,7 +116,7 @@ inline void addPixelFast(unsigned char *p,int br1,int br2) {
 }
 
 void fadeFade() {
-  register unsigned long *ptr = (unsigned long*)ucoutput;
+  unsigned long *ptr = (unsigned long*)ucoutput;
   int i = outWidth*outHeight*2/4;
   do {
     //Bytewize version was: *(ptr++) -= *ptr+(*ptr>>1)>>4;
@@ -322,7 +322,7 @@ int coreGo() {
    
   // Asger Alstrupt's optimized 32 bit fade
   // (alstrup@diku.dk)
-  /*register unsigned long *ptr = (unsigned long*)output;
+  /*unsigned long *ptr = (unsigned long*)output;
   i = outWidth*outHeight*2/4;
   do {
     //Bytewize version was: *(ptr++) -= *ptr+(*ptr>>1)>>4;
diff --git a/kscd/kscdmagic/xlib.c b/kscd/kscdmagic/xlib.c
index b28a0650..115b89ac 100644
--- a/kscd/kscdmagic/xlib.c
+++ b/kscd/kscdmagic/xlib.c
@@ -141,7 +141,7 @@ void draw_screen(xdisplay * d)
 #ifdef MITSHM
 int alloc_shm_image(xdisplay * new)
 {
-    register char *ptr;
+    char *ptr;
     int temp, size = 0, i;
     ptr = DisplayString(new->display);
     if (!ptr || (*ptr == ':') || !strncmp(ptr, "localhost:", 10) ||
diff --git a/kscd/kscdmagic/xlibwrap.cpp b/kscd/kscdmagic/xlibwrap.cpp
index d885c727..e0ff74ba 100644
--- a/kscd/kscdmagic/xlibwrap.cpp
+++ b/kscd/kscdmagic/xlibwrap.cpp
@@ -138,24 +138,24 @@ void inputUpdate(int &mouseX,int &mouseY,int &mouseButtons,char &keyHit) {
 }
  
 void screenShow(void) { 
-  register unsigned long *ptr2 = (unsigned long*)ucoutput;
+  unsigned long *ptr2 = (unsigned long*)ucoutput;
   unsigned long *ptr1 = (unsigned long*)d->back;
   int i = outWidth*outHeight/4;
   if (lowColor)
     do {
-      register unsigned int const r1 = *(ptr2++);
-      register unsigned int const r2 = *(ptr2++);
+      unsigned int const r1 = *(ptr2++);
+      unsigned int const r2 = *(ptr2++);
     
       //if (r1 || r2) {
 #ifdef LITTLEENDIAN
-        register unsigned int const v = 
+        unsigned int const v = 
              mapping[((r1&0xe0ul)>>5)|((r1&0xe000ul)>>10)]
             |mapping[((r1&0xe00000ul)>>21)|((r1&0xe0000000ul)>>26)]*256U; 
         *(ptr1++) = v | 
              mapping[((r2&0xe0ul)>>5)|((r2&0xe000ul)>>10)]*65536U
             |mapping[((r2&0xe00000ul)>>21)|((r2&0xe0000000ul)>>26)]*16777216U; 
 #else
-        register unsigned int const v = 
+        unsigned int const v = 
              mapping[((r2&0xe0ul)>>5)|((r2&0xe000ul)>>10)]
             |mapping[((r2&0xe00000ul)>>21)|((r2&0xe0000000ul)>>26)]*256U; 
         *(ptr1++) = v | 
@@ -168,12 +168,12 @@ void screenShow(void) {
     do {
       // Asger Alstrup Nielsen's (alstrup@diku.dk)
       // optimized 32 bit screen loop
-      register unsigned int const r1 = *(ptr2++);
-      register unsigned int const r2 = *(ptr2++);
+      unsigned int const r1 = *(ptr2++);
+      unsigned int const r2 = *(ptr2++);
     
       //if (r1 || r2) {
 #ifdef LITTLEENDIAN
-        register unsigned int const v = 
+        unsigned int const v = 
             ((r1 & 0x000000f0ul) >> 4)
           | ((r1 & 0x0000f000ul) >> 8)
           | ((r1 & 0x00f00000ul) >> 12)
@@ -184,7 +184,7 @@ void screenShow(void) {
           | ((r2 & 0x00f00000ul) << 16 -12)
           | ((r2 & 0xf0000000ul) << 16 -16);
 #else
-        register unsigned int const v = 
+        unsigned int const v = 
             ((r2 & 0x000000f0ul) >> 4)
           | ((r2 & 0x0000f000ul) >> 8)
           | ((r2 & 0x00f00000ul) >> 12)
diff --git a/kscd/ledlamp.h b/kscd/ledlamp.h
index 03dece91..e9eb98cb 100644
--- a/kscd/ledlamp.h
+++ b/kscd/ledlamp.h
@@ -28,7 +28,7 @@
 
 class LedLamp : public TQFrame
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
 
diff --git a/kscd/libwm/CMakeLists.txt b/kscd/libwm/CMakeLists.txt
index 7e632701..4613f544 100644
--- a/kscd/libwm/CMakeLists.txt
+++ b/kscd/libwm/CMakeLists.txt
@@ -28,8 +28,8 @@ tde_add_library( workman STATIC_PIC
     cddb.c cdinfo.c cdrom.c wm_helpers.c cdtext.c
     database.c index.c scsi.c cdda.c plat_linux_cdda.c plat_sun_cdda.c
     plat_aix.c plat_bsd386.c plat_freebsd.c plat_hpux.c plat_irix.c
-    plat_linux.c plat_svr4.c plat_ultrix.c plat_news.c plat_openbsd.c
-    plat_osf1.c plat_sun.c plat_scor5.c
+    plat_linux.c plat_netbsd.c plat_svr4.c plat_ultrix.c plat_news.c
+    plat_openbsd.c plat_osf1.c plat_sun.c plat_scor5.c
     drv_sony.c drv_toshiba.c
   EMBED
     workmanaudio-static
diff --git a/kscd/libwm/ConfigureChecks.cmake b/kscd/libwm/ConfigureChecks.cmake
index 31ce9815..b6a12244 100644
--- a/kscd/libwm/ConfigureChecks.cmake
+++ b/kscd/libwm/ConfigureChecks.cmake
@@ -28,6 +28,7 @@ if( WITH_KSCD_CDDA AND NOT BUILD_CDDA )
 #include <linux/cdrom.h>
 #undef asm
 #undef inline
+#include <sys/ioctl.h>
 
 int main() {
   #if defined(__linux__)
diff --git a/kscd/libwm/cddaslave.c b/kscd/libwm/cddaslave.c
index b378f95d..35e14e0f 100644
--- a/kscd/libwm/cddaslave.c
+++ b/kscd/libwm/cddaslave.c
@@ -307,8 +307,8 @@ wmcdda_transform(unsigned char *rawbuf, long buflen, struct cdda_block *block)
 {
 	long		i;
 	long		*buf32 = (long *)rawbuf;
-	register short	*buf16 = (short *)rawbuf;
-	register int	aval;
+	short	*buf16 = (short *)rawbuf;
+	int	aval;
 
 	/*
 	 * Loudness transformation.  Basically this is a self-adjusting
diff --git a/kscd/libwm/database.c b/kscd/libwm/database.c
index 62d66a32..d9b17d79 100644
--- a/kscd/libwm/database.c
+++ b/kscd/libwm/database.c
@@ -1107,11 +1107,11 @@ load( void )
 /* This is some kind of profiling code. I don't change it
    to wm_lib_message() for now... */
 #ifndef NDEBUG
-	long		t1, t2;
+	time_t		t1, t2;
 	if( getenv( "WORKMAN_DEBUG" ) != NULL )
 	  {
 		time(&t1);
-		printf("%s (%d): search start = %ld\n", __FILE__, __LINE__, t1);
+		printf("%s (%d): search start = %.0f\n", __FILE__, __LINE__, difftime(t1, (time_t)0));
         fflush(stdout);
 	  }	
 #endif
@@ -1158,7 +1158,7 @@ load( void )
 	if( getenv( "WORKMAN_DEBUG" ) != NULL )
 	  {
 		time(&t2);
-		printf("%s (%d): db search end = %ld, elapsed = %ld\n", __FILE__, __LINE__, t2, t2 - t1);
+		printf("%s (%d): db search end = %.0f, elapsed = %.0f\n", __FILE__, __LINE__, difftime(t2, (time_t)0), difftime(t2, t1));
 		fflush(stdout);
 	  }	
 #endif
@@ -1192,7 +1192,7 @@ load( void )
 	if( getenv( "WORKMAN_DEBUG" ) != NULL )
 	  {
 		time(&t2);
-		printf("%s (%d): search end = %ld, elapsed = %ld\n", __FILE__, __LINE__, t2, t2 - t1);
+		printf("%s (%d): search end = %.0f, elapsed = %.0f\n", __FILE__, __LINE__, difftime(t2, (time_t)0), difftime(t2, t1));
 		fflush(stdout);
 	  }	
 #endif
diff --git a/kscd/libwm/plat_freebsd.c b/kscd/libwm/plat_freebsd.c
index a905ff5c..b400fd63 100644
--- a/kscd/libwm/plat_freebsd.c
+++ b/kscd/libwm/plat_freebsd.c
@@ -30,7 +30,7 @@
  *
  */
 
-#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__NetBSD__) || defined (__NetBSD) || defined(__DragonFly__)
+#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__DragonFly__)
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/kscd/libwm/plat_linux_cdda.c b/kscd/libwm/plat_linux_cdda.c
index 22f24a9d..dc634f3f 100644
--- a/kscd/libwm/plat_linux_cdda.c
+++ b/kscd/libwm/plat_linux_cdda.c
@@ -25,6 +25,7 @@
  * Linux CDDA functions. Derived from the SUN module.
  */
 
+#include <stdlib.h>
 #include "include/wm_cdda.h"
  
 #if defined(__linux__) && defined(BUILD_CDDA)
diff --git a/kscd/libwm/plat_netbsd.c b/kscd/libwm/plat_netbsd.c
new file mode 100644
index 00000000..2e326eb9
--- /dev/null
+++ b/kscd/libwm/plat_netbsd.c
@@ -0,0 +1,534 @@
+/*
+ * This file is part of WorkMan, the civilized CD player library
+ * (c) 1991-1997 by Steven Grimm (original author)
+ * (c) by Dirk F�rsterling (current 'author' = maintainer)
+ * The maintainer can be contacted by his e-mail address:
+ * milliByte@DeathsDoor.com 
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *
+ * plat_netbsd.c
+ *
+ * NetBSD-specific drive control routines. (Based on plat_freebsd.c)
+ *
+ * Todd Pfaff, 3/20/94
+ *
+ */
+
+#if defined(__NetBSD__)
+
+#include <errno.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/mount.h>
+#include <sys/stat.h>
+#include <sys/statvfs.h>
+
+#include "include/wm_config.h"
+
+#include <sys/time.h>
+#include <sys/ioctl.h>
+#include <sys/cdio.h>
+
+#include "include/wm_struct.h"
+#include "include/wm_platform.h"
+#include "include/wm_cdrom.h"
+#include "include/wm_scsi.h"
+#include "include/wm_helpers.h"
+#include "include/wm_cdtext.h"
+
+#define WM_MSG_CLASS WM_MSG_CLASS_PLATFORM
+
+int	min_volume = 10;
+int	max_volume = 255;
+
+
+/*--------------------------------------------------------*
+ * Initialize the drive.  A no-op for the generic driver.
+ *--------------------------------------------------------*/
+int
+gen_init(struct wm_drive *d)
+{
+	return (0);
+} /* gen_init() */
+
+
+/*-------------------------------------------------------------------*
+ * Open the CD device and figure out what kind of drive is attached.
+ *-------------------------------------------------------------------*/
+int
+wmcd_open( struct wm_drive *d )
+{
+  int		fd;
+  static int	warned = 0;
+  char vendor[32] = WM_STR_GENVENDOR;
+  char  model[32] = WM_STR_GENMODEL;
+  char    rev[32] = WM_STR_GENREV;
+  
+  if (d->fd >= 0)		/* Device already open? */
+    {
+      wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS, "wmcd_open(): [device is open (fd=%d)]\n", d->fd);
+      return (0);
+    }
+  
+  if (d->cd_device == NULL)
+    d->cd_device = DEFAULT_CD_DEVICE;
+  
+  d->fd = open(d->cd_device, 0);
+  if (d->fd < 0)
+    {
+      if (errno == EACCES)
+	{
+          return -EACCES;
+	}
+      
+      /* No CD in drive. */
+      return (1);
+    }
+    
+  /* Now fill in the relevant parts of the wm_drive structure. */
+  fd = d->fd;
+  
+  find_drive_struct(vendor, model, rev);
+   
+  /*(d->init)(d); */
+   
+  d->fd = fd;
+  
+  return (0);
+} /* wmcd_open() */
+
+/*
+ * Re-Open the device if it is open.
+ */
+int
+wmcd_reopen( struct wm_drive *d )
+{
+  int status;
+  
+  do {
+    wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS, "wmcd_reopen\n");
+    status = gen_close( d );
+    wm_susleep( 1000 );
+    wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS, "calling wmcd_open()\n");
+    status = wmcd_open( d ); /* open it as usual */
+    wm_susleep( 1000 );
+    if(status == -EACCES || status == 1)
+        return status;
+  } while ( status != 0 );
+  return status;
+} /* wmcd_reopen() */
+
+/*---------------------------------------------*
+ * Send an arbitrary SCSI command to a device.
+ *
+ *---------------------------------------------*/
+int
+wm_scsi(struct wm_drive *d, unsigned char *cdb, int cdblen, 
+	void *retbuf, int retbuflen, int getreply)
+{
+  return (-1);
+} /* wm_scsi() */
+
+int
+gen_close( struct wm_drive *d )
+{
+  if(d->fd != -1) {
+    wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS, "closing the device\n");
+    close(d->fd);
+    d->fd = -1;
+  }
+  return 0;
+}
+
+/*--------------------------------------------------------------------------*
+ * Get the current status of the drive: the current play mode, the absolute
+ * position from start of disc (in frames), and the current track and index
+ * numbers if the CD is playing or paused.
+ *--------------------------------------------------------------------------*/
+int
+gen_get_drive_status(struct wm_drive *d, int oldmode,
+                     int *mode, int *pos, int *track, int *index)
+{
+  int ready;
+
+  struct ioc_read_subchannel	sc;
+  struct cd_sub_channel_info	scd;
+  
+  *mode = WM_CDM_UNKNOWN;
+  
+  sc.address_format	= CD_MSF_FORMAT;
+  sc.data_format		= CD_CURRENT_POSITION;
+  sc.track		= 0;
+  sc.data_len		= sizeof(scd);
+  sc.data			= (struct cd_sub_channel_info *)&scd;
+  
+  /* Is the device open? */
+  if (d->fd < 0)
+    {
+      switch (wmcd_open(d)) 
+	{
+	case -1:	/* error */
+	  return (-1);
+	  
+	case 1:		/* retry */
+	  return (0);
+	}
+    }
+  
+  ready = 0;
+  if (ioctl(d->fd, DIOCTUR, &ready) == -1) 
+    {
+      *mode = WM_CDM_UNKNOWN;
+      return (0);
+    }
+  if (ready == 0)
+    {
+     *mode = WM_CDM_NO_DISC;
+     return (0);
+    }
+
+  if (ioctl(d->fd, CDIOCREADSUBCHANNEL, &sc) == -1) 
+    {
+      *mode = WM_CDM_UNKNOWN;
+      return (0);
+    }
+  
+  switch (scd.header.audio_status) 
+    {
+    case CD_AS_PLAY_IN_PROGRESS:
+      *mode = WM_CDM_PLAYING;
+    dopos:
+	*pos = scd.what.position.absaddr.msf.minute * 60 * 75 +
+	scd.what.position.absaddr.msf.second * 75 +
+	scd.what.position.absaddr.msf.frame;
+	*track = scd.what.position.track_number;
+	*index = scd.what.position.index_number;
+      break;
+      
+    case CD_AS_PLAY_PAUSED:
+      if (oldmode == WM_CDM_PLAYING || oldmode == WM_CDM_PAUSED)
+	{
+	  *mode = WM_CDM_PAUSED;
+	  goto dopos;
+	}
+      else
+	*mode = WM_CDM_STOPPED;
+      break;
+      
+    case CD_AS_PLAY_COMPLETED:
+      *mode = WM_CDM_TRACK_DONE; /* waiting for next track. */
+      break;
+      
+    case CD_AS_NO_STATUS:
+    case CD_AS_AUDIO_INVALID:
+      *mode = WM_CDM_STOPPED;
+      break;
+    }
+  
+  return (0);
+} /* gen_get_drive_status() */
+
+
+/*-------------------------------------*
+ * Get the number of tracks on the CD.
+ *-------------------------------------*/
+int
+gen_get_trackcount(struct wm_drive *d, int *tracks)
+{
+  struct ioc_toc_header	hdr;
+  
+  if (ioctl(d->fd, CDIOREADTOCHEADER, &hdr) == -1)
+    return (-1);
+  
+  *tracks = hdr.ending_track - hdr.starting_track + 1;
+  
+  return (0);
+} /* gen_get_trackcount() */
+
+/*-----------------------------------------------------------------------*
+ * Get the start time and mode (data or audio) of a track.
+ *
+ * XXX - this should get cached, but that means keeping track of ejects.
+ *-----------------------------------------------------------------------*/
+int
+gen_get_trackinfo(struct wm_drive *d, int track, int *data, int *startframe)
+{
+  struct ioc_read_toc_entry	toc;
+  struct cd_toc_entry		toc_buffer;
+  
+  bzero((char *)&toc_buffer, sizeof(toc_buffer));
+  toc.address_format = CD_MSF_FORMAT;
+  toc.starting_track = track;
+  toc.data_len = sizeof(toc_buffer);
+  toc.data = &toc_buffer;
+  
+  if (ioctl(d->fd, CDIOREADTOCENTRYS, &toc) == -1)
+    return (-1);
+  
+  *data = ((toc_buffer.control & 0x4) != 0);
+  
+  *startframe = toc_buffer.addr.msf.minute*60*75 +
+    toc_buffer.addr.msf.second * 75 +
+    toc_buffer.addr.msf.frame;
+  
+  return (0);
+} /* gen_get_trackinfo() */
+
+/*-------------------------------------*
+ * Get the number of frames on the CD.
+ *-------------------------------------*/
+int
+gen_get_cdlen(struct wm_drive *d, int *frames)
+{
+  int		tmp;
+  struct ioc_toc_header		hdr;
+  int status;
+  
+#define LEADOUT 0xaa			/* see scsi.c.  what a hack! */
+  return gen_get_trackinfo(d, LEADOUT, &tmp, frames);
+} /* gen_get_cdlen() */
+
+
+/*------------------------------------------------------------*
+ * Play the CD from one position to another (both in frames.)
+ *------------------------------------------------------------*/
+int
+gen_play(struct wm_drive *d, int start, int end, int realstart)
+{
+  struct ioc_play_msf	msf;
+  
+  msf.start_m	= start / (60*75);
+  msf.start_s	= (start % (60*75)) / 75;
+  msf.start_f	= start % 75;
+  msf.end_m	= end / (60*75);
+  msf.end_s	= (end % (60*75)) / 75;
+  msf.end_f	= end % 75;
+  
+  if (ioctl(d->fd, CDIOCSTART) == -1)
+    return (-1);
+  
+  if (ioctl(d->fd, CDIOCPLAYMSF, &msf) == -1)
+    return (-2);
+  
+  return (0);
+} /* gen_play() */
+
+/*---------------*
+ * Pause the CD.
+ *---------------*/
+int
+gen_pause( struct wm_drive *d )
+{
+  return (ioctl(d->fd, CDIOCPAUSE) == -1 ? -1 : 0);
+} /* gen_pause() */
+
+/*-------------------------------------------------*
+ * Resume playing the CD (assuming it was paused.)
+ *-------------------------------------------------*/
+int
+gen_resume( struct wm_drive *d )
+{
+  return (ioctl(d->fd, CDIOCRESUME) == -1 ? -1 : 0);
+} /* gen_resume() */
+
+/*--------------*
+ * Stop the CD.
+ *--------------*/
+int
+gen_stop( struct wm_drive *d)
+{
+  return (ioctl(d->fd, CDIOCSTOP) == -1 ? -1 : 0);
+} /* gen_stop() */
+
+/*----------------------------------------*
+ * Eject the current CD, if there is one.
+ *----------------------------------------*/
+int
+gen_eject( struct wm_drive *d )
+{
+  /* On some systems, we can check to see if the CD is mounted. */
+  struct stat	stbuf;
+  struct statvfs	buf;
+  int rval;
+  
+  if (fstat(d->fd, &stbuf) != 0)
+    return (-2);
+  
+  /* Is this a mounted filesystem? */
+  if (fstatvfs(stbuf.st_rdev, &buf) == 0)
+    return (-3);
+  
+  rval = ioctl(d->fd, CDIOCALLOW);
+  
+  if (rval != -1)
+    rval = ioctl(d->fd, CDIOCEJECT);
+  
+  if (rval != -1)
+    rval = ioctl(d->fd, CDIOCPREVENT);
+  
+  (void) close(d->fd);
+  
+  return (rval == -1 ? -1 : 0);
+} /* gen_eject() */
+
+/*----------------------------------------*
+ * Close the CD tray
+ *----------------------------------------*/
+
+int 
+gen_closetray(struct wm_drive *d)
+{
+#ifdef CAN_CLOSE
+  if (ioctl(d->fd, CDIOCCLOSE) == -1)
+	return -1;
+#endif /* CAN_CLOSE */
+  /* Always succeed if the drive can't close */
+  return(0);
+} /* gen_closetray() */
+
+
+/*---------------------------------------------------------------------------*
+ * scale_volume(vol, max)
+ *
+ * Return a volume value suitable for passing to the CD-ROM drive.  "vol"
+ * is a volume slider setting; "max" is the slider's maximum value.
+ *
+ * On Sun and DEC CD-ROM drives, the amount of sound coming out the jack
+ * increases much faster toward the top end of the volume scale than it
+ * does at the bottom.  To make up for this, we make the volume scale look
+ * sort of logarithmic (actually an upside-down inverse square curve) so
+ * that the volume value passed to the drive changes less and less as you
+ * approach the maximum slider setting.  The actual formula looks like
+ *
+ *     (max^2 - (max - vol)^2) * (max_volume - min_volume)
+ * v = --------------------------------------------------- + min_volume
+ *                           max^2
+ *
+ * If your system's volume settings aren't broken in this way, something
+ * like the following should work:
+ *
+ *	return ((vol * (max_volume - min_volume)) / max + min_volume);
+ *---------------------------------------------------------------------------*/
+static int
+scale_volume(int vol, int max)
+{
+  return ((vol * (max_volume - min_volume)) / max + min_volume);
+} /* scale_volume() */
+
+/*---------------------------------------------------------------------------*
+ * unscale_volume(cd_vol, max)
+ *
+ * Given a value between min_volume and max_volume, return the volume slider
+ * value needed to achieve that value.
+ *
+ * Rather than perform floating-point calculations to reverse the above
+ * formula, we simply do a binary search of scale_volume()'s return values.
+ *--------------------------------------------------------------------------*/
+static int
+unscale_volume( int cd_vol, int max )
+{
+  int	vol = 0, top = max, bot = 0, scaled;
+  
+  while (bot <= top)
+    {
+      vol = (top + bot) / 2;
+      scaled = scale_volume(vol, max);
+      if (cd_vol == scaled)
+	break;
+      if (cd_vol < scaled)
+	top = vol - 1;
+      else
+	bot = vol + 1;
+    }
+  
+  if (vol < 0)
+    vol = 0;
+  else if (vol > max)
+    vol = max;
+  
+  return (vol);
+} /* unscale_volume() */
+
+/*---------------------------------------------------------------------*
+ * Set the volume level for the left and right channels.  Their values
+ * range from 0 to 100.
+ *---------------------------------------------------------------------*/
+int
+gen_set_volume(struct wm_drive *d, int left, int right)
+{
+  struct ioc_vol vol;
+  
+  if (left < 0)	/* don't laugh, I saw this happen once! */
+    left = 0;
+  if (right < 0)
+    right = 0;
+  left = scale_volume(left, 100);
+  right = scale_volume(right, 100);
+  
+  vol.vol[0] = left;
+  vol.vol[1] = right;
+  vol.vol[2] = 0;
+  vol.vol[3] = 0;
+  
+  if (ioctl(d->fd, CDIOCSETVOL, &vol) == -1)
+    return (-1);
+  
+  return (0);
+} /* gen_set_volume() */
+
+/*---------------------------------------------------------------------*
+ * Read the initial volume from the drive, if available.  Each channel
+ * ranges from 0 to 100, with -1 indicating data not available.
+ *---------------------------------------------------------------------*/
+int
+gen_get_volume( struct wm_drive *d, int *left, int *right )
+{
+  struct ioc_vol vol;
+  
+  if (d->fd >= 0)
+    {
+      bzero((char *)&vol, sizeof(vol));
+
+      if (ioctl(d->fd, CDIOCGETVOL, &vol) == -1)
+	*left = *right = -1;
+      else
+	{
+	  *left = unscale_volume(vol.vol[0], 100);
+	  *right = unscale_volume(vol.vol[1], 100);
+	}
+    } else {
+      *left = *right = -1;
+    } 
+  return (0);
+} /* gen_get_volume() */
+
+/*------------------------------------------------------------------------*
+ * gen_get_cdtext(drive, buffer, length)
+ *------------------------------------------------------------------------*/
+
+int
+gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_length)
+{
+  return -1; /* no SCSI, no CDTEXT */
+} /* gen_get_cdtext() */
+
+
+#endif
diff --git a/kscd/libwm/plat_sun.c b/kscd/libwm/plat_sun.c
index bb87a8e2..824da881 100644
--- a/kscd/libwm/plat_sun.c
+++ b/kscd/libwm/plat_sun.c
@@ -807,7 +807,7 @@ int internal_audio = 1;
 
 codec_init( void )
 {
-  register int i;
+  int i;
   char* ctlname;
   audio_info_t foo;
   audio_device_t aud_dev;
diff --git a/kscd/panel.ui b/kscd/panel.ui
index 2ef615ef..c3fd3a09 100644
--- a/kscd/panel.ui
+++ b/kscd/panel.ui
@@ -348,9 +348,6 @@
                             <property name="text">
                                 <string>Stop</string>
                             </property>
-                            <property name="accel">
-                                <string></string>
-                            </property>
                             <property name="flat">
                                 <bool>true</bool>
                             </property>
@@ -373,9 +370,6 @@
                             <property name="text">
                                 <string>Loop</string>
                             </property>
-                            <property name="accel">
-                                <string></string>
-                            </property>
                             <property name="toggleButton">
                                 <bool>true</bool>
                             </property>
@@ -457,12 +451,12 @@
     <tabstop>cddbPB</tabstop>
     <tabstop>infoPB</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
     <slot>playClicked()</slot>
     <slot>stopClicked()</slot>
     <slot>prevClicked()</slot>
     <slot>ejectClicked()</slot>
     <slot returnType="bool">nextClicked()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kscd/xmcd.desktop b/kscd/xmcd.desktop
index 2f105a1e..521202e1 100644
--- a/kscd/xmcd.desktop
+++ b/kscd/xmcd.desktop
@@ -1,72 +1,5 @@
 [Desktop Entry]
 Comment=CD Database File
-Comment[af]=Cd Databasis Lêer
-Comment[az]=CD Databeyzi Faylı
-Comment[bg]=Файл с база от данни за КД
-Comment[bn]=সিডি ডেটাবেস ফাইল
-Comment[br]=Restr Stlennvon CD
-Comment[bs]=CD baza podataka
-Comment[ca]=Fitxer de base de dades de CD
-Comment[cs]=Soubor CD databáze
-Comment[cy]=Ffeil Cronfa Ddata CD
-Comment[da]=Cd-databasefil
-Comment[de]=CD-Datenbank-Datei
-Comment[el]=Αρχείο βάσης δεδομένων CD
-Comment[eo]=Lumdiskdatumbazo-dosiero
-Comment[es]=Base de datos de CDs
-Comment[et]=CD andmebaasi fail
-Comment[eu]=CD datubase fitxategia
-Comment[fa]=پروندۀ دادگان دیسک فشرده
-Comment[fi]=CD-tietokantatiedosto
-Comment[fr]=Banque de données pour CD
-Comment[gl]=Ficheiro de base de datos de CD
-Comment[he]=קובץ מסד נתוני תקליטור
-Comment[hi]=सीडी डाटाबेस फ़ाइल
-Comment[hr]=CD baza datoteka
-Comment[hu]=CD-adatbázis fájl
-Comment[id]=File Database CD
-Comment[is]=CD gagnasafnsskrá
-Comment[it]=File di database CD
-Comment[ja]=CD データベースファイル
-Comment[kk]=CD деректер қоры файлы
-Comment[km]=ឯកសារមូលដ្ឋានទិន្នន័យស៊ីឌី
-Comment[ko]=CD 데이터베이스 파일
-Comment[lt]=CD duomenų bazės Byla
-Comment[lv]=CD Datubāzes Fails
-Comment[mk]=Датотека за база на податоци за CD
-Comment[ms]=Fail Pangkalan Data CD
-Comment[mt]=Fajl Database tas-CDs
-Comment[nb]=CD-databasefil
-Comment[nds]=CD-Datenbankdatei
-Comment[ne]=CD डाटाबेस फाइल
-Comment[nl]=Bestand met cd-database
-Comment[nn]=CD-databasefil
-Comment[pa]=CD ਡਾਟਾਬੇਸ ਫਾਇਲ
-Comment[pl]=Baza danych CD
-Comment[pt]=Ficheiro de dados de CDs
-Comment[pt_BR]=Arquivo de Dados de CDs
-Comment[ro]=Fişier bază de date CD
-Comment[ru]=Файл базы данных CD
-Comment[se]=CD-diehtovuođđofiila
-Comment[sk]=Databázový súbor CD
-Comment[sl]=Zbirka podatkov o CD
-Comment[sr]=Фајл CD базе података
-Comment[sr@Latn]=Fajl CD baze podataka
-Comment[sv]=Cd-databasfil
-Comment[ta]=குறுந்தகடு தரவுத்தளக் கோப்பு
-Comment[tg]=Файли Манбаъи Додаҳои Диски Фишурда
-Comment[th]=แฟ้มฐานข้อมูลซีดี
-Comment[tr]=CD Veritabanı Dosyası
-Comment[uk]=Файл бази даних CD
-Comment[uz]=CD maʼlumot baza fayli
-Comment[uz@cyrillic]=CD маълумот база файли
-Comment[ven]=CD ya databeizi ya faela 
-Comment[wa]=Båze di dnêyes des plakes
-Comment[xh]=Ifayile yesiseko sedata ye CD
-Comment[zh_CN]=CD 数据库文件
-Comment[zh_HK]=CD 資料庫檔案
-Comment[zh_TW]=CD 資料庫檔案
-Comment[zu]=Ifayela yesiseko sedata ye CD
 DefaultApp=kedit
 Icon=application-x-cda
 Type=MimeType