diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 00:38:54 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 00:38:54 -0600 |
| commit | da1522385e5367bae56b90fac55c4355e475905b (patch) | |
| tree | bfa432864dbf322feb4ed3a878f1222ee8ea7727 /buildtools/qmake | |
| parent | b9e542d0c805e9adee3a67e44532d5321032e21e (diff) | |
| download | tdevelop-da1522385e5367bae56b90fac55c4355e475905b.tar.gz tdevelop-da1522385e5367bae56b90fac55c4355e475905b.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'buildtools/qmake')
| -rw-r--r-- | buildtools/qmake/trollprojectpart.cpp | 2 | ||||
| -rw-r--r-- | buildtools/qmake/trollprojectwidget.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp index e83ed8a9..7086ae1e 100644 --- a/buildtools/qmake/trollprojectpart.cpp +++ b/buildtools/qmake/trollprojectpart.cpp @@ -260,7 +260,7 @@ TQString TrollProjectPart::makeEnvironment() environstr += TQString( "QTDIR=" ) + EnvVarTools::quote( DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "") ) + TQString( " PATH=$TQTDIR/bin:$PATH " ); } - KConfigGroup grp( kapp->config(), "MakeOutputView" ); + TDEConfigGroup grp( kapp->config(), "MakeOutputView" ); if( grp.readBoolEntry( "ForceCLocale", true ) ) environstr += "LC_MESSAGES="+EnvVarTools::quote("C")+" "+" "+"LC_CTYPE="+EnvVarTools::quote("C")+" "; diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp index 3c17a951..86a485f6 100644 --- a/buildtools/qmake/trollprojectwidget.cpp +++ b/buildtools/qmake/trollprojectwidget.cpp @@ -1287,7 +1287,7 @@ void TrollProjectWidget::slotAddFiles() // Copy selected files to current subproject folder // and add them to the filelist TQString filename = KURL( files[ i ] ).fileName(); - KIO::NetAccess::file_copy( files[ i ], cleanSubprojectDir + TQString( TQChar( TQDir::separator() ) ) + filename, -1, false, false, this ); + TDEIO::NetAccess::file_copy( files[ i ], cleanSubprojectDir + TQString( TQChar( TQDir::separator() ) ) + filename, -1, false, false, this ); TQFile testExist( cleanSubprojectDir + TQString( TQChar( TQDir::separator() ) ) + filename ); if ( testExist.exists() ) @@ -1631,7 +1631,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it // Copy selected files to current subproject folder // and add them to the filelist TQString filename = KURL( files[ i ] ).fileName(); - KIO::NetAccess::file_copy( files[ i ], cleanSubprojectPath + TQString( TQChar( TQDir::separator() ) ) + filename, -1, false, false, this ); + TDEIO::NetAccess::file_copy( files[ i ], cleanSubprojectPath + TQString( TQChar( TQDir::separator() ) ) + filename, -1, false, false, this ); TQFile testExist( cleanSubprojectPath + TQString( TQChar( TQDir::separator() ) ) + filename ); if ( testExist.exists() ) @@ -1943,7 +1943,7 @@ void TrollProjectWidget::removeFile( QMakeScopeItem *spitem, FileItem *fitem ) }else { kdDebug(9024) << "Deleting file as the user wished: " << spitem->scope->projectDir() + TQString( TQChar( TQDir::separator() ) ) + realfilename << endl; - KIO::NetAccess::del( KURL::fromPathOrURL( spitem->scope->projectDir() + TQString( TQChar( TQDir::separator() ) ) + realfilename ), 0 ); + TDEIO::NetAccess::del( KURL::fromPathOrURL( spitem->scope->projectDir() + TQString( TQChar( TQDir::separator() ) ) + realfilename ), 0 ); } if ( gitem->groupType != GroupItem::InstallObject ) |