diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:02:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:02:02 -0600 |
| commit | de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch) | |
| tree | dbb3152c372f8620f9290137d461f3d9f9eba1cb /konsole/konsole/konsole_part.cpp | |
| parent | 936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff) | |
| download | tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'konsole/konsole/konsole_part.cpp')
| -rw-r--r-- | konsole/konsole/konsole_part.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp index 6562ea0d9..c20982ba2 100644 --- a/konsole/konsole/konsole_part.cpp +++ b/konsole/konsole/konsole_part.cpp @@ -46,7 +46,7 @@ #include <tqpushbutton.h> #include <kpopupmenu.h> #include <krootpixmap.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kaction.h> // We can't use the ARGB32 visual when embedded in another application @@ -574,8 +574,8 @@ void konsolePart::readProperties() TQString schema = config->readEntry("Schema"); - s_kconfigSchema=config->readEntry("schema"); - ColorSchema* sch = colors->find(schema.isEmpty() ? s_kconfigSchema : schema); + s_tdeconfigSchema=config->readEntry("schema"); + ColorSchema* sch = colors->find(schema.isEmpty() ? s_tdeconfigSchema : schema); if (!sch) { sch=(ColorSchema*)colors->at(0); //the default one } @@ -638,7 +638,7 @@ void konsolePart::saveProperties() config->writeEntry("keytab",n_keytab); config->writeEntry("has frame",b_framevis); config->writeEntry("LineSpacing", te->lineSpacing()); - config->writeEntry("schema",s_kconfigSchema); + config->writeEntry("schema",s_tdeconfigSchema); config->writeEntry("scrollbar",n_scroll); config->writeEntry("wordseps",s_word_seps); config->writeEntry("encoding",n_encoding); @@ -720,7 +720,7 @@ void konsolePart::keytab_menu_activated(int item) void konsolePart::schema_menu_activated(int item) { setSchema(item); - s_kconfigSchema = s_schema; // This is the new default + s_tdeconfigSchema = s_schema; // This is the new default } void konsolePart::schema_menu_check() |