6 files changed, 7 insertions, 64 deletions
diff --git a/plugins/decoder/ogg/CMakeLists.txt b/plugins/decoder/ogg/CMakeLists.txt
index d240d82..6b67679 100644
--- a/plugins/decoder/ogg/CMakeLists.txt
+++ b/plugins/decoder/ogg/CMakeLists.txt
@@ -41,6 +41,7 @@ tde_add_kpart( libk3boggvorbisdecoder AUTOMOC
 
 ##### other data ################################
 
-install( FILES k3boggvorbisdecoder.plugin
+tde_create_translated_desktop(
+  SOURCE k3boggvorbisdecoder.plugin
   DESTINATION ${DATA_INSTALL_DIR}/k3b/plugins
 )
diff --git a/plugins/decoder/ogg/Makefile.am b/plugins/decoder/ogg/Makefile.am
deleted file mode 100644
index e76fc5d..0000000
--- a/plugins/decoder/ogg/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-AM_CPPFLAGS = -I$(srcdir)/../../../libk3b/plugin -I$(srcdir)/../../../libk3b/core -I$(srcdir)/../../../libk3bdevice $(all_includes)
-
-kde_module_LTLIBRARIES = libk3boggvorbisdecoder.la
-
-libk3boggvorbisdecoder_la_SOURCES = k3boggvorbisdecoder.cpp
-
-libk3boggvorbisdecoder_la_LIBADD = ../../../libk3b/libk3b.la -logg -lvorbis -lvorbisfile 
-libk3boggvorbisdecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3b/plugin/libk3bplugin.la ../../../libk3bdevice/libk3bdevice.la -logg -lvorbis -lvorbisfile $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
-
-libk3boggvorbisdecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
-
-pluginsdir = $(kde_datadir)/k3b/plugins
-plugins_DATA = k3boggvorbisdecoder.plugin
-
-METASOURCES = AUTO
diff --git a/plugins/decoder/ogg/configure.in.bot b/plugins/decoder/ogg/configure.in.bot
deleted file mode 100644
index b27ab18..0000000
--- a/plugins/decoder/ogg/configure.in.bot
+++ /dev/null
@@ -1,11 +0,0 @@
-echo ""
-
-if test x$ogg_vorbis = xyes; then
-	echo "K3b - Ogg Vorbis support:                    yes"
-else
-	echo "K3b - Ogg Vorbis support:                     no"
-if test "$ac_cv_use_oggvorbis" = "yes"; then
-	echo "K3b -     You are missing the Ogg-Vorbis headers and libraries."
-	echo "K3b -     The Ogg Vorbis decoding and encoding plugins won't be compiled."
-fi
-fi
diff --git a/plugins/decoder/ogg/configure.in.in b/plugins/decoder/ogg/configure.in.in
deleted file mode 100644
index 69b1b9c..0000000
--- a/plugins/decoder/ogg/configure.in.in
+++ /dev/null
@@ -1,32 +0,0 @@
-dnl === Ogg Vorbis Test - Begin ===
-AC_ARG_WITH(
-	oggvorbis, 
-	AS_HELP_STRING([--without-oggvorbis], [build K3b without OggVorbis support (default=no)]), 
-	[ac_cv_use_oggvorbis=$withval], 
-	[ac_cv_use_oggvorbis=yes]
-)
-
-if test "$ac_cv_use_oggvorbis" = "yes"; then
-
-  AC_MSG_CHECKING(for ogg/vorbis headers)
-  ogg_vorbis=no
-  AC_TRY_COMPILE([
-  		#include <vorbis/codec.h>
-  		#include <vorbis/vorbisfile.h>
-                ],[
-                ],[
-                ogg_vorbis=yes
-                ])
-  AC_MSG_RESULT($ogg_vorbis)
-  if test x$ogg_vorbis = xyes; then
-     dnl we need the ogg_vorbis_lib because otherwise we override LIBS !
-     AC_CHECK_LIB(vorbisfile,ov_open,ogg_vorbis_lib=yes,
-                  ogg_vorbis=no,[$all_libraries -lvorbisfile -lvorbis -logg])
-  fi
-  if test x$ogg_vorbis = xyes; then
-	AC_DEFINE(OGG_VORBIS,1,[Define if you have ogg/vorbis installed])
-  fi
-fi
-
-AM_CONDITIONAL(include_OGG, [test x$ogg_vorbis = xyes])
-dnl === Ogg Vorbis Test - End ===
diff --git a/plugins/decoder/ogg/k3boggvorbisdecoder.h b/plugins/decoder/ogg/k3boggvorbisdecoder.h
index 6f298bc..8a465e6 100644
--- a/plugins/decoder/ogg/k3boggvorbisdecoder.h
+++ b/plugins/decoder/ogg/k3boggvorbisdecoder.h
@@ -25,7 +25,7 @@ class KURL;
 
 class K3bOggVorbisDecoderFactory : public K3bAudioDecoderFactory
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
  public:
@@ -46,7 +46,7 @@ class K3bOggVorbisDecoderFactory : public K3bAudioDecoderFactory
   */
 class K3bOggVorbisDecoder : public K3bAudioDecoder
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
  public: 
diff --git a/plugins/decoder/ogg/k3boggvorbisdecoder.plugin b/plugins/decoder/ogg/k3boggvorbisdecoder.plugin
index 0f1c48e..2da56d0 100644
--- a/plugins/decoder/ogg/k3boggvorbisdecoder.plugin
+++ b/plugins/decoder/ogg/k3boggvorbisdecoder.plugin
@@ -1,9 +1,9 @@
 [K3b Plugin]
-Lib=libk3boggvorbisdecoder
-Group=AudioDecoder
 Name=K3b Ogg Vorbis Decoder
+Comment=Decoding module to decode Ogg Vorbis files
 Author=Sebastian Trueg
 Email=trueg@k3b.org
 Version=3.0
-Comment=Decoding module to decode Ogg Vorbis files
 License=GPL
+Group=AudioDecoder
+Lib=libk3boggvorbisdecoder