summaryrefslogtreecommitdiffstats
path: root/deco
diff options
context:
space:
mode:
Diffstat (limited to 'deco')
-rw-r--r--deco/Doxyfile2
-rw-r--r--deco/Makefile.am20
-rw-r--r--deco/baghira.desktop2
-rw-r--r--deco/baghiraclient.cc14
-rw-r--r--deco/baghiraclient.h2
-rw-r--r--deco/config/Makefile.am14
-rw-r--r--deco/config/baghiraconfig.cc18
-rw-r--r--deco/config/baghiraconfig.cc.new18
-rw-r--r--deco/config/baghiraconfig.h8
-rw-r--r--deco/config/baghiraconfig.h.new8
-rw-r--r--deco/config/configdialog.ui2
-rw-r--r--deco/config/configdialog.ui.new2
12 files changed, 55 insertions, 55 deletions
diff --git a/deco/Doxyfile b/deco/Doxyfile
index f90d99c..52f7355 100644
--- a/deco/Doxyfile
+++ b/deco/Doxyfile
@@ -3,7 +3,7 @@
#---------------------------------------------------------------------------
# Project related configuration options
#---------------------------------------------------------------------------
-PROJECT_NAME = baghira_deco.kdevelop
+PROJECT_NAME = baghira_deco.tdevelop
PROJECT_NUMBER = $VERSION$
OUTPUT_DIRECTORY =
OUTPUT_LANGUAGE = English
diff --git a/deco/Makefile.am b/deco/Makefile.am
index 7b55ace..a30efed 100644
--- a/deco/Makefile.am
+++ b/deco/Makefile.am
@@ -4,22 +4,22 @@ SUBDIRS = config
KDE_CXXFLAGS = -DQT_PLUGIN
-INCLUDES = $(all_includes) -I$(kde_includes)/kwin
+INCLUDES = $(all_includes) -I$(kde_includes)/twin
-kwindir = $(kde_datadir)/kwin/
-kwin_DATA = baghira.desktop
+twindir = $(kde_datadir)/twin/
+twin_DATA = baghira.desktop
-EXTRA_DIST = $(kwin_DATA) images
+EXTRA_DIST = $(twin_DATA) images
noinst_HEADERS = baghiraclient.h pixmaps.h masks.h
-kde_module_LTLIBRARIES = kwin3_baghira.la
-kwin3_baghira_la_SOURCES = baghiraclient.cc
-kwin3_baghira_la_LIBADD = $(kde_libraries)/libkdecorations.la
-kwin3_baghira_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(KDE_PLUGIN) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx -module
-kwin3_baghira_la_METASOURCES = AUTO
+kde_module_LTLIBRARIES = twin3_baghira.la
+twin3_baghira_la_SOURCES = baghiraclient.cc
+twin3_baghira_la_LIBADD = $(kde_libraries)/libtdecorations.la
+twin3_baghira_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx -module
+twin3_baghira_la_METASOURCES = AUTO
-DISTCLEANFILES = $(kwin3_baghira_la_METASOURCES)
+DISTCLEANFILES = $(twin3_baghira_la_METASOURCES)
pixmaps.h: $(srcdir)/generatePixmaps.sh
$(SHELL) $(srcdir)/generatePixmaps.sh $(top_srcdir)
diff --git a/deco/baghira.desktop b/deco/baghira.desktop
index 1514386..13d90b4 100644
--- a/deco/baghira.desktop
+++ b/deco/baghira.desktop
@@ -2,4 +2,4 @@
[Desktop Entry]
Encoding=UTF-8
Name=Baghira
-X-KDE-Library=kwin3_baghira
+X-TDE-Library=twin3_baghira
diff --git a/deco/baghiraclient.cc b/deco/baghiraclient.cc
index ca5eb37..68e1d58 100644
--- a/deco/baghiraclient.cc
+++ b/deco/baghiraclient.cc
@@ -7,14 +7,14 @@
// Please see the header file for copyright and license information.
//////////////////////////////////////////////////////////////////////////////
-// #include <kconfig.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+// #include <tdeconfig.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <kimageeffect.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpixmapeffect.h>
-#include <kwin.h>
-#include <kwinmodule.h>
+#include <twin.h>
+#include <twinmodule.h>
#include <tqapplication.h>
#include <tqbitmap.h>
#include <tqcursor.h>
@@ -370,7 +370,7 @@ unsigned long BaghiraFactory::readConfig() {
TQSettings config;
config.beginGroup("/baghira/Style");
-// KConfig config( "baghirarc" );
+// TDEConfig config( "baghirarc" );
// config.setGroup( "Style" );
bgStipple_ = config.readBoolEntry( "Design_StippleBackground", false);
contrast_ = config.readNumEntry( "Design_StippleContrast", 30 );
diff --git a/deco/baghiraclient.h b/deco/baghiraclient.h
index 28c4963..1105e09 100644
--- a/deco/baghiraclient.h
+++ b/deco/baghiraclient.h
@@ -32,7 +32,7 @@
#include <kdecoration.h>
#include <kdecorationfactory.h>
#include <kpixmap.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
/*
#define BUTTONSIZE 15;
#define MENUBUTTONWIDTH 20;
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).&lt;br&gt;Anyway i suggest to get the kwin dropshadow patch.</string>
+ <string>Draws a black frame around the window (not the Titlebar).&lt;br&gt;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).&lt;br&gt;Anyway i suggest to get the kwin dropshadow patch.</string>
+ <string>Draws a black frame around the window (not the Titlebar).&lt;br&gt;Anyway i suggest to get the twin dropshadow patch.</string>
</property>
</widget>
<widget class="TQCheckBox" row="8" column="0">