summaryrefslogtreecommitdiffstats
path: root/libk3bdevice
diff options
context:
space:
mode:
Diffstat (limited to 'libk3bdevice')
-rw-r--r--libk3bdevice/Makefile.am24
-rw-r--r--libk3bdevice/configure.in.bot7
-rw-r--r--libk3bdevice/configure.in.in59
-rw-r--r--libk3bdevice/k3bcdtext.cpp2
-rw-r--r--libk3bdevice/k3bconnection.cpp6
-rw-r--r--libk3bdevice/k3bconnection.h6
-rw-r--r--libk3bdevice/k3bdevice_export.h2
-rw-r--r--libk3bdevice/k3bdevicemanager.cpp2
-rw-r--r--libk3bdevice/k3bdevicemanager.h2
9 files changed, 10 insertions, 100 deletions
diff --git a/libk3bdevice/Makefile.am b/libk3bdevice/Makefile.am
deleted file mode 100644
index a021ea6..0000000
--- a/libk3bdevice/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-AM_CPPFLAGS= -I$(srcdir)/libk3bdevice -I$(srcdir) $(all_includes)
-
-KDE_CXXFLAGS = $(ENABLE_PERMISSIVE_FLAG)
-
-METASOURCES = AUTO
-
-lib_LTLIBRARIES = libk3bdevice.la
-
-libk3bdevice_la_LIBADD = $(LIB_TDEIO) $(RESMGR_LIB) $(CAM_LIB) $(LIB_TQT) $(LIB_TDECORE)
-
-# lib version 5 for K3b 1.0
-libk3bdevice_la_LDFLAGS = $(all_libraries) -version-info 5:0:0 -no-undefined
-
-libk3bdevice_la_SOURCES = k3bdevice.cpp k3bdevice_mmc.cpp k3bscsicommand.cpp \
-k3btrack.cpp k3btoc.cpp k3bdevicemanager.cpp k3bmsf.cpp k3bdiskinfo.cpp \
-k3bdeviceglobals.cpp k3bcrc.cpp k3bcdtext.cpp k3bconnection.cpp \
-k3bdebug.cpp
-
-include_HEADERS = k3bdevicemanager.h k3bdevice.h k3btoc.h k3btrack.h \
-k3bdeviceglobals.h k3bdiskinfo.h k3bcdtext.h k3bmsf.h k3bdevicetypes.h \
-k3bdevice_export.h k3bconnection.h k3bdebug.h
-
-messages: rc.cpp
- $(XGETTEXT) `find -name "*.cpp" -or -name "*.h"` -o $(podir)/libk3bdevice.pot
diff --git a/libk3bdevice/configure.in.bot b/libk3bdevice/configure.in.bot
deleted file mode 100644
index 6652212..0000000
--- a/libk3bdevice/configure.in.bot
+++ /dev/null
@@ -1,7 +0,0 @@
-echo ""
-
-if test -n "$RESMGR_LIB"; then
- echo "K3b - Resmgr support: yes"
-else
- echo "K3b - Resmgr support: no"
-fi
diff --git a/libk3bdevice/configure.in.in b/libk3bdevice/configure.in.in
deleted file mode 100644
index 6887494..0000000
--- a/libk3bdevice/configure.in.in
+++ /dev/null
@@ -1,59 +0,0 @@
-dnl FIXME: only make the linux header check on linux systems.
-
-linux_scsi=no
-AC_MSG_CHECKING(for linux scsi headers)
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-AC_TRY_COMPILE([
- #include <linux/version.h>
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,50)
- typedef unsigned char u8;
- #endif
- #include <sys/types.h>
- #include <linux/../scsi/scsi.h> /* cope with silly includes */
- ],
- [],
- [linux_scsi=yes])
-AC_MSG_RESULT($linux_scsi)
-
-case "$host_os" in
-freebsd*|dragonfly*)
- # I'll be damned if lousy coding prevents us from running
- # this application.
- linux_scsi=yes
- ;;
-esac
-
-if test "x$linux_scsi" = "xno" ; then
- DO_NOT_COMPILE="$DO_NOT_COMPILE k3b"
-fi
-AC_LANG_RESTORE
-
-dnl - find the cam_* functions
-AC_CHECK_FUNC(cam_close_device,
- [CAM_LIB=""],
- [AC_CHECK_LIB(cam, cam_close_device, [CAM_LIB=-lcam], [CAM_LIB=""])]
- )
-AC_SUBST(CAM_LIB)
-
-
-
-dnl === check for resmgr - begin ============
-AC_ARG_WITH(
- resmgr,
- AS_HELP_STRING([--without-resmgr], [build K3b without ResMgr support (default=no)]),
- [ac_cv_use_resmgr=$withval],
- [ac_cv_use_resmgr=yes]
-)
-
-if test "$ac_cv_use_resmgr" = "yes"; then
- RESMGR_LIB=""
- KDE_CHECK_HEADERS(resmgr.h, [
- KDE_CHECK_LIB(resmgr,rsm_open_device,[
- RESMGR_LIB="-lresmgr"
- AC_DEFINE(HAVE_RESMGR,1,[defined if you have resmgr libraries and headers])
- ])
- ])
- AC_SUBST(RESMGR_LIB)
-fi
-dnl === check for resmgr - end ============
diff --git a/libk3bdevice/k3bcdtext.cpp b/libk3bdevice/k3bcdtext.cpp
index e195eb1..34dd909 100644
--- a/libk3bdevice/k3bcdtext.cpp
+++ b/libk3bdevice/k3bcdtext.cpp
@@ -556,7 +556,7 @@ TQCString K3bDevice::encodeCdText( const TQString& s, bool* illegalChars )
if( illegalChars )
*illegalChars = false;
- // TODO: do this without QT
+ // TODO: do this without TQt
TQTextCodec* codec = TQTextCodec::codecForName("ISO8859-1");
if( codec ) {
TQCString encoded = codec->fromUnicode( s );
diff --git a/libk3bdevice/k3bconnection.cpp b/libk3bdevice/k3bconnection.cpp
index 47cc98c..0d519ea 100644
--- a/libk3bdevice/k3bconnection.cpp
+++ b/libk3bdevice/k3bconnection.cpp
@@ -94,9 +94,9 @@ bool K3bDevice::Connection::open()
d->m_hwdevices = TDEGlobal::hardwareDevices();
// Connect device monitoring signals/slots
- connect(d->m_hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(AddDeviceHandler(TDEGenericDevice*)));
- connect(d->m_hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(RemoveDeviceHandler(TDEGenericDevice*)));
- connect(d->m_hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(ModifyDeviceHandler(TDEGenericDevice*)));
+ connect(d->m_hwdevices, TQ_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQ_SLOT(AddDeviceHandler(TDEGenericDevice*)));
+ connect(d->m_hwdevices, TQ_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQ_SLOT(RemoveDeviceHandler(TDEGenericDevice*)));
+ connect(d->m_hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(ModifyDeviceHandler(TDEGenericDevice*)));
d->bOpen = true;
diff --git a/libk3bdevice/k3bconnection.h b/libk3bdevice/k3bconnection.h
index 311a70e..07bb0c2 100644
--- a/libk3bdevice/k3bconnection.h
+++ b/libk3bdevice/k3bconnection.h
@@ -25,7 +25,7 @@
#include <tqobject.h>
#include <tqmap.h>
#include <tqstringlist.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
#ifdef HAVE_TDEHWLIB
class TDEGenericDevice;
@@ -38,7 +38,7 @@ namespace K3bDevice {
class Device;
/**
- * This is a simple wrapper which creates QT signals whenever a new optical
+ * This is a simple wrapper which creates TQt signals whenever a new optical
* drive is plugged into the system or one is unplugged.
*
* The Connection class also handles media changes. Whenever a new medium is inserted
@@ -50,7 +50,7 @@ namespace K3bDevice {
*/
class LIBK3BDEVICE_EXPORT Connection : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libk3bdevice/k3bdevice_export.h b/libk3bdevice/k3bdevice_export.h
index 6c43716..930baea 100644
--- a/libk3bdevice/k3bdevice_export.h
+++ b/libk3bdevice/k3bdevice_export.h
@@ -21,7 +21,7 @@
#include <config.h>
#endif
-#ifdef __KDE_HAVE_GCC_VISIBILITY
+#ifdef __TDE_HAVE_GCC_VISIBILITY
#define LIBK3BDEVICE_NO_EXPORT __attribute__ ((visibility("hidden")))
#define LIBK3BDEVICE_EXPORT __attribute__ ((visibility("default")))
#else
diff --git a/libk3bdevice/k3bdevicemanager.cpp b/libk3bdevice/k3bdevicemanager.cpp
index 611dbb4..f28ba54 100644
--- a/libk3bdevice/k3bdevicemanager.cpp
+++ b/libk3bdevice/k3bdevicemanager.cpp
@@ -29,7 +29,7 @@
#include <tqfileinfo.h>
#include <tqregexp.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <tdeapplication.h>
#include <tdeconfig.h>
#include <tdetempfile.h>
diff --git a/libk3bdevice/k3bdevicemanager.h b/libk3bdevice/k3bdevicemanager.h
index 13eb897..aa61807 100644
--- a/libk3bdevice/k3bdevicemanager.h
+++ b/libk3bdevice/k3bdevicemanager.h
@@ -49,7 +49,7 @@ namespace K3bDevice {
*/
class LIBK3BDEVICE_EXPORT DeviceManager : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-18 21:54:00 +0000