Browse Source

Rename KStyle to TDEStyle to avoid conflicts with KDE4.

Darrell Anderson 5 years ago
parent
commit
d1b44ddf92
5 changed files with 14 additions and 14 deletions
  1. 3
    3
      lipstik.spec
  2. 1
    1
      style/Makefile.am
  3. 6
    6
      style/config/Makefile.am
  4. 3
    3
      style/config/lipstikconf.cpp
  5. 1
    1
      style/lipstik.themerc

+ 3
- 3
lipstik.spec View File

@@ -30,11 +30,11 @@ rm -rf $RPM_BUILD_ROOT
30 30
 
31 31
 %files
32 32
 %defattr(0644, root, root)
33
-/usr/lib/trinity/kstyle_lipstik_config.la
34
-/usr/lib/trinity/kstyle_lipstik_config.so
33
+/usr/lib/trinity/tdestyle_lipstik_config.la
34
+/usr/lib/trinity/tdestyle_lipstik_config.so
35 35
 /usr/lib/trinity/plugins/styles/lipstik.la
36 36
 /usr/lib/trinity/plugins/styles/lipstik.so
37
-/usr/share/apps/kstyle/themes/lipstik.themerc
37
+/usr/share/apps/tdestyle/themes/lipstik.themerc
38 38
 /usr/share/apps/tdedisplay/color-schemes/lipstikstandard.kcsrc
39 39
 /usr/share/apps/tdedisplay/color-schemes/lipstikwhite.kcsrc
40 40
 /usr/share/apps/tdedisplay/color-schemes/lipstiknoble.kcsrc

+ 1
- 1
style/Makefile.am View File

@@ -6,7 +6,7 @@ KDE_CXXFLAGS = -DQT_PLUGIN
6 6
 
7 7
 INCLUDES = $(all_includes)
8 8
 
9
-stylercdir = $(kde_datadir)/kstyle/themes
9
+stylercdir = $(kde_datadir)/tdestyle/themes
10 10
 stylerc_DATA = lipstik.themerc
11 11
 
12 12
 colorshemedir = $(kde_datadir)/tdedisplay/color-schemes

+ 6
- 6
style/config/Makefile.am View File

@@ -1,12 +1,12 @@
1 1
 INCLUDES = $(all_includes)
2 2
 
3 3
 noinst_HEADERS = lipstikconf.h
4
-kde_module_LTLIBRARIES = kstyle_lipstik_config.la
5
-kstyle_lipstik_config_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(KDE_PLUGIN) -module
6
-kstyle_lipstik_config_la_LIBADD  = $(LIB_TDEUI)
7
-kstyle_lipstik_config_la_SOURCES = lipstikconf.cpp
8
-kstyle_lipstik_config_la_METASOURCES = AUTO
4
+kde_module_LTLIBRARIES = tdestyle_lipstik_config.la
5
+tdestyle_lipstik_config_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(KDE_PLUGIN) -module
6
+tdestyle_lipstik_config_la_LIBADD  = $(LIB_TDEUI)
7
+tdestyle_lipstik_config_la_SOURCES = lipstikconf.cpp
8
+tdestyle_lipstik_config_la_METASOURCES = AUTO
9 9
 
10 10
 
11 11
 messages:
12
-	$(XGETTEXT) *.cpp *.h -o $(podir)/kstyle_lipstik_config.pot
12
+	$(XGETTEXT) *.cpp *.h -o $(podir)/tdestyle_lipstik_config.pot

+ 3
- 3
style/config/lipstikconf.cpp View File

@@ -47,9 +47,9 @@ DEALINGS IN THE SOFTWARE.
47 47
 
48 48
 extern "C"
49 49
 {
50
-	TQWidget* allocate_kstyle_config(TQWidget* parent)
50
+	TQWidget* allocate_tdestyle_config(TQWidget* parent)
51 51
 	{
52
-		TDEGlobal::locale()->insertCatalogue("kstyle_lipstik_config");
52
+		TDEGlobal::locale()->insertCatalogue("tdestyle_lipstik_config");
53 53
 		return new LipstikStyleConfig(parent);
54 54
 	}
55 55
 }
@@ -59,7 +59,7 @@ LipstikStyleConfig::LipstikStyleConfig(TQWidget* parent): TQWidget(parent)
59 59
 	TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0);
60 60
 	TQGridLayout* tabLayout = new TQGridLayout(this, 2, 1, 10);
61 61
 
62
-	TDEGlobal::locale()->insertCatalogue("kstyle_lipstik_config");
62
+	TDEGlobal::locale()->insertCatalogue("tdestyle_lipstik_config");
63 63
 
64 64
 	///Init tabs
65 65
 	TQTabWidget *tabWidget = new TQTabWidget(this);

+ 1
- 1
style/lipstik.themerc View File

@@ -1,6 +1,6 @@
1 1
 [Misc]
2 2
 Name=Lipstik
3
-ConfigPage=kstyle_lipstik_config
3
+ConfigPage=tdestyle_lipstik_config
4 4
 Comment=A purified style
5 5
 Comment[fr]=Un style pure
6 6
 [KDE]

Loading…
Cancel
Save