diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:51:01 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:51:01 -0600 |
| commit | b9e542d0c805e9adee3a67e44532d5321032e21e (patch) | |
| tree | e82d85b9035cc2ca322911e8a6e38a3bd8b1d431 /src/projectmanager.cpp | |
| parent | 7a392a04059bd904dab4c78910a6d34aa0b37798 (diff) | |
| download | tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.tar.gz tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/projectmanager.cpp')
| -rw-r--r-- | src/projectmanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp index 91d4d59a..cf545ac9 100644 --- a/src/projectmanager.cpp +++ b/src/projectmanager.cpp @@ -618,7 +618,7 @@ bool ProjectManager::loadKDevelop2Project( const KURL & url ) return false; } - TQString cmd = KGlobal::dirs()->findExe( "kdevprj2tdevelop" ); + TQString cmd = TDEGlobal::dirs()->findExe( "kdevprj2tdevelop" ); if (cmd.isEmpty()) { KMessageBox::sorry(0, i18n("You do not have 'kdevprj2tdevelop' installed.")); return false; @@ -629,7 +629,7 @@ bool ProjectManager::loadKDevelop2Project( const KURL & url ) KShellProcess proc( "/bin/sh" ); proc.setWorkingDirectory( fileInfo.dirPath(true) ); proc << "perl" << cmd << KShellProcess::quote( url.path() ); - proc.start( KProcess::Block ); + proc.start( TDEProcess::Block ); TQString projectFile = fileInfo.dirPath( true ) + "/" + fileInfo.baseName() + ".tdevelop"; return loadProject( KURL(projectFile) ); |