summaryrefslogtreecommitdiffstats
path: root/kcontrol
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol')
-rw-r--r--kcontrol/filetypes/filetypedetails.cpp2
-rw-r--r--kcontrol/filetypes/filetypesview.cpp2
-rw-r--r--kcontrol/filetypes/filetypesview.h2
-rw-r--r--kcontrol/filetypes/typeslistitem.cpp8
-rw-r--r--kcontrol/kicker/main.cpp4
-rw-r--r--kcontrol/kicker/menutab_impl.cpp4
-rw-r--r--kcontrol/konsole/schemaeditor.cpp2
-rw-r--r--kcontrol/konsole/schemaeditor.h4
-rw-r--r--kcontrol/taskbar/kcmtaskbar.cpp2
9 files changed, 15 insertions, 15 deletions
diff --git a/kcontrol/filetypes/filetypedetails.cpp b/kcontrol/filetypes/filetypedetails.cpp
index a98f68cce..3aa961b4c 100644
--- a/kcontrol/filetypes/filetypedetails.cpp
+++ b/kcontrol/filetypes/filetypedetails.cpp
@@ -219,7 +219,7 @@ void FileTypeDetails::updateAskSave()
else
dontAskAgainName = "askSave"+mimeType;
- KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false);
+ TDESharedConfig::Ptr config = TDESharedConfig::openConfig("konquerorrc", false, false);
config->setGroup("Notification Messages");
bool ask = config->readEntry(dontAskAgainName).isEmpty();
m_item->getAskSave(ask);
diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp
index d641a18b0..bf8551fb7 100644
--- a/kcontrol/filetypes/filetypesview.cpp
+++ b/kcontrol/filetypes/filetypesview.cpp
@@ -27,7 +27,7 @@
FileTypesView::FileTypesView(TQWidget *p, const char *name)
: TDECModule(p, name)
{
- m_konqConfig = KSharedConfig::openConfig("konquerorrc", false, false);
+ m_konqConfig = TDESharedConfig::openConfig("konquerorrc", false, false);
setQuickHelp( i18n("<h1>File Associations</h1>"
" This module allows you to choose which applications are associated"
diff --git a/kcontrol/filetypes/filetypesview.h b/kcontrol/filetypes/filetypesview.h
index b83158519..63909d718 100644
--- a/kcontrol/filetypes/filetypesview.h
+++ b/kcontrol/filetypes/filetypesview.h
@@ -67,7 +67,7 @@ private:
TQValueList<TypesListItem *> m_itemsModified;
- KSharedConfig::Ptr m_konqConfig;
+ TDESharedConfig::Ptr m_konqConfig;
};
#endif
diff --git a/kcontrol/filetypes/typeslistitem.cpp b/kcontrol/filetypes/typeslistitem.cpp
index bde058d00..b5ccd26ef 100644
--- a/kcontrol/filetypes/typeslistitem.cpp
+++ b/kcontrol/filetypes/typeslistitem.cpp
@@ -66,7 +66,7 @@ void TypesListItem::initMeta( const TQString & major )
m_bFullInit = true;
m_mimetype = 0L;
m_major = major;
- KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false);
+ TDESharedConfig::Ptr config = TDESharedConfig::openConfig("konquerorrc", false, false);
config->setGroup("EmbedSettings");
bool defaultValue = defaultEmbeddingSetting( major );
m_autoEmbed = config->readBoolEntry( TQString::fromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1;
@@ -227,7 +227,7 @@ bool TypesListItem::isDirty() const
}
else
{
- KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false);
+ TDESharedConfig::Ptr config = TDESharedConfig::openConfig("konquerorrc", false, false);
config->setGroup("EmbedSettings");
bool defaultValue = defaultEmbeddingSetting(m_major);
unsigned int oldAutoEmbed = config->readBoolEntry( TQString::fromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1;
@@ -247,7 +247,7 @@ void TypesListItem::sync()
Q_ASSERT(m_bFullInit);
if ( isMeta() )
{
- KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false);
+ TDESharedConfig::Ptr config = TDESharedConfig::openConfig("konquerorrc", false, false);
config->setGroup("EmbedSettings");
config->writeEntry( TQString::fromLatin1("embed-")+m_major, m_autoEmbed == 0 );
return;
@@ -255,7 +255,7 @@ void TypesListItem::sync()
if (m_askSave != 2)
{
- KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false);
+ TDESharedConfig::Ptr config = TDESharedConfig::openConfig("konquerorrc", false, false);
config->setGroup("Notification Messages");
if (m_askSave == 0)
{
diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp
index b24be9ba7..035451e46 100644
--- a/kcontrol/kicker/main.cpp
+++ b/kcontrol/kicker/main.cpp
@@ -103,7 +103,7 @@ void KickerConfig::init()
TQString configpath = TDEGlobal::dirs()->findResource("config", configname);
if (configpath.isEmpty())
configpath = locateLocal("config", configname);
- KSharedConfig::Ptr config = KSharedConfig::openConfig(configname);
+ TDESharedConfig::Ptr config = TDESharedConfig::openConfig(configname);
if (m_extensionInfo.isEmpty())
{
@@ -249,7 +249,7 @@ void KickerConfig::configChanged(const TQString& configPath)
{
if (configPath.endsWith(configName()))
{
- KSharedConfig::Ptr config = KSharedConfig::openConfig(configName());
+ TDESharedConfig::Ptr config = TDESharedConfig::openConfig(configName());
config->reparseConfiguration();
setupExtensionInfo(*config, true);
}
diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp
index 652f75aa7..51113e685 100644
--- a/kcontrol/kicker/menutab_impl.cpp
+++ b/kcontrol/kicker/menutab_impl.cpp
@@ -109,7 +109,7 @@ void MenuTab::load()
void MenuTab::load( bool useDefaults )
{
- KSharedConfig::Ptr c = KSharedConfig::openConfig(KickerConfig::the()->configName());
+ TDESharedConfig::Ptr c = TDESharedConfig::openConfig(KickerConfig::the()->configName());
c->setReadDefaults( useDefaults );
@@ -201,7 +201,7 @@ void MenuTab::save()
{
bool forceRestart = false;
- KSharedConfig::Ptr c = KSharedConfig::openConfig(KickerConfig::the()->configName());
+ TDESharedConfig::Ptr c = TDESharedConfig::openConfig(KickerConfig::the()->configName());
c->setGroup("menus");
diff --git a/kcontrol/konsole/schemaeditor.cpp b/kcontrol/konsole/schemaeditor.cpp
index 7dd2bb19b..0594e7d9d 100644
--- a/kcontrol/konsole/schemaeditor.cpp
+++ b/kcontrol/konsole/schemaeditor.cpp
@@ -73,7 +73,7 @@ SchemaEditor::SchemaEditor(TQWidget * parent, const char *name)
bold.resize(20);
transparent.resize(20);
defaultSchema = "";
- spix = new KSharedPixmap;
+ spix = new TDESharedPixmap;
connect(spix, TQT_SIGNAL(done(bool)), TQT_SLOT(previewLoaded(bool)));
diff --git a/kcontrol/konsole/schemaeditor.h b/kcontrol/konsole/schemaeditor.h
index 612c43b99..d34e7be85 100644
--- a/kcontrol/konsole/schemaeditor.h
+++ b/kcontrol/konsole/schemaeditor.h
@@ -25,7 +25,7 @@
#include <kapplication.h>
#include <tqwidget.h>
class TQPixmap;
-class KSharedPixmap;
+class TDESharedPixmap;
#include "schemadialog.h"
@@ -69,7 +69,7 @@ class SchemaEditor : public SchemaDialog
TQMemArray<bool> transparent;
TQMemArray<bool> bold;
TQPixmap pix;
- KSharedPixmap *spix;
+ TDESharedPixmap *spix;
TQString defaultSchema;
bool loaded;
bool schemaLoaded;
diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp
index 1aa7c5a17..8507cdd30 100644
--- a/kcontrol/taskbar/kcmtaskbar.cpp
+++ b/kcontrol/taskbar/kcmtaskbar.cpp
@@ -181,7 +181,7 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL
localConfig.sync();
}
- m_settingsObject = new TaskBarSettings(KSharedConfig::openConfig(m_configFileName));
+ m_settingsObject = new TaskBarSettings(TDESharedConfig::openConfig(m_configFileName));
m_settingsObject->readConfig();
// TODO: Load these from .desktop files?