From 3e5506b29bb8d45ab067d3a4623af70a56abb990 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 2 Feb 2013 20:57:25 -0600 Subject: Rename kdisplay for enhanced compatibility with KDE4 --- kcontrol/krdb/ad/CMakeLists.txt | 2 +- kcontrol/krdb/ad/Makefile.am | 6 +++--- kcontrol/krdb/ad/README | 4 ++-- kcontrol/krdb/kcs/CMakeLists.txt | 2 +- kcontrol/krdb/kcs/Makefile.am | 6 +++--- kcontrol/krdb/krdb.cpp | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'kcontrol/krdb') diff --git a/kcontrol/krdb/ad/CMakeLists.txt b/kcontrol/krdb/ad/CMakeLists.txt index e295acd85..43fde7fee 100644 --- a/kcontrol/krdb/ad/CMakeLists.txt +++ b/kcontrol/krdb/ad/CMakeLists.txt @@ -13,7 +13,7 @@ install( FILES AAAAAAGeneral.ad AAAMotif.ad AAATk.ad AAAXaw.ad AcroRead.ad Editres.ad Emacs.ad GV.ad ML.ad Nedit.ad Netscape.ad RVPlayer.ad WPerfect.ad XCalc.ad Xawtv.ad Xdvi.ad XTerm.ad XOsview.ad XV.ad Xpdf.ad - DESTINATION ${DATA_INSTALL_DIR}/kdisplay/app-defaults ) + DESTINATION ${DATA_INSTALL_DIR}/tdedisplay/app-defaults ) install( PROGRAMS krdb diff --git a/kcontrol/krdb/ad/Makefile.am b/kcontrol/krdb/ad/Makefile.am index 68b2fe2bb..bb6a1eebb 100644 --- a/kcontrol/krdb/ad/Makefile.am +++ b/kcontrol/krdb/ad/Makefile.am @@ -1,13 +1,13 @@ AM_CPPFLAGS = $(all_includes) -kdisplay_defaults_data_DATA = AAAAAAGeneral.ad AAAMotif.ad AAATk.ad AAAXaw.ad AcroRead.ad \ +tdedisplay_defaults_data_DATA = AAAAAAGeneral.ad AAAMotif.ad AAATk.ad AAAXaw.ad AcroRead.ad \ Editres.ad Emacs.ad GV.ad ML.ad Nedit.ad Netscape.ad RVPlayer.ad \ WPerfect.ad XCalc.ad Xawtv.ad Xdvi.ad XTerm.ad XOsview.ad XV.ad Xpdf.ad -kdisplay_defaults_datadir = $(kde_datadir)/kdisplay/app-defaults +tdedisplay_defaults_datadir = $(kde_datadir)/tdedisplay/app-defaults -EXTRA_DIST = $(kdisplay_defaults_data_DATA) +EXTRA_DIST = $(tdedisplay_defaults_data_DATA) bin_SCRIPTS = krdb diff --git a/kcontrol/krdb/ad/README b/kcontrol/krdb/ad/README index 9a5d836cb..1d921ca67 100644 --- a/kcontrol/krdb/ad/README +++ b/kcontrol/krdb/ad/README @@ -35,11 +35,11 @@ Their meaning should be obvious to anyone familiar with KDE's desktop wide resources. Install your application default file either in -$(TDEDIR)/share/apps/kdisplay/app-defaults +$(TDEDIR)/share/apps/tdedisplay/app-defaults or -$(HOME)/.trinity/share/apps/kdisplay/app-defaults +$(HOME)/.trinity/share/apps/tdedisplay/app-defaults so that it is available to krdb for reading. If you want to override a system file simply copy it to your user diff --git a/kcontrol/krdb/kcs/CMakeLists.txt b/kcontrol/krdb/kcs/CMakeLists.txt index 5a3a8bb99..4238fe075 100644 --- a/kcontrol/krdb/kcs/CMakeLists.txt +++ b/kcontrol/krdb/kcs/CMakeLists.txt @@ -17,4 +17,4 @@ install( FILES KDEOne.kcsrc KDETwo.kcsrc MediaPeach.kcsrc Windows95.kcsrc EveX.kcsrc WindowsXP.kcsrc Keramik.kcsrc KeramikEmerald.kcsrc KeramikWhite.kcsrc BlackOnWhite.kcsrc WhiteOnBlack.kcsrc YellowOnBlue.kcsrc Plastik.kcsrc - DESTINATION ${DATA_INSTALL_DIR}/kdisplay/color-schemes ) + DESTINATION ${DATA_INSTALL_DIR}/tdedisplay/color-schemes ) diff --git a/kcontrol/krdb/kcs/Makefile.am b/kcontrol/krdb/kcs/Makefile.am index 8c5200089..dfa2389cf 100644 --- a/kcontrol/krdb/kcs/Makefile.am +++ b/kcontrol/krdb/kcs/Makefile.am @@ -1,5 +1,5 @@ -kdisplay_colorschemes_data_DATA = AtlasGreen.kcsrc BeOS.kcsrc BlueSlate.kcsrc \ +tdedisplay_colorschemes_data_DATA = AtlasGreen.kcsrc BeOS.kcsrc BlueSlate.kcsrc \ CDE.kcsrc DarkBlue.kcsrc DesertRed.kcsrc DigitalCDE.kcsrc \ PaleGray.kcsrc Pumpkin.kcsrc SolarisCDE.kcsrc Storm.kcsrc \ Windows2000.kcsrc System.kcsrc Next.kcsrc PointReyesGreen.kcsrc \ @@ -7,6 +7,6 @@ kdisplay_colorschemes_data_DATA = AtlasGreen.kcsrc BeOS.kcsrc BlueSlate.kcsrc \ WindowsXP.kcsrc Keramik.kcsrc KeramikEmerald.kcsrc KeramikWhite.kcsrc \ BlackOnWhite.kcsrc WhiteOnBlack.kcsrc YellowOnBlue.kcsrc Plastik.kcsrc -kdisplay_colorschemes_datadir = $(kde_datadir)/kdisplay/color-schemes +tdedisplay_colorschemes_datadir = $(kde_datadir)/tdedisplay/color-schemes -EXTRA_DIST = $(kdisplay_colorschemes_data_DATA) +EXTRA_DIST = $(tdedisplay_colorschemes_data_DATA) diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp index d8a2b026d..a04d144c8 100644 --- a/kcontrol/krdb/krdb.cpp +++ b/kcontrol/krdb/krdb.cpp @@ -444,7 +444,7 @@ void runRdb( uint flags ) // Export colors to non-(KDE/Qt) apps (e.g. Motif, GTK+ apps) if (exportColors) { - TDEGlobal::dirs()->addResourceType("appdefaults", TDEStandardDirs::kde_default("data") + "kdisplay/app-defaults/"); + TDEGlobal::dirs()->addResourceType("appdefaults", TDEStandardDirs::kde_default("data") + "tdedisplay/app-defaults/"); TQColorGroup cg = newPal.active(); TDEGlobal::locale()->insertCatalogue("krdb"); createGtkrc( true, cg, 1 ); -- cgit v1.2.3