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 /buildtools/pascal | |
| parent | 7a392a04059bd904dab4c78910a6d34aa0b37798 (diff) | |
| download | tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.tar.gz tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'buildtools/pascal')
| -rw-r--r-- | buildtools/pascal/pascalglobaloptionsdlg.cpp | 6 | ||||
| -rw-r--r-- | buildtools/pascal/pascalproject_part.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/buildtools/pascal/pascalglobaloptionsdlg.cpp b/buildtools/pascal/pascalglobaloptionsdlg.cpp index 79fe9167..327ecc67 100644 --- a/buildtools/pascal/pascalglobaloptionsdlg.cpp +++ b/buildtools/pascal/pascalglobaloptionsdlg.cpp @@ -101,7 +101,7 @@ void PascalGlobalOptionsDlg::readCompilerOpts( TQString compiler ) TQString settings = configCache[compiler]; if (settings.isEmpty()) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Pascal Compiler"); settings = config->readPathEntry(compiler); } @@ -111,7 +111,7 @@ void PascalGlobalOptionsDlg::readCompilerOpts( TQString compiler ) void PascalGlobalOptionsDlg::readConfigCache( ) { -/* KConfig *config = KGlobal::config(); +/* KConfig *config = TDEGlobal::config(); config->setGroup("Pascal Compiler"); TQMap<TQString, TQString> settings = config->entryMap("Pascal Compiler"); @@ -120,7 +120,7 @@ void PascalGlobalOptionsDlg::readConfigCache( ) void PascalGlobalOptionsDlg::saveConfigCache( ) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Pascal Compiler"); for (TQMap<TQString, TQString>::iterator it = configCache.begin(); it != configCache.end(); ++it) diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp index c0d53c89..e8fd8a65 100644 --- a/buildtools/pascal/pascalproject_part.cpp +++ b/buildtools/pascal/pascalproject_part.cpp @@ -346,7 +346,7 @@ void PascalProjectPart::slotBuild() cmdline += fi.fileName(); TQString dircmd = "cd "; - dircmd += KProcess::quote(buildDirectory()); + dircmd += TDEProcess::quote(buildDirectory()); dircmd += " && "; makeFrontend()->queueCommand(buildDirectory(), dircmd + cmdline); @@ -471,7 +471,7 @@ KDevCompilerOptions *PascalProjectPart::createCompilerOptions(const TQString &na TQString PascalProjectPart::defaultOptions( const TQString compiler ) const { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Pascal Compiler"); return config->readPathEntry(compiler); } |