diff options
Diffstat (limited to 'deco/config')
-rw-r--r-- | deco/config/Makefile.am | 14 | ||||
-rw-r--r-- | deco/config/baghiraconfig.cc | 18 | ||||
-rw-r--r-- | deco/config/baghiraconfig.cc.new | 18 | ||||
-rw-r--r-- | deco/config/baghiraconfig.h | 8 | ||||
-rw-r--r-- | deco/config/baghiraconfig.h.new | 8 | ||||
-rw-r--r-- | deco/config/configdialog.ui | 2 | ||||
-rw-r--r-- | deco/config/configdialog.ui.new | 2 |
7 files changed, 35 insertions, 35 deletions
diff --git a/deco/config/Makefile.am b/deco/config/Makefile.am index 9352822..08e3ea3 100644 --- a/deco/config/Makefile.am +++ b/deco/config/Makefile.am @@ -6,16 +6,16 @@ INCLUDES = $(all_includes) -I$(srcdir)/../../config noinst_HEADERS = baghiraconfig.h aquariusbutton.h colorpicker.h pixmaps.h -kde_module_LTLIBRARIES = kwin_baghira_config.la -kwin_baghira_config_la_SOURCES = baghiraconfig.cc aquariusbutton.cc colorpicker.cc configdialog.ui -kwin_baghira_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin_baghira_config_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -kwin_baghira_config_la_METASOURCES = AUTO +kde_module_LTLIBRARIES = twin_baghira_config.la +twin_baghira_config_la_SOURCES = baghiraconfig.cc aquariusbutton.cc colorpicker.cc configdialog.ui +twin_baghira_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_baghira_config_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) +twin_baghira_config_la_METASOURCES = AUTO -DISTCLEANFILES = $(kwin_baghira_config_la_METASOURCES) +DISTCLEANFILES = $(twin_baghira_config_la_METASOURCES) messages: - $(XGETTEXT) *.cpp -o $(podir)/kwin_baghira_config.pot + $(XGETTEXT) *.cpp -o $(podir)/twin_baghira_config.pot pixmaps.h: $(srcdir)/generatePixmaps.sh $(SHELL) $(srcdir)/generatePixmaps.sh $(top_srcdir) diff --git a/deco/config/baghiraconfig.cc b/deco/config/baghiraconfig.cc index 711105c..23faf15 100644 --- a/deco/config/baghiraconfig.cc +++ b/deco/config/baghiraconfig.cc @@ -7,9 +7,9 @@ // Please see the header file for copyright and license information. ////////////////////////////////////////////////////////////////////////////// -#include <kconfig.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdeconfig.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kcolorbutton.h> #include <tqbutton.h> #include <tqbuttongroup.h> @@ -38,13 +38,13 @@ // ------------- // Constructor -BaghiraConfig::BaghiraConfig(KConfig*, TQWidget* parent) +BaghiraConfig::BaghiraConfig(TDEConfig*, TQWidget* parent) : TQObject(parent), /*config_(0),*/ dialog_(0) { -// config_ = new KConfig("baghirarc"); +// config_ = new TDEConfig("baghirarc"); // config_ = new TQSettings; // config_->beginGroup("/baghira/Deco"); - KGlobal::locale()->insertCatalogue("kwin_baghira_config"); + TDEGlobal::locale()->insertCatalogue("twin_baghira_config"); dialog_ = new ConfigDialog(parent); buttonDialog_ = new ButtonColors(parent, "Button Colors"); @@ -162,7 +162,7 @@ BaghiraConfig::~BaghiraConfig() // ------ // Load configuration data -void BaghiraConfig::load(KConfig*) +void BaghiraConfig::load(TDEConfig*) { TQSettings *config_ = new TQSettings; config_->beginGroup("/baghira/Deco"); @@ -279,7 +279,7 @@ void BaghiraConfig::load(KConfig*) // ------ // Save configuration data -void BaghiraConfig::save(KConfig*) +void BaghiraConfig::save(TDEConfig*) { TQSettings *config_ = new TQSettings; config_->beginGroup("/baghira/Deco"); @@ -721,7 +721,7 @@ void ButtonColors::init(){ extern "C" { - TQObject* allocate_config(KConfig* config, TQWidget* parent) { + TQObject* allocate_config(TDEConfig* config, TQWidget* parent) { return(new BaghiraConfig(config, parent)); } } diff --git a/deco/config/baghiraconfig.cc.new b/deco/config/baghiraconfig.cc.new index 2f35515..5c64932 100644 --- a/deco/config/baghiraconfig.cc.new +++ b/deco/config/baghiraconfig.cc.new @@ -7,9 +7,9 @@ // Please see the header file for copyright and license information. ////////////////////////////////////////////////////////////////////////////// -#include <kconfig.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdeconfig.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kcolorbutton.h> #include <tqbutton.h> #include <tqbuttongroup.h> @@ -39,13 +39,13 @@ // ------------- // Constructor -BaghiraConfig::BaghiraConfig(KConfig*, TQWidget* parent) +BaghiraConfig::BaghiraConfig(TDEConfig*, TQWidget* parent) : TQObject(parent), /*config_(0),*/ dialog_(0) { -// config_ = new KConfig("baghirarc"); +// config_ = new TDEConfig("baghirarc"); // config_ = new TQSettings; // config_->beginGroup("/baghira/Deco"); - KGlobal::locale()->insertCatalogue("kwin_baghira_config"); + TDEGlobal::locale()->insertCatalogue("twin_baghira_config"); dialog_ = new ConfigDialog(parent); buttonDialog_ = new ButtonColors(parent, "Button Colors"); @@ -163,7 +163,7 @@ BaghiraConfig::~BaghiraConfig() // ------ // Load configuration data -void BaghiraConfig::load(KConfig*) +void BaghiraConfig::load(TDEConfig*) { TQSettings *config_ = new TQSettings; config_->beginGroup("/baghira/Deco"); @@ -280,7 +280,7 @@ void BaghiraConfig::load(KConfig*) // ------ // Save configuration data -void BaghiraConfig::save(KConfig*) +void BaghiraConfig::save(TDEConfig*) { TQSettings *config_ = new TQSettings; config_->beginGroup("/baghira/Deco"); @@ -722,7 +722,7 @@ void ButtonColors::init(){ extern "C" { - TQObject* allocate_config(KConfig* config, TQWidget* parent) { + TQObject* allocate_config(TDEConfig* config, TQWidget* parent) { return(new BaghiraConfig(config, parent)); } } diff --git a/deco/config/baghiraconfig.h b/deco/config/baghiraconfig.h index af16605..649c086 100644 --- a/deco/config/baghiraconfig.h +++ b/deco/config/baghiraconfig.h @@ -32,7 +32,7 @@ #include "colorpicker.h" #include "aquariusbutton.h" -class KConfig; +class TDEConfig; class TQSettings; class ConfigDialog; class TQLabel; @@ -124,15 +124,15 @@ class BaghiraConfig : public TQObject { Q_OBJECT public: - BaghiraConfig(KConfig* config, TQWidget* parent); + BaghiraConfig(TDEConfig* config, TQWidget* parent); ~BaghiraConfig(); signals: void changed(); public slots: - void load(KConfig* conf); - void save(KConfig* conf); + void load(TDEConfig* conf); + void save(TDEConfig* conf); void defaults(); private: diff --git a/deco/config/baghiraconfig.h.new b/deco/config/baghiraconfig.h.new index edffcc9..6bab1a8 100644 --- a/deco/config/baghiraconfig.h.new +++ b/deco/config/baghiraconfig.h.new @@ -33,7 +33,7 @@ #include "colorpicker.h" #include "aquariusbutton.h" -class KConfig; +class TDEConfig; class TQSettings; class ConfigDialog; class TQLabel; @@ -126,15 +126,15 @@ class BaghiraConfig : public TQObject { Q_OBJECT public: - BaghiraConfig(KConfig* config, TQWidget* parent); + BaghiraConfig(TDEConfig* config, TQWidget* parent); ~BaghiraConfig(); signals: void changed(); public slots: - void load(KConfig* conf); - void save(KConfig* conf); + void load(TDEConfig* conf); + void save(TDEConfig* conf); void defaults(); private: diff --git a/deco/config/configdialog.ui b/deco/config/configdialog.ui index 9ecbf2e..f4e148a 100644 --- a/deco/config/configdialog.ui +++ b/deco/config/configdialog.ui @@ -123,7 +123,7 @@ <string>Draw Comic Frame</string> </property> <property name="toolTip" stdset="0"> - <string>Draws a black frame around the window (not the Titlebar).<br>Anyway i suggest to get the kwin dropshadow patch.</string> + <string>Draws a black frame around the window (not the Titlebar).<br>Anyway i suggest to get the twin dropshadow patch.</string> </property> </widget> <widget class="TQCheckBox" row="7" column="0"> diff --git a/deco/config/configdialog.ui.new b/deco/config/configdialog.ui.new index bd812d8..ffb33bd 100644 --- a/deco/config/configdialog.ui.new +++ b/deco/config/configdialog.ui.new @@ -211,7 +211,7 @@ from multipart titles</string> <string>Draw Comic Frame</string> </property> <property name="toolTip" stdset="0"> - <string>Draws a black frame around the window (not the Titlebar).<br>Anyway i suggest to get the kwin dropshadow patch.</string> + <string>Draws a black frame around the window (not the Titlebar).<br>Anyway i suggest to get the twin dropshadow patch.</string> </property> </widget> <widget class="TQCheckBox" row="8" column="0"> |