diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:09:16 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:09:16 -0600 |
| commit | afd9372ffec393f5a84e8c481b2eac450ea1a288 (patch) | |
| tree | 2de0c960c60436f79c5cc56148059b7acce873f1 /kiosktool | |
| parent | 593678085ae46350f68c744fb0a4dc981a2dcd48 (diff) | |
| download | kiosktool-afd9372ffec393f5a84e8c481b2eac450ea1a288.tar.gz kiosktool-afd9372ffec393f5a84e8c481b2eac450ea1a288.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kiosktool')
| -rw-r--r-- | kiosktool/Makefile.am | 4 | ||||
| -rw-r--r-- | kiosktool/kiosk_data.xml | 2 | ||||
| -rw-r--r-- | kiosktool/kioskrun.cpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/kiosktool/Makefile.am b/kiosktool/Makefile.am index 3a19511..8b1eb30 100644 --- a/kiosktool/Makefile.am +++ b/kiosktool/Makefile.am @@ -12,7 +12,7 @@ bin_PROGRAMS = kiosktool kiosktool-tdedirs INCLUDES = $(all_includes) # the library search path. -kiosktool_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kiosktool_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor # the libraries to link against. kiosktool_LDADD = $(LIB_KFILE) -ltdeprint @@ -32,7 +32,7 @@ kiosktool_SOURCES = main.cpp kioskgui.cpp kioskdata.cpp kioskrun.cpp \ kiosksync.cpp # the library search path. -kiosktool_tdedirs_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kiosktool_tdedirs_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor # the libraries to link against. kiosktool_tdedirs_LDADD = $(LIB_TDECORE) diff --git a/kiosktool/kiosk_data.xml b/kiosktool/kiosk_data.xml index 89522f0..cb4b141 100644 --- a/kiosktool/kiosk_data.xml +++ b/kiosktool/kiosk_data.xml @@ -177,7 +177,7 @@ </action> </actions> </group> - <group name="screensaver" icon="kscreensaver"> + <group name="screensaver" icon="tdescreensaver"> <caption>Screen Saver</caption> <description> Set up Screen Saver diff --git a/kiosktool/kioskrun.cpp b/kiosktool/kioskrun.cpp index 2930bf4..543bc91 100644 --- a/kiosktool/kioskrun.cpp +++ b/kiosktool/kioskrun.cpp @@ -192,7 +192,7 @@ void KioskRun::updateSycoca() { // Force update - TQString sycocaUpdateFile = KioskRun::self()->locateLocal("services", "update_ksycoca"); + TQString sycocaUpdateFile = KioskRun::self()->locateLocal("services", "update_tdesycoca"); TQFile file(sycocaUpdateFile); file.remove(); file.open(IO_WriteOnly); @@ -1589,10 +1589,10 @@ KioskRun::setUserProfileMappings( const ProfileMapping &groups, const ProfileMap void KioskRun::forceSycocaUpdate() { - // Touch $TDEDIR/share/services/update_ksycoca + // Touch $TDEDIR/share/services/update_tdesycoca KTempFile tempFile; tempFile.close(); - TQString sycocaUpdateFile = locateSave("services", "update_ksycoca"); + TQString sycocaUpdateFile = locateSave("services", "update_tdesycoca"); remove(sycocaUpdateFile); install(tempFile.name(), sycocaUpdateFile); } |