summaryrefslogtreecommitdiffstats
path: root/src/languages
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:12:31 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:12:31 -0600
commit2b37df4ca0c9bae516c4fa00579584d6e3fcfd27 (patch)
tree721ba8b0e0effd9676667acdb25b5c07d2a82061 /src/languages
parentb0a967eb693adc458fdf7d070379b8c1ec3e9415 (diff)
downloadktechlab-2b37df4ca0c9bae516c4fa00579584d6e3fcfd27.tar.gz
ktechlab-2b37df4ca0c9bae516c4fa00579584d6e3fcfd27.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'src/languages')
-rw-r--r--src/languages/language.cpp4
-rw-r--r--src/languages/picprogrammer.cpp4
-rw-r--r--src/languages/picprogrammer.h6
3 files changed, 7 insertions, 7 deletions
diff --git a/src/languages/language.cpp b/src/languages/language.cpp
index 71854a4..7b70135 100644
--- a/src/languages/language.cpp
+++ b/src/languages/language.cpp
@@ -178,11 +178,11 @@ ProcessOptions::ProcessOptions( OutputMethodInfo info )
b_targetFileSet = false;
TQString target;
- if ( !KIO::NetAccess::download( info.outputFile(), target, 0l ) )
+ if ( !TDEIO::NetAccess::download( info.outputFile(), target, 0l ) )
{
// If the file could not be downloaded, for example does not
// exist on disk, NetAccess will tell us what error to use
- KMessageBox::error( 0l, KIO::NetAccess::lastErrorString() );
+ KMessageBox::error( 0l, TDEIO::NetAccess::lastErrorString() );
return;
}
diff --git a/src/languages/picprogrammer.cpp b/src/languages/picprogrammer.cpp
index afc1307..910f30f 100644
--- a/src/languages/picprogrammer.cpp
+++ b/src/languages/picprogrammer.cpp
@@ -191,7 +191,7 @@ void PicProgrammerSettings::initStaticConfigs()
}
-void PicProgrammerSettings::load( KConfig * config )
+void PicProgrammerSettings::load( TDEConfig * config )
{
TQStringList oldCustomProgrammers = config->groupList().grep("CustomProgrammer_");
TQStringList::iterator ocpEnd = oldCustomProgrammers.end();
@@ -217,7 +217,7 @@ void PicProgrammerSettings::load( KConfig * config )
}
-void PicProgrammerSettings::save( KConfig * config )
+void PicProgrammerSettings::save( TDEConfig * config )
{
TQStringList oldCustomProgrammers = config->groupList().grep("CustomProgrammer_");
TQStringList::iterator ocpEnd = oldCustomProgrammers.end();
diff --git a/src/languages/picprogrammer.h b/src/languages/picprogrammer.h
index ef9e1cf..0cd3ac7 100644
--- a/src/languages/picprogrammer.h
+++ b/src/languages/picprogrammer.h
@@ -14,7 +14,7 @@
#include "externallanguage.h"
-class KConfig;
+class TDEConfig;
class TDEProcess;
@@ -61,11 +61,11 @@ class PicProgrammerSettings
* Reads in custom ProgrammerConfigs from config. Any previously loaded
* configurations stored in this class will removed first.
*/
- void load( KConfig * config );
+ void load( TDEConfig * config );
/**
* Saves the custom ProgrammConfigs to config.
*/
- void save( KConfig * config );
+ void save( TDEConfig * config );
/**
* @return the ProgrammConfig for the programmer with the given name. If
* no such ProgrammerConfigs with the given name exist, then one will be