diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
| commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
| tree | 7b7a01768b3781763186c825af21bb14717d2c32 /kio/kio/defaultprogress.cpp | |
| parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
| download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kio/kio/defaultprogress.cpp')
| -rw-r--r-- | kio/kio/defaultprogress.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kio/kio/defaultprogress.cpp b/kio/kio/defaultprogress.cpp index 12eacab5d..3f16f565f 100644 --- a/kio/kio/defaultprogress.cpp +++ b/kio/kio/defaultprogress.cpp @@ -89,8 +89,8 @@ void DefaultProgress::init() #ifdef Q_WS_X11 //FIXME(E): Remove once all the KWin::foo calls have been ported to QWS // Set a useful icon for this window! KWin::setIcons( winId(), - KGlobal::iconLoader()->loadIcon( "filesave", KIcon::NoGroup, 32 ), - KGlobal::iconLoader()->loadIcon( "filesave", KIcon::NoGroup, 16 ) ); + TDEGlobal::iconLoader()->loadIcon( "filesave", KIcon::NoGroup, 32 ), + TDEGlobal::iconLoader()->loadIcon( "filesave", KIcon::NoGroup, 16 ) ); #endif TQVBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(), @@ -470,7 +470,7 @@ void DefaultProgress::checkDestination(const KURL& dest) { bool ok = true; if ( dest.isLocalFile() ) { TQString path = dest.path( -1 ); - TQStringList tmpDirs = KGlobal::dirs()->resourceDirs( "tmp" ); + TQStringList tmpDirs = TDEGlobal::dirs()->resourceDirs( "tmp" ); for ( TQStringList::Iterator it = tmpDirs.begin() ; ok && it != tmpDirs.end() ; ++it ) if ( path.contains( *it ) ) ok = false; // it's in the tmp resource @@ -486,17 +486,17 @@ void DefaultProgress::checkDestination(const KURL& dest) { void DefaultProgress::slotOpenFile() { - KProcess proc; + TDEProcess proc; proc << "konqueror" << d->location.prettyURL(); - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); } void DefaultProgress::slotOpenLocation() { - KProcess proc; + TDEProcess proc; d->location.setFileName(""); proc << "konqueror" << d->location.prettyURL(); - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); } void DefaultProgress::virtual_hook( int id, void* data ) |