diff options
Diffstat (limited to 'tdeprint/management')
22 files changed, 31 insertions, 31 deletions
diff --git a/tdeprint/management/CMakeLists.txt b/tdeprint/management/CMakeLists.txt index 0e12299e6..ccaf2a70a 100644 --- a/tdeprint/management/CMakeLists.txt +++ b/tdeprint/management/CMakeLists.txt @@ -10,7 +10,7 @@ ################################################# add_definitions( - -D_KDEPRINT_COMPILE + -D_TDEPRINT_COMPILE ) include_directories( diff --git a/tdeprint/management/Makefile.am b/tdeprint/management/Makefile.am index 34f8de935..f0d1acd9f 100644 --- a/tdeprint/management/Makefile.am +++ b/tdeprint/management/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -D_KDEPRINT_COMPILE +AM_CPPFLAGS = -D_TDEPRINT_COMPILE INCLUDES= -I$(top_srcdir)/tdefx -I$(top_srcdir)/tdeprint -I$(top_builddir)/tdeprint -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir) $(all_includes) @@ -8,7 +8,7 @@ tdeinit_LTLIBRARIES = kaddprinterwizard.la bin_PROGRAMS = kaddprinterwizard_la_SOURCES = kaddprinterwizard.cpp -kaddprinterwizard_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEPRINT) $(LIB_KDEUI) +kaddprinterwizard_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEPRINT) $(LIB_TDEUI) kaddprinterwizard_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH) libtdeprint_management_la_SOURCES = \ @@ -26,12 +26,12 @@ libtdeprint_management_la_SOURCES = \ pluginaction.cpp kxmlcommanddlg.cpp kxmlcommandselector.cpp kmconfigcommand.cpp \ kmconfigfilter.cpp kmconfigfonts.cpp kmconfigjobs.cpp networkscanner.cpp libtdeprint_management_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined -libtdeprint_management_la_LIBADD = ../libtdeprint.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) +libtdeprint_management_la_LIBADD = ../libtdeprint.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE) libtdeprint_management_la_METASOURCES = AUTO libtdeprint_management_module_la_SOURCES = tdeprint_management_module.cpp libtdeprint_management_module_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined -libtdeprint_management_module_la_LIBADD = libtdeprint_management.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) +libtdeprint_management_module_la_LIBADD = libtdeprint_management.la $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) tdeprint_HEADERS = kmmainview.h kmjobviewer.h kmprinterpage.h kiconselectaction.h kmtimer.h tdeprintdir = $(includedir)/tdeprint diff --git a/tdeprint/management/kmconfigdialog.h b/tdeprint/management/kmconfigdialog.h index de04bc154..6a47995cc 100644 --- a/tdeprint/management/kmconfigdialog.h +++ b/tdeprint/management/kmconfigdialog.h @@ -25,7 +25,7 @@ #include "kmconfigpage.h" -class KDEPRINT_EXPORT KMConfigDialog : public KDialogBase +class TDEPRINT_EXPORT KMConfigDialog : public KDialogBase { Q_OBJECT public: diff --git a/tdeprint/management/kmconfigpage.h b/tdeprint/management/kmconfigpage.h index d56fbde8b..ac0495ab8 100644 --- a/tdeprint/management/kmconfigpage.h +++ b/tdeprint/management/kmconfigpage.h @@ -26,7 +26,7 @@ class KConfig; -class KDEPRINT_EXPORT KMConfigPage : public TQWidget +class TDEPRINT_EXPORT KMConfigPage : public TQWidget { Q_OBJECT public: diff --git a/tdeprint/management/kmjobviewer.h b/tdeprint/management/kmjobviewer.h index 650fe4b15..20f07976f 100644 --- a/tdeprint/management/kmjobviewer.h +++ b/tdeprint/management/kmjobviewer.h @@ -20,7 +20,7 @@ #ifndef KMJOBVIEWER_H #define KMJOBVIEWER_H -#if !defined( _KDEPRINT_COMPILE ) && defined( __GNUC__ ) +#if !defined( _TDEPRINT_COMPILE ) && defined( __GNUC__ ) #warning internal header, do not use except if you are a KDEPrint developer #endif @@ -46,7 +46,7 @@ class TQCheckBox; * if you're a KDEPrint developer. The API might change in the * future and binary compatibility might be broken. */ -class KDEPRINT_EXPORT KMJobViewer : public KMainWindow, public KMPrinterPage, public KPReloadObject +class TDEPRINT_EXPORT KMJobViewer : public KMainWindow, public KMPrinterPage, public KPReloadObject { Q_OBJECT public: diff --git a/tdeprint/management/kmmainview.h b/tdeprint/management/kmmainview.h index 0d05692d9..dea30d8ff 100644 --- a/tdeprint/management/kmmainview.h +++ b/tdeprint/management/kmmainview.h @@ -20,7 +20,7 @@ #ifndef KMMAINVIEW_H #define KMMAINVIEW_H -#if !defined( _KDEPRINT_COMPILE ) && defined( __GNUC__ ) +#if !defined( _TDEPRINT_COMPILE ) && defined( __GNUC__ ) #warning internal header, do not use except if you are a KDEPrint developer #endif @@ -50,7 +50,7 @@ class TQMenuBar; * if you're a KDEPrint developer. The API might change in the * future and binary compatibility might be broken. */ -class KDEPRINT_EXPORT KMMainView : public TQWidget, public KPReloadObject +class TDEPRINT_EXPORT KMMainView : public TQWidget, public KPReloadObject { Q_OBJECT public: @@ -128,6 +128,6 @@ private: KToolBar *m_menubar; }; -KDEPRINT_EXPORT int tdeprint_management_add_printer_wizard( TQWidget* parent ); +TDEPRINT_EXPORT int tdeprint_management_add_printer_wizard( TQWidget* parent ); #endif diff --git a/tdeprint/management/kmprinterpage.h b/tdeprint/management/kmprinterpage.h index 25e5b1c12..44d12e356 100644 --- a/tdeprint/management/kmprinterpage.h +++ b/tdeprint/management/kmprinterpage.h @@ -20,7 +20,7 @@ #ifndef KMPRINTERPAGE_H #define KMPRINTERPAGE_H -#if !defined( _KDEPRINT_COMPILE ) && defined( __GNUC__ ) +#if !defined( _TDEPRINT_COMPILE ) && defined( __GNUC__ ) #warning internal header, do not use except if you are a KDEPrint developer #endif diff --git a/tdeprint/management/kmpropbackend.h b/tdeprint/management/kmpropbackend.h index 01249d348..8f5768294 100644 --- a/tdeprint/management/kmpropbackend.h +++ b/tdeprint/management/kmpropbackend.h @@ -26,7 +26,7 @@ class TQLabel; -class KDEPRINT_EXPORT KMPropBackend : public KMPropWidget +class TDEPRINT_EXPORT KMPropBackend : public KMPropWidget { public: KMPropBackend(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/management/kmpropdriver.h b/tdeprint/management/kmpropdriver.h index 247431762..ebc22cb5c 100644 --- a/tdeprint/management/kmpropdriver.h +++ b/tdeprint/management/kmpropdriver.h @@ -26,7 +26,7 @@ class TQLabel; -class KDEPRINT_EXPORT KMPropDriver : public KMPropWidget +class TDEPRINT_EXPORT KMPropDriver : public KMPropWidget { public: KMPropDriver(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/management/kmpropertypage.h b/tdeprint/management/kmpropertypage.h index d13338750..3994e9a93 100644 --- a/tdeprint/management/kmpropertypage.h +++ b/tdeprint/management/kmpropertypage.h @@ -29,7 +29,7 @@ class KMPropWidget; class KMPrinter; -class KDEPRINT_EXPORT KMPropertyPage : public CJanusWidget, public KMPrinterPage, public KPReloadObject +class TDEPRINT_EXPORT KMPropertyPage : public CJanusWidget, public KMPrinterPage, public KPReloadObject { Q_OBJECT public: diff --git a/tdeprint/management/kmpropmembers.h b/tdeprint/management/kmpropmembers.h index 90330681e..9b8d789d2 100644 --- a/tdeprint/management/kmpropmembers.h +++ b/tdeprint/management/kmpropmembers.h @@ -24,7 +24,7 @@ class TQTextView; -class KDEPRINT_EXPORT KMPropMembers : public KMPropWidget +class TDEPRINT_EXPORT KMPropMembers : public KMPropWidget { public: KMPropMembers(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/management/kmpropwidget.h b/tdeprint/management/kmpropwidget.h index 83148bc72..45773ba0f 100644 --- a/tdeprint/management/kmpropwidget.h +++ b/tdeprint/management/kmpropwidget.h @@ -27,7 +27,7 @@ class KMPrinter; class KMWizard; -class KDEPRINT_EXPORT KMPropWidget : public TQWidget +class TDEPRINT_EXPORT KMPropWidget : public TQWidget { Q_OBJECT public: diff --git a/tdeprint/management/kmtimer.h b/tdeprint/management/kmtimer.h index eb40e7957..6c5cf4b9c 100644 --- a/tdeprint/management/kmtimer.h +++ b/tdeprint/management/kmtimer.h @@ -20,7 +20,7 @@ #ifndef KMTIMER_H #define KMTIMER_H -#if !defined( _KDEPRINT_COMPILE ) && defined( __GNUC__ ) +#if !defined( _TDEPRINT_COMPILE ) && defined( __GNUC__ ) #warning internal header, do not use except if you are a KDEPrint developer #endif @@ -34,7 +34,7 @@ * if you're a KDEPrint developer. The API might change in the * future and binary compatibility might be broken. */ -class KDEPRINT_EXPORT KMTimer : public TQTimer +class TDEPRINT_EXPORT KMTimer : public TQTimer { Q_OBJECT public: diff --git a/tdeprint/management/kmwbackend.h b/tdeprint/management/kmwbackend.h index 223123b4f..7b7b92708 100644 --- a/tdeprint/management/kmwbackend.h +++ b/tdeprint/management/kmwbackend.h @@ -27,7 +27,7 @@ class TQButtonGroup; class TQVBoxLayout; -class KDEPRINT_EXPORT KMWBackend : public KMWizardPage +class TDEPRINT_EXPORT KMWBackend : public KMWizardPage { public: KMWBackend(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/management/kmwinfobase.h b/tdeprint/management/kmwinfobase.h index 9a2b6464e..ee9e09b22 100644 --- a/tdeprint/management/kmwinfobase.h +++ b/tdeprint/management/kmwinfobase.h @@ -26,7 +26,7 @@ class TQLabel; class TQLineEdit; -class KDEPRINT_EXPORT KMWInfoBase : public KMWizardPage +class TDEPRINT_EXPORT KMWInfoBase : public KMWizardPage { public: KMWInfoBase(int n = 1, TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/management/kmwizard.h b/tdeprint/management/kmwizard.h index 5a2dcb6ea..f5331b87b 100644 --- a/tdeprint/management/kmwizard.h +++ b/tdeprint/management/kmwizard.h @@ -34,7 +34,7 @@ class KMPrinter; class KMWBackend; class SidePixmap; -class KDEPRINT_EXPORT KMWizard : public TQDialog +class TDEPRINT_EXPORT KMWizard : public TQDialog { Q_OBJECT public: diff --git a/tdeprint/management/kmwizardpage.h b/tdeprint/management/kmwizardpage.h index 61fe938b7..207f065b7 100644 --- a/tdeprint/management/kmwizardpage.h +++ b/tdeprint/management/kmwizardpage.h @@ -26,7 +26,7 @@ class KMPrinter; -class KDEPRINT_EXPORT KMWizardPage : public TQWidget +class TDEPRINT_EXPORT KMWizardPage : public TQWidget { Q_OBJECT public: diff --git a/tdeprint/management/kxmlcommandselector.h b/tdeprint/management/kxmlcommandselector.h index 0efc299f9..dbd89f73b 100644 --- a/tdeprint/management/kxmlcommandselector.h +++ b/tdeprint/management/kxmlcommandselector.h @@ -32,7 +32,7 @@ class TQLabel; class TQPushButton; class KDialogBase; -class KDEPRINT_EXPORT KXmlCommandSelector : public TQWidget +class TDEPRINT_EXPORT KXmlCommandSelector : public TQWidget { Q_OBJECT public: diff --git a/tdeprint/management/networkscanner.h b/tdeprint/management/networkscanner.h index 3d56bb03e..80a017676 100644 --- a/tdeprint/management/networkscanner.h +++ b/tdeprint/management/networkscanner.h @@ -25,7 +25,7 @@ #include <tqptrlist.h> -class KDEPRINT_EXPORT NetworkScanner : public TQWidget +class TDEPRINT_EXPORT NetworkScanner : public TQWidget { Q_OBJECT diff --git a/tdeprint/management/pluginaction.h b/tdeprint/management/pluginaction.h index fb355b597..0bb368ed2 100644 --- a/tdeprint/management/pluginaction.h +++ b/tdeprint/management/pluginaction.h @@ -22,7 +22,7 @@ #include <kaction.h> -class KDEPRINT_EXPORT PluginAction : public KAction +class TDEPRINT_EXPORT PluginAction : public KAction { Q_OBJECT diff --git a/tdeprint/management/sidepixmap.h b/tdeprint/management/sidepixmap.h index a9730883e..54f7a1f5e 100644 --- a/tdeprint/management/sidepixmap.h +++ b/tdeprint/management/sidepixmap.h @@ -25,7 +25,7 @@ #include <kdelibs_export.h> -class KDEPRINT_EXPORT SidePixmap : public TQFrame +class TDEPRINT_EXPORT SidePixmap : public TQFrame { public: SidePixmap(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/management/tdeprint_management_module.cpp b/tdeprint/management/tdeprint_management_module.cpp index 8d4027f75..d15ef791f 100644 --- a/tdeprint/management/tdeprint_management_module.cpp +++ b/tdeprint/management/tdeprint_management_module.cpp @@ -32,18 +32,18 @@ extern "C" { - KDEPRINT_EXPORT int add_printer_wizard(TQWidget *parent) + TDEPRINT_EXPORT int add_printer_wizard(TQWidget *parent) { return tdeprint_management_add_printer_wizard( parent ); } - KDEPRINT_EXPORT bool config_dialog(TQWidget *parent) + TDEPRINT_EXPORT bool config_dialog(TQWidget *parent) { KMConfigDialog dlg(parent); return dlg.exec(); } - KDEPRINT_EXPORT TQString select_command( TQWidget* parent ) + TDEPRINT_EXPORT TQString select_command( TQWidget* parent ) { KDialogBase dlg( parent, 0, true, i18n( "Select Command" ), KDialogBase::Ok|KDialogBase::Cancel ); KXmlCommandSelector *xmlSel = new KXmlCommandSelector( false, &dlg, "CommandSelector", &dlg ); |