diff options
Diffstat (limited to 'client')
-rw-r--r-- | client/Makefile.am | 12 | ||||
-rw-r--r-- | client/config/Makefile.am | 8 | ||||
-rw-r--r-- | client/config/config.cpp | 28 | ||||
-rw-r--r-- | client/config/config.h | 10 | ||||
-rw-r--r-- | client/domino.desktop | 2 | ||||
-rw-r--r-- | client/dominoclient.cpp | 6 |
6 files changed, 33 insertions, 33 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index 3ee503b..3e0f4ac 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -1,16 +1,16 @@ -INCLUDES = $(all_includes) -I$(kde_includes)/kwin +INCLUDES = $(all_includes) -I$(kde_includes)/twin SUBDIRS = . config -kde_module_LTLIBRARIES = kwin3_domino.la +kde_module_LTLIBRARIES = twin3_domino.la -kwin3_domino_la_SOURCES = dominoclient.cpp -kwin3_domino_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -L/usr/X11R6/lib -kwin3_domino_la_LIBADD = $(LIB_KDECORE) $(kde_libraries)/libkdecorations.la -lXext -lX11 $(LIB_QT) +twin3_domino_la_SOURCES = dominoclient.cpp +twin3_domino_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -L/usr/X11R6/lib +twin3_domino_la_LIBADD = $(LIB_TDECORE) $(kde_libraries)/libtdecorations.la -lXext -lX11 $(LIB_QT) METASOURCES = AUTO noinst_HEADERS = dominoclient.h -lnkdir = $(kde_datadir)/kwin +lnkdir = $(kde_datadir)/twin lnk_DATA = domino.desktop diff --git a/client/config/Makefile.am b/client/config/Makefile.am index d33a23e..b37477f 100644 --- a/client/config/Makefile.am +++ b/client/config/Makefile.am @@ -1,10 +1,10 @@ INCLUDES = $(all_includes) -kde_module_LTLIBRARIES = kwin_domino_config.la +kde_module_LTLIBRARIES = twin_domino_config.la -kwin_domino_config_la_SOURCES = config.cpp -kwin_domino_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin_domino_config_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) +twin_domino_config_la_SOURCES = config.cpp +twin_domino_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_domino_config_la_LIBADD = $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) METASOURCES = AUTO noinst_HEADERS = config.h diff --git a/client/config/config.cpp b/client/config/config.cpp index 482c1df..5dfffb2 100644 --- a/client/config/config.cpp +++ b/client/config/config.cpp @@ -21,8 +21,8 @@ */ #include "config.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tqvbox.h> #include <tqlayout.h> #include <tqlabel.h> @@ -31,24 +31,24 @@ extern "C" { - KDE_EXPORT TQObject* allocate_config( KConfig* config, TQWidget* parent ) + KDE_EXPORT TQObject* allocate_config( TDEConfig* config, TQWidget* parent ) { return(new DominoConfig(config, parent)); } } // NOTE: -// 'config' is a pointer to the kwindecoration modules open kwin config, +// 'config' is a pointer to the twindecoration modules open twin config, // and is by default set to the "Style" group. // 'parent' is the parent of the TQObject, which is a VBox inside the -// Configure tab in kwindecoration +// Configure tab in twindecoration -DominoConfig::DominoConfig( KConfig* config, TQWidget* parent ) +DominoConfig::DominoConfig( TDEConfig* config, TQWidget* parent ) : TQObject( parent ) { - conf = new KConfig("kwindominorc"); + conf = new TDEConfig("twindominorc"); - KGlobal::locale()->insertCatalogue("kwin_clients"); + TDEGlobal::locale()->insertCatalogue("twin_clients"); vBox = new TQVBox( parent ); @@ -162,7 +162,7 @@ DominoConfig::DominoConfig( KConfig* config, TQWidget* parent ) connect(buttonPressedContourColor, SIGNAL(changed(const TQColor&)), this, SLOT(slotSelectionChanged())); - // Make the widgets visible in kwindecoration valueChanged + // Make the widgets visible in twindecoration valueChanged vBox->show(); } @@ -180,9 +180,9 @@ void DominoConfig::slotSelectionChanged() } -// Loads the configurable options from the kwinrc config file -// It is passed the open config from kwindecoration to improve efficiency -void DominoConfig::load(KConfig*) +// Loads the configurable options from the twinrc config file +// It is passed the open config from twindecoration to improve efficiency +void DominoConfig::load(TDEConfig*) { conf->setGroup("General"); @@ -213,8 +213,8 @@ void DominoConfig::load(KConfig*) } -// Saves the configurable options to the kwinrc config file -void DominoConfig::save(KConfig*) +// Saves the configurable options to the twinrc config file +void DominoConfig::save(TDEConfig*) { conf->setGroup("General"); diff --git a/client/config/config.h b/client/config/config.h index fbe5494..e48e96e 100644 --- a/client/config/config.h +++ b/client/config/config.h @@ -24,7 +24,7 @@ #define DOMINOCONFIG_H #include <tqcheckbox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqvbox.h> #include <kcolorbutton.h> @@ -33,7 +33,7 @@ class DominoConfig: public TQObject Q_OBJECT public: - DominoConfig( KConfig* config, TQWidget* parent ); + DominoConfig( TDEConfig* config, TQWidget* parent ); ~DominoConfig(); // These public signals/slots work similar to KCM modules @@ -41,15 +41,15 @@ class DominoConfig: public TQObject void changed(); public slots: - void load(KConfig* config); - void save(KConfig* config); + void load(TDEConfig* config); + void save(TDEConfig* config); void defaults(); protected slots: void slotSelectionChanged(); // Internal use void loadButtonContourColors(); private: - KConfig* conf; + TDEConfig* conf; TQVBox* vBox; TQCheckBox* customBorderColor; KColorButton* borderColor; diff --git a/client/domino.desktop b/client/domino.desktop index bdaca29..c0bb2ca 100644 --- a/client/domino.desktop +++ b/client/domino.desktop @@ -2,4 +2,4 @@ Encoding=UTF-8 Icon= Name=Domino -X-KDE-Library=kwin3_domino +X-TDE-Library=twin3_domino diff --git a/client/dominoclient.cpp b/client/dominoclient.cpp index c8b0c49..fddcf6f 100644 --- a/client/dominoclient.cpp +++ b/client/dominoclient.cpp @@ -23,8 +23,8 @@ #include "dominoclient.h" #include "clientData.h" -#include <kconfig.h> -#include <kglobal.h> +#include <tdeconfig.h> +#include <tdeglobal.h> #include <tqlayout.h> #include <tqbitmap.h> #include <tqimage.h> @@ -156,7 +156,7 @@ bool DominoHandler::reset( unsigned long changed ) unsigned long DominoHandler::readConfig( bool update ) { unsigned long changed = 0; - KConfig conf("kwindominorc"); + TDEConfig conf("twindominorc"); conf.setGroup("General"); titleHeight = TQMAX(TQFontMetrics(options()->font(true)).height(), 16); |