From a9bde819f2b421dcc44741156e75eca4bb5fb4f4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:49:30 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- korn/boxcontaineritem.cpp | 8 ++++---- korn/boxcontaineritem.h | 6 +++--- korn/kio.cpp | 16 ++++++++-------- korn/kio.h | 8 ++++---- korn/mailsubject.cpp | 2 +- korn/subjectsdlg.cpp | 4 ++-- 6 files changed, 22 insertions(+), 22 deletions(-) (limited to 'korn') diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp index b026e95c..60277d1e 100644 --- a/korn/boxcontaineritem.cpp +++ b/korn/boxcontaineritem.cpp @@ -161,10 +161,10 @@ void BoxContainerItem::readConfig( KConfig* config, const int index ) void BoxContainerItem::runCommand( const TQString& cmd ) { - KProcess *process = new KProcess; + TDEProcess *process = new TDEProcess; process->setUseShell( true ); *process << cmd; - connect( process, TQT_SIGNAL( processExited (KProcess *) ), this, TQT_SLOT( processExited( KProcess * ) ) ); + connect( process, TQT_SIGNAL( processExited (TDEProcess *) ), this, TQT_SLOT( processExited( TDEProcess * ) ) ); process->start(); } @@ -281,7 +281,7 @@ void BoxContainerItem::drawLabel( TQLabel *label, const int count, const bool ne } if( hasIcon ) - pixmap = KGlobal::iconLoader()->loadIcon( *_icons[ index ], KIcon::Desktop, KIcon::SizeSmallMedium ); + pixmap = TDEGlobal::iconLoader()->loadIcon( *_icons[ index ], KIcon::Desktop, KIcon::SizeSmallMedium ); if( hasIcon && hasFg ) { @@ -435,7 +435,7 @@ void BoxContainerItem::stopTimer() doStopTimer(); } -void BoxContainerItem::processExited( KProcess* proc ) +void BoxContainerItem::processExited( TDEProcess* proc ) { delete proc; } diff --git a/korn/boxcontaineritem.h b/korn/boxcontaineritem.h index e12c400f..f903feb8 100644 --- a/korn/boxcontaineritem.h +++ b/korn/boxcontaineritem.h @@ -27,7 +27,7 @@ class KornMailSubject; class KActionCollection; class KConfig; class KPopupMenu; -class KProcess; +class TDEProcess; class TQColor; class TQLabel; @@ -213,10 +213,10 @@ signals: private slots: /** - * This slot is called when a KProcess-instance needs to be deleted:) + * This slot is called when a TDEProcess-instance needs to be deleted:) * @param proc The instance of the instance which must be deleted. */ - void processExited( KProcess* proc ); + void processExited( TDEProcess* proc ); protected: //This settings are stored here because every implementation needs them. diff --git a/korn/kio.cpp b/korn/kio.cpp index 8015595c..a2131198 100644 --- a/korn/kio.cpp +++ b/korn/kio.cpp @@ -461,17 +461,17 @@ bool KKioDrop::startProcess() // debug( "proc start: %s", _command.data() ); - _process = new KProcess; + _process = new TDEProcess; _process->setUseShell( true ); // only reading stdin yet - connect( _process,TQT_SIGNAL(receivedStdout( KProcess *, char *, int)), - this, TQT_SLOT(receivedStdout( KProcess *,char *,int)) ); - connect( _process, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(processExit(KProcess*)) ); + connect( _process,TQT_SIGNAL(receivedStdout( TDEProcess *, char *, int)), + this, TQT_SLOT(receivedStdout( TDEProcess *,char *,int)) ); + connect( _process, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(processExit(TDEProcess*)) ); *_process << _kurl->path(); - _process->start( KProcess::NotifyOnExit, KProcess::Stdout ); + _process->start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ); return true; } @@ -491,7 +491,7 @@ bool KKioDrop::stopProcess() return true; } -void KKioDrop::receivedStdout( KProcess *proc, char * buffer, int /*len*/ ) +void KKioDrop::receivedStdout( TDEProcess *proc, char * buffer, int /*len*/ ) { assert(static_cast(proc) == static_cast(_process)); @@ -540,7 +540,7 @@ void KKioDrop::receivedStdout( KProcess *proc, char * buffer, int /*len*/ ) } -void KKioDrop::processExit(KProcess* proc) +void KKioDrop::processExit(TDEProcess* proc) { assert(static_cast(proc) == static_cast(_process)); diff --git a/korn/kio.h b/korn/kio.h index 21ac533e..519dced5 100644 --- a/korn/kio.h +++ b/korn/kio.h @@ -28,7 +28,7 @@ class TQWidget; class KDropDialog; class KornMailSubject; -class KProcess; +class TDEProcess; class KIO_Count; class KIO_Protocol; class KIO_Subjects; @@ -70,7 +70,7 @@ private: int _readSubjectsTotalSteps; int _deleteMailsTotalSteps; //For process - KProcess *_process; + TDEProcess *_process; //List of mailurls fetched by the last time emails were counted struct FileInfo { @@ -202,7 +202,7 @@ public slots: private slots: //For Process too - void processExit(KProcess*); - void receivedStdout( KProcess *, char *, int); + void processExit(TDEProcess*); + void receivedStdout( TDEProcess *, char *, int); }; #endif // KEG_KIODROP_H diff --git a/korn/mailsubject.cpp b/korn/mailsubject.cpp index 747d9ec7..459d7d46 100644 --- a/korn/mailsubject.cpp +++ b/korn/mailsubject.cpp @@ -178,7 +178,7 @@ const TQTextCodec* KornMailSubject::codecForName(const TQCString& _str) { if (_str.isEmpty()) return 0; TQCString codec = _str; - return KGlobal::charsets()->codecForName(codec); + return TDEGlobal::charsets()->codecForName(codec); } void KornMailSubject::decodeHeaders() diff --git a/korn/subjectsdlg.cpp b/korn/subjectsdlg.cpp index 5c96cbba..d1cf3954 100644 --- a/korn/subjectsdlg.cpp +++ b/korn/subjectsdlg.cpp @@ -15,13 +15,13 @@ KornSubjectsDlg::SubjectListViewItem::SubjectListViewItem( TQListView *parent, KornMailSubject * item) // set the column strings except column 2 (date) - : KListViewItem(parent, item->getSender(), item->getSubject(), "", KGlobal::locale()->formatNumber(item->getSize(), 0)) + : KListViewItem(parent, item->getSender(), item->getSubject(), "", TDEGlobal::locale()->formatNumber(item->getSize(), 0)) , _mailSubject( new KornMailSubject( *item ) ) { // convert the date according to the user settings and show it in column 2 TQDateTime date; date.setTime_t(_mailSubject->getDate()); - setText(2, KGlobal::locale()->formatDateTime(date, true, true)); + setText(2, TDEGlobal::locale()->formatDateTime(date, true, true)); } KornSubjectsDlg::SubjectListViewItem::~SubjectListViewItem() -- cgit v1.2.3