summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2013-08-18 10:23:15 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2013-08-18 10:23:15 -0500
commitd1b44ddf928c8cc01a83ba16fa128df218a8e4d3 (patch)
tree4e0b35e2b16c2c64e00d2e59c9f4d66a8c3033f6
parent519b6cf408bbbf9e236ee173a867b6e7d074cea8 (diff)
downloadtde-style-lipstik-d1b44ddf928c8cc01a83ba16fa128df218a8e4d3.tar.gz
tde-style-lipstik-d1b44ddf928c8cc01a83ba16fa128df218a8e4d3.zip
Rename KStyle to TDEStyle to avoid conflicts with KDE4.
-rw-r--r--lipstik.spec6
-rw-r--r--style/Makefile.am2
-rw-r--r--style/config/Makefile.am12
-rw-r--r--style/config/lipstikconf.cpp6
-rw-r--r--style/lipstik.themerc2
5 files changed, 14 insertions, 14 deletions
diff --git a/lipstik.spec b/lipstik.spec
index 0ccda4b..02ea7e2 100644
--- a/lipstik.spec
+++ b/lipstik.spec
@@ -30,11 +30,11 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(0644, root, root)
-/usr/lib/trinity/kstyle_lipstik_config.la
-/usr/lib/trinity/kstyle_lipstik_config.so
+/usr/lib/trinity/tdestyle_lipstik_config.la
+/usr/lib/trinity/tdestyle_lipstik_config.so
/usr/lib/trinity/plugins/styles/lipstik.la
/usr/lib/trinity/plugins/styles/lipstik.so
-/usr/share/apps/kstyle/themes/lipstik.themerc
+/usr/share/apps/tdestyle/themes/lipstik.themerc
/usr/share/apps/tdedisplay/color-schemes/lipstikstandard.kcsrc
/usr/share/apps/tdedisplay/color-schemes/lipstikwhite.kcsrc
/usr/share/apps/tdedisplay/color-schemes/lipstiknoble.kcsrc
diff --git a/style/Makefile.am b/style/Makefile.am
index da99528..d45dfe7 100644
--- a/style/Makefile.am
+++ b/style/Makefile.am
@@ -6,7 +6,7 @@ KDE_CXXFLAGS = -DQT_PLUGIN
INCLUDES = $(all_includes)
-stylercdir = $(kde_datadir)/kstyle/themes
+stylercdir = $(kde_datadir)/tdestyle/themes
stylerc_DATA = lipstik.themerc
colorshemedir = $(kde_datadir)/tdedisplay/color-schemes
diff --git a/style/config/Makefile.am b/style/config/Makefile.am
index de50a34..ec46632 100644
--- a/style/config/Makefile.am
+++ b/style/config/Makefile.am
@@ -1,12 +1,12 @@
INCLUDES = $(all_includes)
noinst_HEADERS = lipstikconf.h
-kde_module_LTLIBRARIES = kstyle_lipstik_config.la
-kstyle_lipstik_config_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(KDE_PLUGIN) -module
-kstyle_lipstik_config_la_LIBADD = $(LIB_TDEUI)
-kstyle_lipstik_config_la_SOURCES = lipstikconf.cpp
-kstyle_lipstik_config_la_METASOURCES = AUTO
+kde_module_LTLIBRARIES = tdestyle_lipstik_config.la
+tdestyle_lipstik_config_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(KDE_PLUGIN) -module
+tdestyle_lipstik_config_la_LIBADD = $(LIB_TDEUI)
+tdestyle_lipstik_config_la_SOURCES = lipstikconf.cpp
+tdestyle_lipstik_config_la_METASOURCES = AUTO
messages:
- $(XGETTEXT) *.cpp *.h -o $(podir)/kstyle_lipstik_config.pot
+ $(XGETTEXT) *.cpp *.h -o $(podir)/tdestyle_lipstik_config.pot
diff --git a/style/config/lipstikconf.cpp b/style/config/lipstikconf.cpp
index d3b167b..3646421 100644
--- a/style/config/lipstikconf.cpp
+++ b/style/config/lipstikconf.cpp
@@ -47,9 +47,9 @@ DEALINGS IN THE SOFTWARE.
extern "C"
{
- TQWidget* allocate_kstyle_config(TQWidget* parent)
+ TQWidget* allocate_tdestyle_config(TQWidget* parent)
{
- TDEGlobal::locale()->insertCatalogue("kstyle_lipstik_config");
+ TDEGlobal::locale()->insertCatalogue("tdestyle_lipstik_config");
return new LipstikStyleConfig(parent);
}
}
@@ -59,7 +59,7 @@ LipstikStyleConfig::LipstikStyleConfig(TQWidget* parent): TQWidget(parent)
TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0);
TQGridLayout* tabLayout = new TQGridLayout(this, 2, 1, 10);
- TDEGlobal::locale()->insertCatalogue("kstyle_lipstik_config");
+ TDEGlobal::locale()->insertCatalogue("tdestyle_lipstik_config");
///Init tabs
TQTabWidget *tabWidget = new TQTabWidget(this);
diff --git a/style/lipstik.themerc b/style/lipstik.themerc
index 2f6d231..714acb4 100644
--- a/style/lipstik.themerc
+++ b/style/lipstik.themerc
@@ -1,6 +1,6 @@
[Misc]
Name=Lipstik
-ConfigPage=kstyle_lipstik_config
+ConfigPage=tdestyle_lipstik_config
Comment=A purified style
Comment[fr]=Un style pure
[KDE]