diff options
24 files changed, 47 insertions, 47 deletions
diff --git a/kate/app/katesession.h b/kate/app/katesession.h index e636294e3..d96ed740b 100644 --- a/kate/app/katesession.h +++ b/kate/app/katesession.h @@ -37,13 +37,13 @@ class KPushButton; class TQCheckBox; -class KateSession : public KShared +class KateSession : public TDEShared { public: /** * Define a Shared-Pointer type */ - typedef KSharedPtr<KateSession> Ptr; + typedef TDESharedPtr<KateSession> Ptr; public: /** 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? diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp index 47228e620..0563dbb20 100644 --- a/kicker/applets/launcher/quickbutton.cpp +++ b/kicker/applets/launcher/quickbutton.cpp @@ -96,7 +96,7 @@ QuickURL::QuickURL(const TQString &u) if (_service) { if (!_service->isValid()) { DEBUGSTR << "QuickURL: _service is not valid"<<endl<<flush; - // _service is a KShared pointer, don't try to delete it! + // _service is a TDEShared pointer, don't try to delete it! _service = 0; } else { DEBUGSTR << "QuickURL: _service='"<<_service<<"' _service->desktopEntryPath()="<<_service->desktopEntryPath()<<endl<<flush; diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp index b9af7efc0..eb1ba784c 100644 --- a/kicker/applets/minipager/pagerbutton.cpp +++ b/kicker/applets/minipager/pagerbutton.cpp @@ -55,7 +55,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #undef FocusOut #endif -KSharedPixmap* KMiniPagerButton::s_commonSharedPixmap; +TDESharedPixmap* KMiniPagerButton::s_commonSharedPixmap; KPixmap* KMiniPagerButton::s_commonBgPixmap; KMiniPagerButton::KMiniPagerButton(int desk, bool useViewPorts, const TQPoint& viewport, @@ -257,7 +257,7 @@ void KMiniPagerButton::loadBgPixmap() { if (!s_commonSharedPixmap) { - s_commonSharedPixmap = new KSharedPixmap; + s_commonSharedPixmap = new TDESharedPixmap; connect(s_commonSharedPixmap, TQT_SIGNAL(done(bool)), TQT_SLOT(backgroundLoaded(bool))); } @@ -273,7 +273,7 @@ void KMiniPagerButton::loadBgPixmap() { if (!m_sharedPixmap) { - m_sharedPixmap = new KSharedPixmap; + m_sharedPixmap = new TDESharedPixmap; connect(m_sharedPixmap, TQT_SIGNAL(done(bool)), TQT_SLOT(backgroundLoaded(bool))); } diff --git a/kicker/applets/minipager/pagerbutton.h b/kicker/applets/minipager/pagerbutton.h index 54645b8e7..042820f20 100644 --- a/kicker/applets/minipager/pagerbutton.h +++ b/kicker/applets/minipager/pagerbutton.h @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class KPixmap; class KWinModule; class KMiniPager; -class KSharedPixmap; +class TDESharedPixmap; class TQLineEdit; class KMiniPagerButton : public TQButton, public KickerTip::Client @@ -98,9 +98,9 @@ private: TQLineEdit* m_lineEdit; - KSharedPixmap *m_sharedPixmap; + TDESharedPixmap *m_sharedPixmap; KPixmap *m_bgPixmap; - static KSharedPixmap *s_commonSharedPixmap; + static TDESharedPixmap *s_commonSharedPixmap; static KPixmap *s_commonBgPixmap; bool m_isCommon; diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp index d2f2982b7..381b36d4f 100644 --- a/kicker/kicker/core/container_extension.cpp +++ b/kicker/kicker/core/container_extension.cpp @@ -83,7 +83,7 @@ ExtensionContainer::ExtensionContainer(const AppletInfo& info, const TQString& extensionId, TQWidget *parent) : TQFrame(parent, ("ExtensionContainer#" + extensionId).latin1(), (WFlags)(WStyle_Customize | WStyle_NoBorder)), - m_settings(KSharedConfig::openConfig(info.configFile())), + m_settings(TDESharedConfig::openConfig(info.configFile())), m_hideMode(ManualHide), m_unhideTriggeredAt(UnhideTrigger::None), _autoHidden(false), @@ -110,7 +110,7 @@ ExtensionContainer::ExtensionContainer(KPanelExtension* extension, const TQString& extensionId, TQWidget *parent) : TQFrame(parent, ("ExtensionContainer#" + extensionId).latin1(), (WFlags)(WStyle_Customize | WStyle_NoBorder)), - m_settings(KSharedConfig::openConfig(info.configFile())), + m_settings(TDESharedConfig::openConfig(info.configFile())), _autoHidden(false), _userHidden(Unhidden), _block_user_input(false), diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index f5bf25471..c0b14d1c9 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -995,8 +995,8 @@ void KMenu::fillMenu(KServiceGroup::Ptr& bool separatorNeeded = false; KServiceGroup::List::ConstIterator it = _list.begin(); #ifdef KDELIBS_SUSE - KSortableValueList<KSharedPtr<KSycocaEntry>,TQCString> slist; - KSortableValueList<KSharedPtr<KSycocaEntry>,TQCString> glist; + KSortableValueList<TDESharedPtr<KSycocaEntry>,TQCString> slist; + KSortableValueList<TDESharedPtr<KSycocaEntry>,TQCString> glist; TQMap<TQString,TQString> specialTitle; TQMap<TQString,TQString> categoryIcon; TQMap<TQString,TQString> shortenedMenuPath; diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp index dfe3f4433..bb1c1fc85 100644 --- a/kicker/kicker/ui/service_mnu.cpp +++ b/kicker/kicker/ui/service_mnu.cpp @@ -114,8 +114,8 @@ void PanelServiceMenu::fillMenu(KServiceGroup::Ptr& _root, TQStringList suppressGenericNames = _root->suppressGenericNames(); KServiceGroup::List::ConstIterator it = _list.begin(); - KSortableValueList<KSharedPtr<KSycocaEntry>,TQCString> slist; - KSortableValueList<KSharedPtr<KSycocaEntry>,TQCString> glist; + KSortableValueList<TDESharedPtr<KSycocaEntry>,TQCString> slist; + KSortableValueList<TDESharedPtr<KSycocaEntry>,TQCString> glist; TQMap<TQString,TQString> specialTitle; TQMap<TQString,TQString> categoryIcon; diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp index db7fd8729..c35820e4b 100644 --- a/kicker/taskbar/taskbarcontainer.cpp +++ b/kicker/taskbar/taskbarcontainer.cpp @@ -67,7 +67,7 @@ TaskBarContainer::TaskBarContainer( bool enableFrame, TQString configFileOverrid globalConfig.copyTo(configFile, &localConfig); localConfig.sync(); } - settingsObject = new TaskBarSettings(KSharedConfig::openConfig(configFile)); + settingsObject = new TaskBarSettings(TDESharedConfig::openConfig(configFile)); setBackgroundOrigin( AncestorOrigin ); diff --git a/kicker/taskmanager/taskmanager.h b/kicker/taskmanager/taskmanager.h index b78764331..148c77da2 100644 --- a/kicker/taskmanager/taskmanager.h +++ b/kicker/taskmanager/taskmanager.h @@ -68,7 +68,7 @@ typedef TQValueList<WId> WindowList; * @see TaskManager * @see KWinModule */ -class KDE_EXPORT Task: public TQObject, public KShared +class KDE_EXPORT Task: public TQObject, public TDEShared { Q_OBJECT TQ_PROPERTY( TQString visibleIconicName READ visibleIconicName ) @@ -95,7 +95,7 @@ class KDE_EXPORT Task: public TQObject, public KShared TQ_PROPERTY( TQPixmap thumbnail READ thumbnail ) public: - typedef KSharedPtr<Task> Ptr; + typedef TDESharedPtr<Task> Ptr; typedef TQValueVector<Task::Ptr> List; typedef TQMap<WId, Task::Ptr> Dict; @@ -511,7 +511,7 @@ public: * * @see TaskManager */ -class KDE_EXPORT Startup: public TQObject, public KShared +class KDE_EXPORT Startup: public TQObject, public TDEShared { Q_OBJECT TQ_PROPERTY( TQString text READ text ) @@ -519,7 +519,7 @@ class KDE_EXPORT Startup: public TQObject, public KShared TQ_PROPERTY( TQString icon READ icon ) public: - typedef KSharedPtr<Startup> Ptr; + typedef TDESharedPtr<Startup> Ptr; typedef TQValueVector<Startup::Ptr> List; Startup( const KStartupInfoId& id, const KStartupInfoData& data, TQObject * parent, diff --git a/kmenuedit/treeview.cpp b/kmenuedit/treeview.cpp index e0f2234c9..1947af3e3 100644 --- a/kmenuedit/treeview.cpp +++ b/kmenuedit/treeview.cpp @@ -187,7 +187,7 @@ TreeView::TreeView( bool controlCenter, KActionCollection *ac, TQWidget *parent, m_drag = 0; // Read menu format configuration information - KSharedConfig::Ptr pConfig = KSharedConfig::openConfig("kickerrc"); + TDESharedConfig::Ptr pConfig = TDESharedConfig::openConfig("kickerrc"); pConfig->setGroup("menus"); m_detailedMenuEntries = pConfig->readBoolEntry("DetailedMenuEntries",true); diff --git a/kpager/desktop.cpp b/kpager/desktop.cpp index f2e643eb7..b1b37ecac 100644 --- a/kpager/desktop.cpp +++ b/kpager/desktop.cpp @@ -256,7 +256,7 @@ void Desktop::loadBgPixmap(void) if (!m_bgPixmap) { - m_bgPixmap = new KSharedPixmap; + m_bgPixmap = new TDESharedPixmap; connect(m_bgPixmap, TQT_SIGNAL(done(bool)), TQT_SLOT(backgroundLoaded(bool))); } diff --git a/kpager/desktop.h b/kpager/desktop.h index 9fc9942ae..5a861c738 100644 --- a/kpager/desktop.h +++ b/kpager/desktop.h @@ -29,7 +29,7 @@ #include <tqintdict.h> #include <twin.h> -class KSharedPixmap; +class TDESharedPixmap; class KPopupMenu; class TQPainter; @@ -101,7 +101,7 @@ protected: int m_desk; TQString m_name; - KSharedPixmap *m_bgPixmap; + TDESharedPixmap *m_bgPixmap; bool m_bgDirty; TQPixmap *m_bgSmallPixmap; static TQPixmap *m_bgCommonSmallPixmap; diff --git a/krootbacking/krootbacking.cpp b/krootbacking/krootbacking.cpp index 9296a3f1e..afb8eab32 100644 --- a/krootbacking/krootbacking.cpp +++ b/krootbacking/krootbacking.cpp @@ -63,7 +63,7 @@ void KRootBacking::init() { d = new KRootBackingData; m_Fade = 0; - m_pPixmap = new KSharedPixmap; //ordinary KPixmap on win32 + m_pPixmap = new TDESharedPixmap; //ordinary KPixmap on win32 m_pTimer = new TQTimer( this ); m_bInit = false; m_bActive = false; @@ -156,7 +156,7 @@ void KRootBacking::repaint(bool force) #ifdef Q_WS_X11 m_Desk = currentDesktop(); - // KSharedPixmap will correctly generate a tile for us. + // TDESharedPixmap will correctly generate a tile for us. m_pPixmap->loadFromShared(pixmapName(m_Desk), m_Rect); #else m_Desk = currentDesktop(); @@ -230,7 +230,7 @@ void KRootBacking::slotDone(bool success) updateBackground( m_pPixmap ); } -void KRootBacking::updateBackground( KSharedPixmap *spm ) +void KRootBacking::updateBackground( TDESharedPixmap *spm ) { TQPixmap pm = *spm; diff --git a/krootbacking/krootbacking.h b/krootbacking/krootbacking.h index fd4707047..731e64362 100644 --- a/krootbacking/krootbacking.h +++ b/krootbacking/krootbacking.h @@ -32,7 +32,7 @@ class TQRect; class TQWidget; class TQTimer; -class KSharedPixmap; +class TDESharedPixmap; class KRootBackingData; /** @@ -128,7 +128,7 @@ public slots: void repaint(); /** - * Asks KDesktop to export the desktop background as a KSharedPixmap. + * Asks KDesktop to export the desktop background as a TDESharedPixmap. * This method uses DCOP to call KBackgroundIface/setExport(int). */ void enableExports(); @@ -152,7 +152,7 @@ protected: * applies the fade effect, then sets the target's background, or emits * backgroundUpdated(const TQPixmap &) depending on the painting mode. */ - virtual void updateBackground( KSharedPixmap * ); + virtual void updateBackground( TDESharedPixmap * ); private slots: void slotBackgroundChanged(int); @@ -168,7 +168,7 @@ private: TQRect m_Rect; TQTimer *m_pTimer; - KSharedPixmap *m_pPixmap; + TDESharedPixmap *m_pPixmap; KRootBackingData *d; void init(); diff --git a/ksmserver/shutdowndlg.h b/ksmserver/shutdowndlg.h index bf636c16d..2f9dc85aa 100644 --- a/ksmserver/shutdowndlg.h +++ b/ksmserver/shutdowndlg.h @@ -104,7 +104,7 @@ public slots: private: /** - * Asks KDesktop to export the desktop background as a KSharedPixmap. + * Asks KDesktop to export the desktop background as a TDESharedPixmap. * This method uses DCOP to call KBackgroundIface/setExport(int). */ void enableExports(); |