diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/freshklam.cpp | 14 | ||||
-rw-r--r-- | src/freshklam.h | 6 | ||||
-rw-r--r-- | src/scanviewer.cpp | 14 | ||||
-rw-r--r-- | src/scanviewer.h | 6 | ||||
-rw-r--r-- | src/schedule.cpp | 14 | ||||
-rw-r--r-- | src/schedule.h | 6 | ||||
-rw-r--r-- | src/sqlite/os.h | 17 |
7 files changed, 37 insertions, 40 deletions
diff --git a/src/freshklam.cpp b/src/freshklam.cpp index 3d19996..175893e 100644 --- a/src/freshklam.cpp +++ b/src/freshklam.cpp @@ -29,7 +29,7 @@ #include <ksystemtray.h> #include <ktar.h> #include <kprogress.h> -#include <kprocio.h> +#include <tdeprocio.h> #include <knotifyclient.h> #include <tdeapplication.h> #include <dcopclient.h> @@ -844,18 +844,18 @@ Freshklam::getCurrentVersionOfClamAV( ) ////kdDebug() << "version clamav" << endl; TQString suCommand=TQString("clamscan -V"); - versionproc = new KProcIO(); + versionproc = new TDEProcIO(); versionproc->setUseShell(TRUE); - versionproc->setUsePty (KProcIO::Stdout,TRUE); + versionproc->setUsePty (TDEProcIO::Stdout,TRUE); *versionproc<<suCommand; - connect( versionproc, TQ_SIGNAL(readReady(KProcIO *)), - TQ_SLOT(readVersionLine(KProcIO *)) ); + connect( versionproc, TQ_SIGNAL(readReady(TDEProcIO *)), + TQ_SLOT(readVersionLine(TDEProcIO *)) ); connect( versionproc, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(versionExited()) ); - versionproc->start(KProcIO::NotifyOnExit); + versionproc->start(TDEProcIO::NotifyOnExit); versionproc->closeWhenDone(); } @@ -865,7 +865,7 @@ void Freshklam::versionExited() delete versionproc; } -void Freshklam::readVersionLine(KProcIO *) +void Freshklam::readVersionLine(TDEProcIO *) { TQString lineout = ""; int pos; diff --git a/src/freshklam.h b/src/freshklam.h index 2f539cd..2363bd7 100644 --- a/src/freshklam.h +++ b/src/freshklam.h @@ -36,7 +36,7 @@ class TDEConfig; class KURLRequester; class KLineEdit; class KProgressDialog; -class KProcIO; +class TDEProcIO; /** * This class serves as the main window for Freshklam. It handles the @@ -121,7 +121,7 @@ private slots: /* void klamavInstallationExited(TDEProcess *arkollonproc); void clamavInstallationExited(TDEProcess *arkollonproc);*/ //void newItems( const KFileItemList& ); - void readVersionLine(KProcIO *); + void readVersionLine(TDEProcIO *); /* void parseSFPage(); void parseSFPageHack();*/ /* void updateCanceled();*/ @@ -154,7 +154,7 @@ private: TQListBox *resultbox; TQLabel *status_label, *matches_label; TDEProcess *childproc; - KProcIO *versionproc; + TDEProcIO *versionproc; TQString buf; TDEConfig* config; TQStringList lastSearchItems; diff --git a/src/scanviewer.cpp b/src/scanviewer.cpp index 1985db4..3637225 100644 --- a/src/scanviewer.cpp +++ b/src/scanviewer.cpp @@ -19,7 +19,7 @@ #include <kstatusbar.h> #include <tdeio/netaccess.h> #include <knotifyclient.h> -#include <kprocio.h> +#include <tdeprocio.h> #include <tqlayout.h> #include <tdecmdlineargs.h> #include <tdemessagebox.h> @@ -479,9 +479,9 @@ void ScanViewer::slotScan(const TQStringList & filepattern, int mode, bool recur } } - childproc = new KProcIO(); + childproc = new TDEProcIO(); childproc->setUseShell(TRUE); - childproc->setUsePty (KProcIO::Stdout,TRUE); + childproc->setUsePty (TDEProcIO::Stdout,TRUE); if(clamdscan) { config->setGroup("KlamavBackend"); @@ -515,9 +515,9 @@ void ScanViewer::slotScan(const TQStringList & filepattern, int mode, bool recur TQ_SLOT(receivedOutput(TDEProcess *, char *, int)) ); childproc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);*/ - connect( childproc, TQ_SIGNAL(readReady(KProcIO *)), - TQ_SLOT(receivedOutput(KProcIO *)) ); - childproc->start(KProcIO::NotifyOnExit); + connect( childproc, TQ_SIGNAL(readReady(TDEProcIO *)), + TQ_SLOT(receivedOutput(TDEProcIO *)) ); + childproc->start(TDEProcIO::NotifyOnExit); connect( childproc, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(childExited()) ); @@ -660,7 +660,7 @@ void ScanViewer::childExited() } -void ScanViewer::receivedOutput(KProcIO *) +void ScanViewer::receivedOutput(TDEProcIO *) { //buf += TQCString(buffer, buflen+1); processOutput(); diff --git a/src/scanviewer.h b/src/scanviewer.h index 8c8ed9e..eba8316 100644 --- a/src/scanviewer.h +++ b/src/scanviewer.h @@ -25,7 +25,7 @@ class TQListView; class TQListViewItem; class TQPushButton; class TQLabel; -class KProcIO; +class TDEProcIO; class TDEConfig; class KURLRequester; class KProgress; @@ -112,7 +112,7 @@ private slots: //void templateActivated(int index); void childExited(); void resetSysTray(); - void receivedOutput(KProcIO *); + void receivedOutput(TDEProcIO *); //void itemSelected(const TQString&); void slotClear(); void slotRMB( TQListViewItem *, const TQPoint &, int ); @@ -138,7 +138,7 @@ private: TQListView *resultview; TQPushButton *search_button, *cancel_button; TQLabel *status_label, *status2_label,*matches_label,*matches2_label; - KProcIO *childproc; + TDEProcIO *childproc; TQString buf; TDEConfig* config; TQStringList lastSearchItems; diff --git a/src/schedule.cpp b/src/schedule.cpp index 02d11c4..80395d8 100644 --- a/src/schedule.cpp +++ b/src/schedule.cpp @@ -24,7 +24,7 @@ #include <kdebug.h> // REMOVEME /* Finding out ICEauthority path */ -#include <kprocio.h> +#include <tdeprocio.h> Schedule::Schedule( TQWidget* parent, const char* name, bool modal, WFlags fl ) : TQDialog( parent, name, modal, fl ) @@ -489,18 +489,18 @@ void Schedule::getICEauth() /* Code taken from freshklam.cpp */ TQString command=TQString("iceauth -v exit"); - iceproc = new KProcIO(); + iceproc = new TDEProcIO(); iceproc->setUseShell(TRUE); - iceproc->setUsePty(KProcIO::Stdout,TRUE); + iceproc->setUsePty(TDEProcIO::Stdout,TRUE); *iceproc<<command; - connect( iceproc, TQ_SIGNAL(readReady(KProcIO *)), - TQ_SLOT(slotICEoutput(KProcIO *)) ); + connect( iceproc, TQ_SIGNAL(readReady(TDEProcIO *)), + TQ_SLOT(slotICEoutput(TDEProcIO *)) ); connect( iceproc, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(slotICEexited()) ); - iceproc->start(KProcIO::NotifyOnExit); + iceproc->start(TDEProcIO::NotifyOnExit); iceproc->closeWhenDone(); } @@ -510,7 +510,7 @@ void Schedule::slotICEexited() delete iceproc; } -void Schedule::slotICEoutput(KProcIO *) +void Schedule::slotICEoutput(TDEProcIO *) { TQString lineout = ""; int pos; diff --git a/src/schedule.h b/src/schedule.h index 02018ac..3ed8d04 100644 --- a/src/schedule.h +++ b/src/schedule.h @@ -43,7 +43,7 @@ class KURLRequester; class CollectionSetup; class TQToolButton; class TQHBoxLayout; -class KProcIO; +class TDEProcIO; class HMSTimeWidget : public KIntSpinBox { @@ -125,7 +125,7 @@ private slots: void slotOK(); void slotCancel(); - void slotICEoutput(KProcIO *); + void slotICEoutput(TDEProcIO *); void slotICEexited(); private: void setupAccel(); @@ -170,7 +170,7 @@ private: CTHost* cthost; CTTask* cttask; CTCron* ctcron; - KProcIO *iceproc; + TDEProcIO *iceproc; }; diff --git a/src/sqlite/os.h b/src/sqlite/os.h index 1434c9f..2c46c38 100644 --- a/src/sqlite/os.h +++ b/src/sqlite/os.h @@ -21,25 +21,22 @@ ** Figure out if we are dealing with Unix, Windows or MacOS. ** ** N.B. MacOS means Mac Classic (or Carbon). Treat Darwin (OS X) as Unix. -** The MacOS build is designed to use CodeWarrior (tested with v8) */ #if !defined(OS_UNIX) && !defined(OS_TEST) && !defined(OS_OTHER) # define OS_OTHER 0 # ifndef OS_WIN -# if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) -# define OS_WIN 1 -# define OS_UNIX 0 -# else -# define OS_WIN 0 -# define OS_UNIX 1 +# if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) +# define OS_WIN 1 +# define OS_UNIX 0 +# else +# define OS_WIN 0 +# define OS_UNIX 1 # endif # else # define OS_UNIX 0 # endif #else -# ifndef OS_WIN -# define OS_WIN 0 -# endif +# define OS_WIN 0 #endif /* |