diff options
Diffstat (limited to 'tdeprint')
-rw-r--r-- | tdeprint/slave/Makefile.am | 2 | ||||
-rw-r--r-- | tdeprint/slave/tdeio_print.cpp | 44 | ||||
-rw-r--r-- | tdeprint/slave/tdeio_print.h | 8 | ||||
-rw-r--r-- | tdeprint/tdeprint_part/Makefile.am | 2 | ||||
-rw-r--r-- | tdeprint/tdeprintfax/Makefile.am | 4 |
5 files changed, 30 insertions, 30 deletions
diff --git a/tdeprint/slave/Makefile.am b/tdeprint/slave/Makefile.am index 5da6a536a..6942fc962 100644 --- a/tdeprint/slave/Makefile.am +++ b/tdeprint/slave/Makefile.am @@ -7,7 +7,7 @@ INCLUDES= $(all_includes) kde_module_LTLIBRARIES = tdeio_print.la tdeio_print_la_SOURCES = tdeio_print.cpp -tdeio_print_la_LIBADD = $(LIB_KIO) -ltdeprint +tdeio_print_la_LIBADD = $(LIB_TDEIO) -ltdeprint tdeio_print_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) METASOURCES = AUTO diff --git a/tdeprint/slave/tdeio_print.cpp b/tdeprint/slave/tdeio_print.cpp index 1106b8028..fa03bf032 100644 --- a/tdeprint/slave/tdeio_print.cpp +++ b/tdeprint/slave/tdeio_print.cpp @@ -150,19 +150,19 @@ int kdemain(int argc, char **argv) TDECmdLineArgs::init( &about ); TDEApplication app; - KIO_Print slave(argv[2], argv[3]); + TDEIO_Print slave(argv[2], argv[3]); slave.dispatchLoop(); PRINT_DEBUG << "done" << endl; return 0; } -KIO_Print::KIO_Print(const TQCString& pool, const TQCString& app) +TDEIO_Print::TDEIO_Print(const TQCString& pool, const TQCString& app) : TDEIO::SlaveBase("print", pool, app) { } -void KIO_Print::listDir(const KURL& url) +void TDEIO_Print::listDir(const KURL& url) { if ( url.protocol() == "printdb" ) { @@ -233,7 +233,7 @@ void KIO_Print::listDir(const KURL& url) } } -void KIO_Print::listRoot() +void TDEIO_Print::listRoot() { PRINT_DEBUG << "listing root entry" << endl; @@ -266,7 +266,7 @@ void KIO_Print::listRoot() finished(); } -void KIO_Print::listDirDB( const KURL& url ) +void TDEIO_Print::listDirDB( const KURL& url ) { PRINT_DEBUG << "listDirDB: " << url << endl; @@ -373,7 +373,7 @@ void KIO_Print::listDirDB( const KURL& url ) */ } -void KIO_Print::stat(const KURL& url) +void TDEIO_Print::stat(const KURL& url) { if ( url.protocol() == "printdb" ) { @@ -430,7 +430,7 @@ void KIO_Print::stat(const KURL& url) error(TDEIO::ERR_DOES_NOT_EXIST, url.path()); } -void KIO_Print::statDB( const KURL& url ) +void TDEIO_Print::statDB( const KURL& url ) { PRINT_DEBUG << "statDB: " << url << endl; TDEIO::UDSEntry entry; @@ -443,7 +443,7 @@ void KIO_Print::statDB( const KURL& url ) finished(); } -bool KIO_Print::getDBFile( const KURL& src ) +bool TDEIO_Print::getDBFile( const KURL& src ) { PRINT_DEBUG << "downloading " << src.url() << endl; @@ -468,7 +468,7 @@ bool KIO_Print::getDBFile( const KURL& src ) return ( m_httpError == 0 ); } -void KIO_Print::getDB( const KURL& url ) +void TDEIO_Print::getDB( const KURL& url ) { PRINT_DEBUG << "downloading PPD file for " << url.url() << endl; @@ -498,7 +498,7 @@ void KIO_Print::getDB( const KURL& url ) } } -void KIO_Print::slotResult( TDEIO::Job *j ) +void TDEIO_Print::slotResult( TDEIO::Job *j ) { /* * store slave results for later user (job gets deleted @@ -513,7 +513,7 @@ void KIO_Print::slotResult( TDEIO::Job *j ) kapp->exit_loop(); } -void KIO_Print::slotData( TDEIO::Job *j, const TQByteArray& d ) +void TDEIO_Print::slotData( TDEIO::Job *j, const TQByteArray& d ) { PRINT_DEBUG << "HTTP data received (size=" << d.size() << ")" << endl; if ( d.size() > 0 ) @@ -528,17 +528,17 @@ void KIO_Print::slotData( TDEIO::Job *j, const TQByteArray& d ) } } -void KIO_Print::slotTotalSize( TDEIO::Job*, TDEIO::filesize_t sz ) +void TDEIO_Print::slotTotalSize( TDEIO::Job*, TDEIO::filesize_t sz ) { totalSize( sz ); } -void KIO_Print::slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t sz ) +void TDEIO_Print::slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t sz ) { processedSize( sz ); } -void KIO_Print::get(const KURL& url) +void TDEIO_Print::get(const KURL& url) { if ( url.protocol() == "printdb" ) { @@ -626,7 +626,7 @@ void KIO_Print::get(const KURL& url) error(TDEIO::ERR_INTERNAL, i18n("Unable to determine source type for %1.").arg(printer)); } -void KIO_Print::showPrinterInfo(KMPrinter *printer) +void TDEIO_Print::showPrinterInfo(KMPrinter *printer) { if (!KMManager::self()->completePrinter(printer)) error(TDEIO::ERR_INTERNAL, i18n("Unable to retrieve printer information for %1.").arg(printer->name())); @@ -667,7 +667,7 @@ void KIO_Print::showPrinterInfo(KMPrinter *printer) } } -void KIO_Print::showClassInfo(KMPrinter *printer) +void TDEIO_Print::showClassInfo(KMPrinter *printer) { if (!KMManager::self()->completePrinter(printer)) error(TDEIO::ERR_INTERNAL, i18n("Unable to retrieve class information for %1.").arg(printer->name())); @@ -714,7 +714,7 @@ void KIO_Print::showClassInfo(KMPrinter *printer) } } -void KIO_Print::showSpecialInfo(KMPrinter *printer) +void TDEIO_Print::showSpecialInfo(KMPrinter *printer) { mimeType("text/html"); @@ -753,7 +753,7 @@ void KIO_Print::showSpecialInfo(KMPrinter *printer) finished(); } -bool KIO_Print::loadTemplate(const TQString& filename, TQString& buffer) +bool TDEIO_Print::loadTemplate(const TQString& filename, TQString& buffer) { TQFile f(locate("data", TQString::fromLatin1("tdeprint/template/")+filename)); if (f.exists() && f.open(IO_ReadOnly)) @@ -769,7 +769,7 @@ bool KIO_Print::loadTemplate(const TQString& filename, TQString& buffer) } } -void KIO_Print::showData(const TQString& pathname) +void TDEIO_Print::showData(const TQString& pathname) { PRINT_DEBUG << "sending data: " << pathname << endl; TQFile f(pathname); @@ -792,7 +792,7 @@ void KIO_Print::showData(const TQString& pathname) * - $TDEDIR/share/apps/tdeprint/template/ * - as a desktop icon */ -TQString KIO_Print::locateData(const TQString& item) +TQString TDEIO_Print::locateData(const TQString& item) { TQString path = locate("data", "tdeprint/template/"+item); if (path.isEmpty()) @@ -800,7 +800,7 @@ TQString KIO_Print::locateData(const TQString& item) return path; } -void KIO_Print::showJobs(KMPrinter *prt, bool completed) +void TDEIO_Print::showJobs(KMPrinter *prt, bool completed) { mimeType("text/html"); @@ -886,7 +886,7 @@ void KIO_Print::showJobs(KMPrinter *prt, bool completed) finished(); } -void KIO_Print::showDriver(KMPrinter *prt) +void TDEIO_Print::showDriver(KMPrinter *prt) { mimeType("text/html"); diff --git a/tdeprint/slave/tdeio_print.h b/tdeprint/slave/tdeio_print.h index 1b7158eb9..ff56cb426 100644 --- a/tdeprint/slave/tdeio_print.h +++ b/tdeprint/slave/tdeio_print.h @@ -17,8 +17,8 @@ * Boston, MA 02110-1301, USA. **/ -#ifndef KIO_PRINT_H -#define KIO_PRINT_H +#ifndef TDEIO_PRINT_H +#define TDEIO_PRINT_H #include <tdeio/slavebase.h> #include <tdeio/global.h> @@ -30,11 +30,11 @@ namespace TDEIO { class Job; } -class KIO_Print : public TQObject, public TDEIO::SlaveBase +class TDEIO_Print : public TQObject, public TDEIO::SlaveBase { Q_OBJECT public: - KIO_Print(const TQCString& pool, const TQCString& app); + TDEIO_Print(const TQCString& pool, const TQCString& app); void listDir(const KURL& url); void get(const KURL& url); diff --git a/tdeprint/tdeprint_part/Makefile.am b/tdeprint/tdeprint_part/Makefile.am index 27422bd89..0ebc3376f 100644 --- a/tdeprint/tdeprint_part/Makefile.am +++ b/tdeprint/tdeprint_part/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libtdeprint_part.la libtdeprint_part_la_SOURCES = printpart.cpp libtdeprint_part_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -libtdeprint_part_la_LIBADD = -ltdeprint_management $(LIB_KPARTS) +libtdeprint_part_la_LIBADD = -ltdeprint_management $(LIB_TDEPARTS) noinst_HEADERS = printpart.h diff --git a/tdeprint/tdeprintfax/Makefile.am b/tdeprint/tdeprintfax/Makefile.am index 124cd23ce..eb886bdfe 100644 --- a/tdeprint/tdeprintfax/Makefile.am +++ b/tdeprint/tdeprintfax/Makefile.am @@ -3,8 +3,8 @@ INCLUDES= $(all_includes) bin_PROGRAMS = tdeprintfax tdeprintfax_SOURCES = main.cpp tdeprintfax.cpp faxab.cpp faxctrl.cpp confgeneral.cpp configdlg.cpp \ conffax.cpp confsystem.cpp conffilters.cpp filterdlg.cpp defcmds.cpp -tdeprintfax_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -tdeprintfax_LDADD = $(LIB_TDEUI) $(LIB_KIO) $(LIB_TDEPRINT) -ltdeabc +tdeprintfax_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +tdeprintfax_LDADD = $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPRINT) -ltdeabc tdeprintfax_METASOURCES = AUTO xdg_apps_DATA = tdeprintfax.desktop |