From 8fafebe45b1ee4462326ff9f0ef7370ff86d6dc6 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Sun, 18 Aug 2013 10:17:17 -0500 Subject: Rename KStyle to TDEStyle to avoid conflicts with KDE4. --- styles/dotnet/CMakeLists.txt | 2 +- styles/dotnet/Makefile.am | 2 +- styles/dotnet/README | 2 +- styles/phase/CMakeLists.txt | 2 +- styles/phase/Makefile.am | 2 +- styles/phase/config/CMakeLists.txt | 4 ++-- styles/phase/config/Makefile.am | 12 ++++++------ styles/phase/config/phasestyleconfig.cpp | 6 +++--- styles/phase/phase.themerc | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/styles/dotnet/CMakeLists.txt b/styles/dotnet/CMakeLists.txt index ca13ae7b..15a2ef0f 100644 --- a/styles/dotnet/CMakeLists.txt +++ b/styles/dotnet/CMakeLists.txt @@ -25,7 +25,7 @@ link_directories( ##### other data ################################ -install( FILES dotnet.themerc DESTINATION ${DATA_INSTALL_DIR}/kstyle/themes ) +install( FILES dotnet.themerc DESTINATION ${DATA_INSTALL_DIR}/tdestyle/themes ) ##### dotnet ##################################### diff --git a/styles/dotnet/Makefile.am b/styles/dotnet/Makefile.am index 3fe44339..b3820dc7 100644 --- a/styles/dotnet/Makefile.am +++ b/styles/dotnet/Makefile.am @@ -28,5 +28,5 @@ dotnet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECO dotnet_la_LIBADD = -ltdefx dotnet_la_SOURCES = dotnet.cpp -themercdir = $(kde_datadir)/kstyle/themes +themercdir = $(kde_datadir)/tdestyle/themes themerc_DATA = dotnet.themerc diff --git a/styles/dotnet/README b/styles/dotnet/README index 6887cf2b..e8c5e623 100644 --- a/styles/dotnet/README +++ b/styles/dotnet/README @@ -1,6 +1,6 @@ To make this your default style without having to recompile tdelibs: -Create a $TDEHOME/share/config/kstylerc with the following lines. +Create a $TDEHOME/share/config/tdestylerc with the following lines. [KDE] WidgetStyle=dotNET diff --git a/styles/phase/CMakeLists.txt b/styles/phase/CMakeLists.txt index 8f2d6d66..314548f0 100644 --- a/styles/phase/CMakeLists.txt +++ b/styles/phase/CMakeLists.txt @@ -28,7 +28,7 @@ add_subdirectory( config ) ##### other data ################################ -install( FILES phase.themerc DESTINATION ${DATA_INSTALL_DIR}/kstyle/themes ) +install( FILES phase.themerc DESTINATION ${DATA_INSTALL_DIR}/tdestyle/themes ) ##### phasestyle ################################# diff --git a/styles/phase/Makefile.am b/styles/phase/Makefile.am index 8de17fe8..6f2639c9 100644 --- a/styles/phase/Makefile.am +++ b/styles/phase/Makefile.am @@ -6,7 +6,7 @@ KDE_CXXFLAGS = -DQT_PLUGIN INCLUDES = $(all_includes) -styledir = $(kde_datadir)/kstyle/themes +styledir = $(kde_datadir)/tdestyle/themes style_DATA = phase.themerc EXTRA_DIST = $(style_DATA) diff --git a/styles/phase/config/CMakeLists.txt b/styles/phase/config/CMakeLists.txt index 926bb0b5..067d61e1 100644 --- a/styles/phase/config/CMakeLists.txt +++ b/styles/phase/config/CMakeLists.txt @@ -19,9 +19,9 @@ link_directories( ${TQT_LIBRARY_DIRS} ) -##### kstyle_phase_config ######################## +##### tdestyle_phase_config ######################## -set( target kstyle_phase_config ) +set( target tdestyle_phase_config ) set( ${target}_SRCS phasestyleconfig.cpp diff --git a/styles/phase/config/Makefile.am b/styles/phase/config/Makefile.am index 5287e822..9de45593 100644 --- a/styles/phase/config/Makefile.am +++ b/styles/phase/config/Makefile.am @@ -2,11 +2,11 @@ INCLUDES = $(all_includes) noinst_HEADERS = phasestyleconfig.h -kde_module_LTLIBRARIES = kstyle_phase_config.la -kstyle_phase_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx -kstyle_phase_config_la_LIBADD = $(LIB_TDEUI) -kstyle_phase_config_la_SOURCES = phasestyleconfig.cpp styledialog.ui -kstyle_phase_config_la_METASOURCES = AUTO +kde_module_LTLIBRARIES = tdestyle_phase_config.la +tdestyle_phase_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx +tdestyle_phase_config_la_LIBADD = $(LIB_TDEUI) +tdestyle_phase_config_la_SOURCES = phasestyleconfig.cpp styledialog.ui +tdestyle_phase_config_la_METASOURCES = AUTO messages: rc.cpp - $(XGETTEXT) *.cpp *.h -o $(podir)/kstyle_phase_config.pot + $(XGETTEXT) *.cpp *.h -o $(podir)/tdestyle_phase_config.pot diff --git a/styles/phase/config/phasestyleconfig.cpp b/styles/phase/config/phasestyleconfig.cpp index 990b98e3..d3695b83 100644 --- a/styles/phase/config/phasestyleconfig.cpp +++ b/styles/phase/config/phasestyleconfig.cpp @@ -28,7 +28,7 @@ PhaseStyleConfig::PhaseStyleConfig(TQWidget* parent) : StyleDialog(parent) { - TDEGlobal::locale()->insertCatalogue("kstyle_phase_config"); + TDEGlobal::locale()->insertCatalogue("tdestyle_phase_config"); TQSettings settings; oldgradients = @@ -52,7 +52,7 @@ PhaseStyleConfig::PhaseStyleConfig(TQWidget* parent) : StyleDialog(parent) PhaseStyleConfig::~PhaseStyleConfig() { - TDEGlobal::locale()->removeCatalogue("kstyle_phase_config"); + TDEGlobal::locale()->removeCatalogue("tdestyle_phase_config"); } ////////////////////////////////////////////////////////////////////////////// @@ -103,7 +103,7 @@ void PhaseStyleConfig::defaults() extern "C" { - KDE_EXPORT TQObject* allocate_kstyle_config(TQWidget* parent) { + KDE_EXPORT TQObject* allocate_tdestyle_config(TQWidget* parent) { return(TQT_TQOBJECT(new PhaseStyleConfig(parent))); } } diff --git a/styles/phase/phase.themerc b/styles/phase/phase.themerc index 80856bc5..53ec5c54 100644 --- a/styles/phase/phase.themerc +++ b/styles/phase/phase.themerc @@ -35,7 +35,7 @@ Name[tr]=Faz Name[uk]=Фаза Name[vi]=Pha Name[zh_TW]=相 -ConfigPage=kstyle_phase_config +ConfigPage=tdestyle_phase_config Comment=Clean classical look Comment[bg]=Семпъл и изчистен стил Comment[bs]=Jednostavan klasični stil -- cgit v1.2.1