From 5f444a9ea966b68991cef44d2711378ef9ff406d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:40:58 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kdat/BackupDlg.cpp | 14 +++++++------- kdat/BackupDlg.h | 8 ++++---- kdat/BackupProfileManager.cpp | 2 +- kdat/FileInfoWidget.cpp | 6 +++--- kdat/FormatOptDlg.cpp | 4 ++-- kdat/ImageCache.cpp | 2 +- kdat/KDatMainWindow.cpp | 8 ++++---- kdat/TapeInfoWidget.cpp | 4 ++-- kdat/TapeManager.cpp | 4 ++-- kdat/Util.cpp | 4 ++-- kdat/VerifyDlg.cpp | 16 ++++++++-------- kdat/VerifyDlg.h | 10 +++++----- 12 files changed, 41 insertions(+), 41 deletions(-) (limited to 'kdat') diff --git a/kdat/BackupDlg.cpp b/kdat/BackupDlg.cpp index e32f680..c224c0b 100644 --- a/kdat/BackupDlg.cpp +++ b/kdat/BackupDlg.cpp @@ -216,7 +216,7 @@ void BackupDlg::show() _tarParser = new TarParser(); connect( _tarParser, TQT_SIGNAL( sigEntry( const TQString &, int, int, int ) ), this, TQT_SLOT( slotEntry( const TQString &, int, int, int ) ) ); - _proc = new KProcess(); + _proc = new TDEProcess(); *_proc << Options::instance()->getTarCommand(); if ( _oneFilesystem ) { *_proc << "-l"; @@ -281,17 +281,17 @@ void BackupDlg::show() return; } - connect( _proc, TQT_SIGNAL( processExited( KProcess* ) ), this, TQT_SLOT( slotProcessExited( KProcess* ) ) ); - connect( _proc, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ), this, TQT_SLOT( slotStdout( KProcess*, char*, int ) ) ); + connect( _proc, TQT_SIGNAL( processExited( TDEProcess* ) ), this, TQT_SLOT( slotProcessExited( TDEProcess* ) ) ); + connect( _proc, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), this, TQT_SLOT( slotStdout( TDEProcess*, char*, int ) ) ); startTimer( 1000 ); - _proc->start( KProcess::NotifyOnExit, KProcess::Stdout ); + _proc->start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ); TQDialog::show(); } -void BackupDlg::slotProcessExited( KProcess* ) +void BackupDlg::slotProcessExited( TDEProcess* ) { updateStats(); @@ -316,12 +316,12 @@ void BackupDlg::slotProcessExited( KProcess* ) _abort->setEnabled( FALSE ); } -// the KProcess passes the arguments to tar, and tar's output is piped here. +// the TDEProcess passes the arguments to tar, and tar's output is piped here. // The output is shown to _tarParser->slotData(), which figures out which files // are going to tape and their file parameters, and saves these data into // kdat's archive. The raw data are then written to tape with write(). // 2002-01-27 LEW -void BackupDlg::slotStdout( KProcess*, char* buf, int len ) +void BackupDlg::slotStdout( TDEProcess*, char* buf, int len ) { // Don't start throughput timer until the first block of data is written. if ( _startTime == 0 ) { diff --git a/kdat/BackupDlg.h b/kdat/BackupDlg.h index 423e920..57bd333 100644 --- a/kdat/BackupDlg.h +++ b/kdat/BackupDlg.h @@ -24,7 +24,7 @@ class TQLabel; class TQPushButton; -class KProcess; +class TDEProcess; class Archive; class File; @@ -38,7 +38,7 @@ class TarParser; class BackupDlg : public TQDialog { Q_OBJECT - KProcess* _proc; + TDEProcess* _proc; TarParser* _tarParser; TQString _archiveName; TQString _workingDir; @@ -72,8 +72,8 @@ class BackupDlg : public TQDialog { void updateStats(); private slots: - void slotProcessExited( KProcess* proc ); - void slotStdout( KProcess* proc, char* buf, int len ); + void slotProcessExited( TDEProcess* proc ); + void slotStdout( TDEProcess* proc, char* buf, int len ); void slotOK(); void slotAbort(); void slotEntry( const TQString& name, int size, int mtime, int record ); diff --git a/kdat/BackupProfileManager.cpp b/kdat/BackupProfileManager.cpp index 7b42ab7..eebf88b 100644 --- a/kdat/BackupProfileManager.cpp +++ b/kdat/BackupProfileManager.cpp @@ -35,7 +35,7 @@ BackupProfileManager::BackupProfileManager() // Get a list of all available backup profiles. TQStringList relList; - (void) KGlobal::dirs()->findAllResources( "appdata", "*.bp", false, true, relList); + (void) TDEGlobal::dirs()->findAllResources( "appdata", "*.bp", false, true, relList); for(TQStringList::Iterator it = relList.begin(); it != relList.end(); diff --git a/kdat/FileInfoWidget.cpp b/kdat/FileInfoWidget.cpp index 5b75cf7..d5ef7bf 100644 --- a/kdat/FileInfoWidget.cpp +++ b/kdat/FileInfoWidget.cpp @@ -143,13 +143,13 @@ void FileInfoWidget::setFile( const TQString & name ) TQDateTime datetime; datetime.setTime_t(info.st_ctime); - _ctime->setText( KGlobal::locale()->formatDateTime(datetime, false) ); + _ctime->setText( TDEGlobal::locale()->formatDateTime(datetime, false) ); datetime.setTime_t(info.st_mtime); - _mtime->setText( KGlobal::locale()->formatDateTime(datetime, false) ); + _mtime->setText( TDEGlobal::locale()->formatDateTime(datetime, false) ); datetime.setTime_t(info.st_atime); - _atime->setText( KGlobal::locale()->formatDateTime(datetime, false) ); + _atime->setText( TDEGlobal::locale()->formatDateTime(datetime, false) ); _size->setText( Util::bytesToString( info.st_size ) ); diff --git a/kdat/FormatOptDlg.cpp b/kdat/FormatOptDlg.cpp index 81a74f4..223e5e8 100644 --- a/kdat/FormatOptDlg.cpp +++ b/kdat/FormatOptDlg.cpp @@ -108,7 +108,7 @@ FormatOptDlg::FormatOptDlg( const TQString & def, TQWidget* parent, const char* size /= 1024; _tapeSizeUnits->setCurrentItem( 0 ); } - _tapeSize->setText( KGlobal::locale()->formatNumber(size, 0) ); + _tapeSize->setText( TDEGlobal::locale()->formatNumber(size, 0) ); } FormatOptDlg::~FormatOptDlg() @@ -119,7 +119,7 @@ void FormatOptDlg::okClicked() { _name = _entry->text(); - _size = (int)KGlobal::locale()->readNumber( _tapeSize->text() ); + _size = (int)TDEGlobal::locale()->readNumber( _tapeSize->text() ); if ( _tapeSizeUnits->currentItem() == 0 ) { // MB _size *= 1024; diff --git a/kdat/ImageCache.cpp b/kdat/ImageCache.cpp index c50d807..a2d489a 100644 --- a/kdat/ImageCache.cpp +++ b/kdat/ImageCache.cpp @@ -24,7 +24,7 @@ ImageCache::ImageCache() { - KIconLoader *l = KGlobal::iconLoader(); + KIconLoader *l = TDEGlobal::iconLoader(); /* 2002-01-24 FP */ // _archive = new TQPixmap(l->iconPath("package", KIcon::Toolbar)); _archive = new TQPixmap(l->iconPath("tar", KIcon::Small)); diff --git a/kdat/KDatMainWindow.cpp b/kdat/KDatMainWindow.cpp index d43b91b..343652a 100644 --- a/kdat/KDatMainWindow.cpp +++ b/kdat/KDatMainWindow.cpp @@ -446,7 +446,7 @@ void KDatMainWindow::fileBackup() backupProfile.setRemoveSnapshot( bp->getRemoveSnapshot() ); } else { TQString name; - name = i18n( "Archive created on %1" ).arg( KGlobal::locale()->formatDate(TQDate::currentDate(), true) ); + name = i18n( "Archive created on %1" ).arg( TDEGlobal::locale()->formatDate(TQDate::currentDate(), true) ); name = name.stripWhiteSpace(); TQStringList files; @@ -486,8 +486,8 @@ void KDatMainWindow::fileBackup() msg = i18n( "WARNING: The estimated archive size is %1 KB but " "the tape has only %2 KB of space!\n" "Back up anyway?" ) - .arg(KGlobal::locale()->formatNumber(size, 0)) - .arg(KGlobal::locale()->formatNumber(TapeManager::instance()->getMountedTape()->getSize() - tapeSize, 0 )); + .arg(TDEGlobal::locale()->formatNumber(size, 0)) + .arg(TDEGlobal::locale()->formatNumber(TapeManager::instance()->getMountedTape()->getSize() - tapeSize, 0 )); int result = KMessageBox::warningContinueCancel( this, msg, i18n("Backup"), i18n("Backup") ); if ( result != KMessageBox::Continue) { @@ -865,7 +865,7 @@ void KDatMainWindow::fileFormatTape() i18n("Format Tape"), i18n("Format")); if (result == KMessageBox::Continue ) { TQString name; - name = i18n( "Tape created on %1" ).arg( KGlobal::locale()->formatDate(TQDate::currentDate(), true) ); + name = i18n( "Tape created on %1" ).arg( TDEGlobal::locale()->formatDate(TQDate::currentDate(), true) ); FormatOptDlg dlg( name.stripWhiteSpace(), this ); if ( dlg.exec() != TQDialog::Accepted ) { return; diff --git a/kdat/TapeInfoWidget.cpp b/kdat/TapeInfoWidget.cpp index 1455743..de496c6 100644 --- a/kdat/TapeInfoWidget.cpp +++ b/kdat/TapeInfoWidget.cpp @@ -218,7 +218,7 @@ bool TapeInfoWidget::isModified() return TRUE; } - int size = (int)KGlobal::locale()->readNumber( _tapeSize->text() ); + int size = (int)TDEGlobal::locale()->readNumber( _tapeSize->text() ); if ( _tapeSizeUnits->currentItem() == 0 ) { // MB size *= 1024; @@ -254,7 +254,7 @@ void TapeInfoWidget::slotApply() return; } - int size = (int)KGlobal::locale()->readNumber( _tapeSize->text() ); + int size = (int)TDEGlobal::locale()->readNumber( _tapeSize->text() ); if ( _tapeSizeUnits->currentItem() == 0 ) { // MB size *= 1024; diff --git a/kdat/TapeManager.cpp b/kdat/TapeManager.cpp index 919872f..386627d 100644 --- a/kdat/TapeManager.cpp +++ b/kdat/TapeManager.cpp @@ -40,8 +40,8 @@ TapeManager::TapeManager() // Fix 2002-01-24 c/o RG. The problem was: "Tape Index is empty, but I did // just a few minutes ago a 1st backup onto the the tape." - // (void) KGlobal::dirs()->findAllResources( "appdata", ".*:[0-9]+", false, true, relList); - (void) KGlobal::dirs()->findAllResources( "appdata", "*:[0-9]*", false, true, relList); + // (void) TDEGlobal::dirs()->findAllResources( "appdata", ".*:[0-9]+", false, true, relList); + (void) TDEGlobal::dirs()->findAllResources( "appdata", "*:[0-9]*", false, true, relList); for(TQStringList::Iterator it = relList.begin(); it != relList.end(); diff --git a/kdat/Util.cpp b/kdat/Util.cpp index 11e7219..b52f984 100644 --- a/kdat/Util.cpp +++ b/kdat/Util.cpp @@ -24,12 +24,12 @@ TQString Util::bytesToString( uint bytes ) { - return KGlobal::locale()->formatNumber(bytes, 0); + return TDEGlobal::locale()->formatNumber(bytes, 0); } TQString Util::kbytesToString( uint kbytes ) { - return KGlobal::locale()->formatNumber(kbytes, 0) + 'k'; + return TDEGlobal::locale()->formatNumber(kbytes, 0) + 'k'; } TQString Util::longestCommonPath( const TQStringList& files ) diff --git a/kdat/VerifyDlg.cpp b/kdat/VerifyDlg.cpp index 3b1c9b1..c402a02 100644 --- a/kdat/VerifyDlg.cpp +++ b/kdat/VerifyDlg.cpp @@ -210,7 +210,7 @@ void VerifyDlg::show() { chdir( TQFile::encodeName(_workingDir) ); - _proc = new KProcess(); + _proc = new TDEProcess(); //_proc->setExecutable( Options::instance()->getTarCommand() ); *_proc << Options::instance()->getTarCommand(); if ( _restore ) { @@ -219,19 +219,19 @@ void VerifyDlg::show() *_proc << "-dvf" << "-"; } - connect( _proc, TQT_SIGNAL( processExited( KProcess* ) ), this, TQT_SLOT( slotProcessExited( KProcess* ) ) ); - connect( _proc, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ), this, TQT_SLOT( slotStdout( KProcess*, char*, int ) ) ); - connect( _proc, TQT_SIGNAL( wroteStdin( KProcess* ) ), this, TQT_SLOT( slotWroteStdin( KProcess* ) ) ); + connect( _proc, TQT_SIGNAL( processExited( TDEProcess* ) ), this, TQT_SLOT( slotProcessExited( TDEProcess* ) ) ); + connect( _proc, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), this, TQT_SLOT( slotStdout( TDEProcess*, char*, int ) ) ); + connect( _proc, TQT_SIGNAL( wroteStdin( TDEProcess* ) ), this, TQT_SLOT( slotWroteStdin( TDEProcess* ) ) ); _startTime = time( NULL ); startTimer( 100 ); - _proc->start( KProcess::NotifyOnExit, KProcess::All ); + _proc->start( TDEProcess::NotifyOnExit, TDEProcess::All ); TQDialog::show(); } -void VerifyDlg::slotProcessExited( KProcess* ) +void VerifyDlg::slotProcessExited( TDEProcess* ) { TQT_TQOBJECT(this)->killTimers(); delete _proc; @@ -245,7 +245,7 @@ void VerifyDlg::slotProcessExited( KProcess* ) _abort->setEnabled( FALSE ); } -void VerifyDlg::slotStdout( KProcess*, char* buf, int len ) +void VerifyDlg::slotStdout( TDEProcess*, char* buf, int len ) { TQString data; data.replace( 0, len, buf ); @@ -286,7 +286,7 @@ void VerifyDlg::slotStdout( KProcess*, char* buf, int len ) } } -void VerifyDlg::slotWroteStdin( KProcess* ) +void VerifyDlg::slotWroteStdin( TDEProcess* ) { _wroteStdin = TRUE; } diff --git a/kdat/VerifyDlg.h b/kdat/VerifyDlg.h index 07490a5..fbde1da 100644 --- a/kdat/VerifyDlg.h +++ b/kdat/VerifyDlg.h @@ -27,7 +27,7 @@ class TQLabel; class TQPushButton; -class KProcess; +class TDEProcess; class LoggerWidget; class TapeDrive; @@ -39,7 +39,7 @@ class VerifyDlg : public TQDialog { Q_OBJECT bool _restore; - KProcess* _proc; + TDEProcess* _proc; TQString _workingDir; int _fileno; const RangeList& _ranges; @@ -64,9 +64,9 @@ class VerifyDlg : public TQDialog { void updateStats(); private slots: - void slotProcessExited( KProcess* proc ); - void slotStdout( KProcess* proc, char* buf, int len ); - void slotWroteStdin( KProcess* proc ); + void slotProcessExited( TDEProcess* proc ); + void slotStdout( TDEProcess* proc, char* buf, int len ); + void slotWroteStdin( TDEProcess* proc ); void slotOK(); void slotAbort(); protected: -- cgit v1.2.1