summaryrefslogtreecommitdiffstats
path: root/libk3b/plugin
diff options
context:
space:
mode:
Diffstat (limited to 'libk3b/plugin')
-rw-r--r--libk3b/plugin/Makefile.am28
-rw-r--r--libk3b/plugin/k3baudiodecoder.h4
-rw-r--r--libk3b/plugin/k3baudioencoder.cpp2
-rw-r--r--libk3b/plugin/k3baudioencoder.h2
-rw-r--r--libk3b/plugin/k3baudioserver.h2
-rw-r--r--libk3b/plugin/k3bplugin.h2
-rw-r--r--libk3b/plugin/k3bpluginconfigwidget.cpp2
-rw-r--r--libk3b/plugin/k3bpluginconfigwidget.h2
-rw-r--r--libk3b/plugin/k3bpluginfactory.h2
-rw-r--r--libk3b/plugin/k3bpluginmanager.cpp10
-rw-r--r--libk3b/plugin/k3bpluginmanager.h2
-rw-r--r--libk3b/plugin/k3bprojectplugin.h2
-rw-r--r--libk3b/plugin/libsamplerate/Makefile.am20
-rw-r--r--libk3b/plugin/libsamplerate/configure.in.in13
-rw-r--r--libk3b/plugin/libsamplerate/float_cast.h40
-rw-r--r--libk3b/plugin/libsamplerate/samplerate.h2
16 files changed, 19 insertions, 116 deletions
diff --git a/libk3b/plugin/Makefile.am b/libk3b/plugin/Makefile.am
deleted file mode 100644
index 49ac69b..0000000
--- a/libk3b/plugin/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-if compile_libsamplerate
-USED_LIBSAMPLERATE=./libsamplerate/libsamplerate.la
-SUBDIRS = libsamplerate
-else
-USED_LIBSAMPLERATE=$(LIBSAMPLERATE)
-endif
-
-
-AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../core/ -I$(srcdir)/../../src -I$(srcdir)/../../libk3bdevice $(all_includes)
-
-METASOURCES = AUTO
-
-noinst_LTLIBRARIES = libk3bplugin.la
-
-libk3bplugin_la_LIBADD = $(USED_LIBSAMPLERATE)
-
-libk3bplugin_la_LDFLAGS = $(all_libraries)
-
-libk3bplugin_la_SOURCES = k3bplugin.cpp \
- k3bpluginconfigwidget.cpp \
- k3bpluginmanager.cpp \
- k3baudiodecoder.cpp \
- k3baudioencoder.cpp \
- k3baudioclient.cpp \
- k3baudioserver.cpp
-
-
-include_HEADERS = k3bplugin.h k3bpluginfactory.h k3bpluginmanager.h k3baudiodecoder.h k3baudioencoder.h k3bpluginconfigwidget.h k3baudiooutputplugin.h k3bprojectplugin.h
diff --git a/libk3b/plugin/k3baudiodecoder.h b/libk3b/plugin/k3baudiodecoder.h
index 9a81ffa..9cb963b 100644
--- a/libk3b/plugin/k3baudiodecoder.h
+++ b/libk3b/plugin/k3baudiodecoder.h
@@ -33,7 +33,7 @@
**/
class LIBK3B_EXPORT K3bAudioDecoder : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -209,7 +209,7 @@ class LIBK3B_EXPORT K3bAudioDecoder : public TQObject
*/
class LIBK3B_EXPORT K3bAudioDecoderFactory : public K3bPlugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libk3b/plugin/k3baudioencoder.cpp b/libk3b/plugin/k3baudioencoder.cpp
index 76240e4..f996d6e 100644
--- a/libk3b/plugin/k3baudioencoder.cpp
+++ b/libk3b/plugin/k3baudioencoder.cpp
@@ -91,7 +91,7 @@ const TQString& K3bAudioEncoder::filename() const
if( d->outputFile )
return d->outputFilename;
else
- return TQString();
+ return TQString::null;
}
diff --git a/libk3b/plugin/k3baudioencoder.h b/libk3b/plugin/k3baudioencoder.h
index 392e662..84714d0 100644
--- a/libk3b/plugin/k3baudioencoder.h
+++ b/libk3b/plugin/k3baudioencoder.h
@@ -32,7 +32,7 @@
*/
class LIBK3B_EXPORT K3bAudioEncoder : public K3bPlugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libk3b/plugin/k3baudioserver.h b/libk3b/plugin/k3baudioserver.h
index f620b07..66a1d71 100644
--- a/libk3b/plugin/k3baudioserver.h
+++ b/libk3b/plugin/k3baudioserver.h
@@ -28,7 +28,7 @@ class K3bAudioClient;
*/
class LIBK3B_EXPORT K3bAudioServer : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libk3b/plugin/k3bplugin.h b/libk3b/plugin/k3bplugin.h
index 152aa15..f225af6 100644
--- a/libk3b/plugin/k3bplugin.h
+++ b/libk3b/plugin/k3bplugin.h
@@ -79,7 +79,7 @@ class K3bPluginInfo
*/
class LIBK3B_EXPORT K3bPlugin : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
friend class K3bPluginManager;
diff --git a/libk3b/plugin/k3bpluginconfigwidget.cpp b/libk3b/plugin/k3bpluginconfigwidget.cpp
index 21876d5..5b847fb 100644
--- a/libk3b/plugin/k3bpluginconfigwidget.cpp
+++ b/libk3b/plugin/k3bpluginconfigwidget.cpp
@@ -18,7 +18,7 @@
#include <k3bcore.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <kdebug.h>
diff --git a/libk3b/plugin/k3bpluginconfigwidget.h b/libk3b/plugin/k3bpluginconfigwidget.h
index 48a91ff..e88337e 100644
--- a/libk3b/plugin/k3bpluginconfigwidget.h
+++ b/libk3b/plugin/k3bpluginconfigwidget.h
@@ -22,7 +22,7 @@
class LIBK3B_EXPORT K3bPluginConfigWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libk3b/plugin/k3bpluginfactory.h b/libk3b/plugin/k3bpluginfactory.h
index dde5e9f..e812fef 100644
--- a/libk3b/plugin/k3bpluginfactory.h
+++ b/libk3b/plugin/k3bpluginfactory.h
@@ -18,7 +18,7 @@
#define _K3B_PLUGIN_FACTORY_H_
#include <klibloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdeglobal.h>
#include <tdelocale.h>
diff --git a/libk3b/plugin/k3bpluginmanager.cpp b/libk3b/plugin/k3bpluginmanager.cpp
index a461f51..364e76b 100644
--- a/libk3b/plugin/k3bpluginmanager.cpp
+++ b/libk3b/plugin/k3bpluginmanager.cpp
@@ -19,10 +19,10 @@
#include <k3bversion.h>
#include <kdebug.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
#include <tdelocale.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdialogbase.h>
#include <tdemessagebox.h>
#include <klibloader.h>
@@ -85,7 +85,7 @@ TQPtrList<K3bPlugin> K3bPluginManager::plugins( const TQString& group ) const
void K3bPluginManager::loadPlugin( const TQString& fileName )
{
- KSimpleConfig c( fileName, true );
+ TDESimpleConfig c( fileName, true );
c.setGroup( "K3b Plugin" );
TQString libName = c.readEntry( "Lib" );
@@ -173,8 +173,8 @@ int K3bPluginManager::execPluginDialog( K3bPlugin* plugin, TQWidget* parent, con
K3bPluginConfigWidget* configWidget = plugin->createConfigWidget( &dlg );
if( configWidget ) {
dlg.setMainWidget( configWidget );
- connect( &dlg, TQT_SIGNAL(applyClicked()), configWidget, TQT_SLOT(saveConfig()) );
- connect( &dlg, TQT_SIGNAL(okClicked()), configWidget, TQT_SLOT(saveConfig()) );
+ connect( &dlg, TQ_SIGNAL(applyClicked()), configWidget, TQ_SLOT(saveConfig()) );
+ connect( &dlg, TQ_SIGNAL(okClicked()), configWidget, TQ_SLOT(saveConfig()) );
configWidget->loadConfig();
int r = dlg.exec();
delete configWidget;
diff --git a/libk3b/plugin/k3bpluginmanager.h b/libk3b/plugin/k3bpluginmanager.h
index 367c84e..b87e455 100644
--- a/libk3b/plugin/k3bpluginmanager.h
+++ b/libk3b/plugin/k3bpluginmanager.h
@@ -34,7 +34,7 @@ class TQWidget;
*/
class LIBK3B_EXPORT K3bPluginManager : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libk3b/plugin/k3bprojectplugin.h b/libk3b/plugin/k3bprojectplugin.h
index 59997af..28960b7 100644
--- a/libk3b/plugin/k3bprojectplugin.h
+++ b/libk3b/plugin/k3bprojectplugin.h
@@ -67,7 +67,7 @@ class K3bProjectPluginGUIBase
*/
class LIBK3B_EXPORT K3bProjectPlugin : public K3bPlugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libk3b/plugin/libsamplerate/Makefile.am b/libk3b/plugin/libsamplerate/Makefile.am
deleted file mode 100644
index 3154ce2..0000000
--- a/libk3b/plugin/libsamplerate/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was automatically generated from the Makefile.am
-# DO NOT EDIT!
-
-noinst_LTLIBRARIES = libsamplerate.la
-#include_HEADERS = samplerate.h
-
-EXTRA_DIST = config.h.in Version_script.in
-
-COEFF_HDRS = high_qual_coeffs.h mid_qual_coeffs.h fastest_coeffs.h
-
-noinst_HEADERS = common.h float_cast.h $(COEFF_HDRS)
-
-SRC_SOURCES = samplerate.c src_sinc.c src_zoh.c src_linear.c
-
-libsamplerate_la_SOURCES = $(SRC_SOURCES)
-#libsamplerate_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ @SHLIB_VERSION_ARG@
-libsamplerate_la_LIBADD = -lm
-
-# Disable autoheader.
-#AUTOHEADER=echo
diff --git a/libk3b/plugin/libsamplerate/configure.in.in b/libk3b/plugin/libsamplerate/configure.in.in
deleted file mode 100644
index 06a8f55..0000000
--- a/libk3b/plugin/libsamplerate/configure.in.in
+++ /dev/null
@@ -1,13 +0,0 @@
-LIBS="-lm $all_libraries"
-
-AC_CHECK_DECL(lrint,
- AC_DEFINE(HAVE_LRINT,1,[Define if lrint is supported]),
- AC_DEFINE(HAVE_LRINT,0,[Define if lrint is not supported]),
- [#include <math.h>]
-)
-
-AC_CHECK_DECL(lrintf,
- AC_DEFINE(HAVE_LRINTF,1,[Define if lrintf is supported]),
- AC_DEFINE(HAVE_LRINTF,0,[Define if lrintf is not supported]),
- [#include <math.h>]
-)
diff --git a/libk3b/plugin/libsamplerate/float_cast.h b/libk3b/plugin/libsamplerate/float_cast.h
index af362e3..533b837 100644
--- a/libk3b/plugin/libsamplerate/float_cast.h
+++ b/libk3b/plugin/libsamplerate/float_cast.h
@@ -106,42 +106,6 @@
return intgr ;
}
-#elif (defined (__MWERKS__) && defined (macintosh))
-
- /* This MacOS 9 solution was provided by Stephane Letz */
-
- #undef HAVE_LRINT_REPLACEMENT
- #define HAVE_LRINT_REPLACEMENT 1
- #include <math.h>
-
- #undef lrint
- #undef lrintf
-
- #define lrint double2int
- #define lrintf float2int
-
- inline int
- float2int (register float in)
- { long res [2] ;
-
- asm
- { fctiw in,in
- stfd in,res
- }
- return res [1] ;
- } /* float2int */
-
- inline int
- double2int (register double in)
- { long res [2] ;
-
- asm
- { fctiw in,in
- stfd in,res
- }
- return res [1] ;
- } /* double2int */
-
#elif (defined (__MACH__) && defined (__APPLE__))
/* For Apple MacOSX. */
@@ -157,7 +121,7 @@
#define lrintf float2int
inline static long int
- float2int (register float in)
+ float2int (float in)
{ int res [2] ;
__asm__ __volatile__
@@ -172,7 +136,7 @@
} /* lrintf */
inline static long int
- double2int (register double in)
+ double2int (double in)
{ int res [2] ;
__asm__ __volatile__
diff --git a/libk3b/plugin/libsamplerate/samplerate.h b/libk3b/plugin/libsamplerate/samplerate.h
index dfc4448..e345d85 100644
--- a/libk3b/plugin/libsamplerate/samplerate.h
+++ b/libk3b/plugin/libsamplerate/samplerate.h
@@ -99,7 +99,7 @@ int src_set_ratio (SRC_STATE *state, double new_ratio) ;
int src_reset (SRC_STATE *state) ;
/*
-** Return TRUE if ratio is a valid conversion ratio, FALSE
+** Return true if ratio is a valid conversion ratio, false
** otherwise.
*/
generated by cgit v1.2.3 (git 2.46.0) at 2025-09-12 16:31:48 +0000