From 703fb0c89c2eee56a1e613e67a446db9d4287929 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:35:07 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- tdeui/kconfigdialog.cpp | 58 ++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) (limited to 'tdeui/kconfigdialog.cpp') diff --git a/tdeui/kconfigdialog.cpp b/tdeui/kconfigdialog.cpp index ccbba1cf0..9707bc26a 100644 --- a/tdeui/kconfigdialog.cpp +++ b/tdeui/kconfigdialog.cpp @@ -31,30 +31,30 @@ #include #include -TQAsciiDict KConfigDialog::openDialogs; +TQAsciiDict TDEConfigDialog::openDialogs; // This class is here purly so we don't break binary compatibility down the road. -class KConfigDialog::KConfigDialogPrivate +class TDEConfigDialog::TDEConfigDialogPrivate { public: - KConfigDialogPrivate(KDialogBase::DialogType t) + TDEConfigDialogPrivate(KDialogBase::DialogType t) : shown(false), type(t), manager(0) { } bool shown; KDialogBase::DialogType type; - KConfigDialogManager *manager; - TQMap managerForPage; + TDEConfigDialogManager *manager; + TQMap managerForPage; }; -KConfigDialog::KConfigDialog( TQWidget *parent, const char *name, - KConfigSkeleton *config, +TDEConfigDialog::TDEConfigDialog( TQWidget *parent, const char *name, + TDEConfigSkeleton *config, DialogType dialogType, int dialogButtons, ButtonCode defaultButton, bool modal ) : KDialogBase( dialogType, (WFlags)TQt::WStyle_DialogBorder, parent, name, modal, i18n("Configure"), dialogButtons, defaultButton ), - d(new KConfigDialogPrivate(dialogType)) + d(new TDEConfigDialogPrivate(dialogType)) { if ( name ) { openDialogs.insert(name, this); @@ -71,19 +71,19 @@ KConfigDialog::KConfigDialog( TQWidget *parent, const char *name, connect(this, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(updateWidgetsDefault())); connect(this, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(updateButtons())); - d->manager = new KConfigDialogManager(this, config); + d->manager = new TDEConfigDialogManager(this, config); setupManagerConnections(d->manager); enableButton(Apply, false); } -KConfigDialog::~KConfigDialog() +TDEConfigDialog::~TDEConfigDialog() { openDialogs.remove(name()); delete d; } -void KConfigDialog::addPage(TQWidget *page, +void TDEConfigDialog::addPage(TQWidget *page, const TQString &itemName, const TQString &pixmapName, const TQString &header, @@ -94,25 +94,25 @@ void KConfigDialog::addPage(TQWidget *page, d->manager->addWidget(page); } -void KConfigDialog::addPage(TQWidget *page, - KConfigSkeleton *config, +void TDEConfigDialog::addPage(TQWidget *page, + TDEConfigSkeleton *config, const TQString &itemName, const TQString &pixmapName, const TQString &header) { addPageInternal(page, itemName, pixmapName, header); - d->managerForPage[page] = new KConfigDialogManager(page, config); + d->managerForPage[page] = new TDEConfigDialogManager(page, config); setupManagerConnections(d->managerForPage[page]); } -void KConfigDialog::addPageInternal(TQWidget *page, +void TDEConfigDialog::addPageInternal(TQWidget *page, const TQString &itemName, const TQString &pixmapName, const TQString &header) { if(d->shown) { - kdDebug(240) << "KConfigDialog::addPage: can not add a page after the dialog has been shown."; + kdDebug(240) << "TDEConfigDialog::addPage: can not add a page after the dialog has been shown."; return; } switch(d->type) @@ -144,11 +144,11 @@ void KConfigDialog::addPageInternal(TQWidget *page, break; default: - kdDebug(240) << "KConfigDialog::addpage: unknown type."; + kdDebug(240) << "TDEConfigDialog::addpage: unknown type."; } } -void KConfigDialog::setupManagerConnections(KConfigDialogManager *manager) +void TDEConfigDialog::setupManagerConnections(TDEConfigDialogManager *manager) { connect(manager, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(settingsChangedSlot())); connect(manager, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(updateButtons())); @@ -158,26 +158,26 @@ void KConfigDialog::setupManagerConnections(KConfigDialogManager *manager) connect(this, TQT_SIGNAL(defaultClicked()), manager, TQT_SLOT(updateWidgetsDefault())); } -KConfigDialog* KConfigDialog::exists(const char* name) +TDEConfigDialog* TDEConfigDialog::exists(const char* name) { return openDialogs.find(name); } -bool KConfigDialog::showDialog(const char* name) +bool TDEConfigDialog::showDialog(const char* name) { - KConfigDialog *dialog = exists(name); + TDEConfigDialog *dialog = exists(name); if(dialog) dialog->show(); return (dialog != NULL); } -void KConfigDialog::updateButtons() +void TDEConfigDialog::updateButtons() { static bool only_once = false; if (only_once) return; only_once = true; - TQMap::iterator it; + TQMap::iterator it; bool has_changed = d->manager->hasChanged() || hasChanged(); for (it = d->managerForPage.begin(); @@ -203,7 +203,7 @@ void KConfigDialog::updateButtons() only_once = false; } -void KConfigDialog::settingsChangedSlot() +void TDEConfigDialog::settingsChangedSlot() { // Update the buttons updateButtons(); @@ -211,9 +211,9 @@ void KConfigDialog::settingsChangedSlot() emit settingsChanged(name()); } -void KConfigDialog::show() +void TDEConfigDialog::show() { - TQMap::iterator it; + TQMap::iterator it; updateWidgets(); d->manager->updateWidgets(); @@ -243,15 +243,15 @@ void KConfigDialog::show() KDialogBase::show(); } -void KConfigDialog::updateSettings() +void TDEConfigDialog::updateSettings() { } -void KConfigDialog::updateWidgets() +void TDEConfigDialog::updateWidgets() { } -void KConfigDialog::updateWidgetsDefault() +void TDEConfigDialog::updateWidgetsDefault() { } -- cgit v1.2.1 From 5159cd2beb2e87806a5b54e9991b7895285c9d3e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 01:04:16 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- tdeui/kconfigdialog.cpp | 259 ------------------------------------------------ 1 file changed, 259 deletions(-) delete mode 100644 tdeui/kconfigdialog.cpp (limited to 'tdeui/kconfigdialog.cpp') diff --git a/tdeui/kconfigdialog.cpp b/tdeui/kconfigdialog.cpp deleted file mode 100644 index 9707bc26a..000000000 --- a/tdeui/kconfigdialog.cpp +++ /dev/null @@ -1,259 +0,0 @@ -/* - * This file is part of the KDE libraries - * Copyright (C) 2003 Benjamin C Meyer (ben+tdelibs at meyerhome dot net) - * Copyright (C) 2003 Waldo Bastian - * Copyright (C) 2004 Michael Brade - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public License - * along with this library; see the file COPYING.LIB. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ -#include "kconfigdialog.h" - -#include -#include -#include -#include -#include - -#include -#include -#include - -TQAsciiDict TDEConfigDialog::openDialogs; - -// This class is here purly so we don't break binary compatibility down the road. -class TDEConfigDialog::TDEConfigDialogPrivate -{ -public: - TDEConfigDialogPrivate(KDialogBase::DialogType t) - : shown(false), type(t), manager(0) { } - - bool shown; - KDialogBase::DialogType type; - TDEConfigDialogManager *manager; - TQMap managerForPage; -}; - -TDEConfigDialog::TDEConfigDialog( TQWidget *parent, const char *name, - TDEConfigSkeleton *config, - DialogType dialogType, - int dialogButtons, - ButtonCode defaultButton, - bool modal ) : - KDialogBase( dialogType, (WFlags)TQt::WStyle_DialogBorder, - parent, name, modal, i18n("Configure"), dialogButtons, defaultButton ), - d(new TDEConfigDialogPrivate(dialogType)) -{ - if ( name ) { - openDialogs.insert(name, this); - } else { - TQCString genericName; - genericName.sprintf("SettingsDialog-%p", this); - openDialogs.insert(genericName, this); - setName(genericName); - } - - connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(updateSettings())); - connect(this, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(updateSettings())); - connect(this, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(updateButtons())); - connect(this, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(updateWidgetsDefault())); - connect(this, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(updateButtons())); - - d->manager = new TDEConfigDialogManager(this, config); - setupManagerConnections(d->manager); - - enableButton(Apply, false); -} - -TDEConfigDialog::~TDEConfigDialog() -{ - openDialogs.remove(name()); - delete d; -} - -void TDEConfigDialog::addPage(TQWidget *page, - const TQString &itemName, - const TQString &pixmapName, - const TQString &header, - bool manage) -{ - addPageInternal(page, itemName, pixmapName, header); - if(manage) - d->manager->addWidget(page); -} - -void TDEConfigDialog::addPage(TQWidget *page, - TDEConfigSkeleton *config, - const TQString &itemName, - const TQString &pixmapName, - const TQString &header) -{ - addPageInternal(page, itemName, pixmapName, header); - d->managerForPage[page] = new TDEConfigDialogManager(page, config); - setupManagerConnections(d->managerForPage[page]); -} - -void TDEConfigDialog::addPageInternal(TQWidget *page, - const TQString &itemName, - const TQString &pixmapName, - const TQString &header) -{ - if(d->shown) - { - kdDebug(240) << "TDEConfigDialog::addPage: can not add a page after the dialog has been shown."; - return; - } - switch(d->type) - { - case TreeList: - case IconList: - case Tabbed: { - TQVBox *frame = addVBoxPage(itemName, header, SmallIcon(pixmapName, 32)); - frame->setSpacing( 0 ); - frame->setMargin( 0 ); - page->reparent(((TQWidget*)frame), 0, TQPoint()); - } - break; - - case Swallow: - { - page->reparent(this, 0, TQPoint()); - setMainWidget(page); - } - break; - - case Plain: - { - TQFrame *main = plainPage(); - TQVBoxLayout *topLayout = new TQVBoxLayout( main, 0, 0 ); - page->reparent(((TQWidget*)main), 0, TQPoint()); - topLayout->addWidget( page ); - } - break; - - default: - kdDebug(240) << "TDEConfigDialog::addpage: unknown type."; - } -} - -void TDEConfigDialog::setupManagerConnections(TDEConfigDialogManager *manager) -{ - connect(manager, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(settingsChangedSlot())); - connect(manager, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(updateButtons())); - - connect(this, TQT_SIGNAL(okClicked()), manager, TQT_SLOT(updateSettings())); - connect(this, TQT_SIGNAL(applyClicked()), manager, TQT_SLOT(updateSettings())); - connect(this, TQT_SIGNAL(defaultClicked()), manager, TQT_SLOT(updateWidgetsDefault())); -} - -TDEConfigDialog* TDEConfigDialog::exists(const char* name) -{ - return openDialogs.find(name); -} - -bool TDEConfigDialog::showDialog(const char* name) -{ - TDEConfigDialog *dialog = exists(name); - if(dialog) - dialog->show(); - return (dialog != NULL); -} - -void TDEConfigDialog::updateButtons() -{ - static bool only_once = false; - if (only_once) return; - only_once = true; - - TQMap::iterator it; - - bool has_changed = d->manager->hasChanged() || hasChanged(); - for (it = d->managerForPage.begin(); - it != d->managerForPage.end() && !has_changed; - ++it) - { - has_changed |= (*it)->hasChanged(); - } - - enableButton(Apply, has_changed); - - bool is_default = d->manager->isDefault() && isDefault(); - for (it = d->managerForPage.begin(); - it != d->managerForPage.end() && is_default; - ++it) - { - is_default &= (*it)->isDefault(); - } - - enableButton(Default, !is_default); - - emit widgetModified(); - only_once = false; -} - -void TDEConfigDialog::settingsChangedSlot() -{ - // Update the buttons - updateButtons(); - emit settingsChanged(); - emit settingsChanged(name()); -} - -void TDEConfigDialog::show() -{ - TQMap::iterator it; - - updateWidgets(); - d->manager->updateWidgets(); - for (it = d->managerForPage.begin(); it != d->managerForPage.end(); ++it) - (*it)->updateWidgets(); - - bool has_changed = d->manager->hasChanged() || hasChanged(); - for (it = d->managerForPage.begin(); - it != d->managerForPage.end() && !has_changed; - ++it) - { - has_changed |= (*it)->hasChanged(); - } - - enableButton(Apply, has_changed); - - bool is_default = d->manager->isDefault() && isDefault(); - for (it = d->managerForPage.begin(); - it != d->managerForPage.end() && is_default; - ++it) - { - is_default &= (*it)->isDefault(); - } - - enableButton(Default, !is_default); - d->shown = true; - KDialogBase::show(); -} - -void TDEConfigDialog::updateSettings() -{ -} - -void TDEConfigDialog::updateWidgets() -{ -} - -void TDEConfigDialog::updateWidgetsDefault() -{ -} - - -#include "kconfigdialog.moc" -- cgit v1.2.1