diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-05-25 15:37:31 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-05-25 15:37:31 +0900 |
commit | 6392f5a9dfce2bf83617d49bb7f332181ec6004e (patch) | |
tree | ab69e390f7962b7e7dda1a3a64f035c61c751cf4 /src/tdeconf_update | |
parent | aba2788b428dc53243407902e9ccbb20b97a69fd (diff) | |
download | tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.tar.gz tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.zip |
Revert "Finish renaming tdevelop components"
This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.
Diffstat (limited to 'src/tdeconf_update')
-rw-r--r-- | src/tdeconf_update/CMakeLists.txt | 8 | ||||
-rw-r--r-- | src/tdeconf_update/Makefile.am | 10 | ||||
-rw-r--r-- | src/tdeconf_update/kdev-gen-settings-tdeconf_update.cpp (renamed from src/tdeconf_update/tdev-gen-settings-tdeconf_update.cpp) | 2 | ||||
-rw-r--r-- | src/tdeconf_update/kdev-gen-settings.upd (renamed from src/tdeconf_update/tdev-gen-settings.upd) | 0 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/tdeconf_update/CMakeLists.txt b/src/tdeconf_update/CMakeLists.txt index 8eb5c732..4b605615 100644 --- a/src/tdeconf_update/CMakeLists.txt +++ b/src/tdeconf_update/CMakeLists.txt @@ -20,13 +20,13 @@ link_directories( ##### other data ################################ -install( FILES tdev-gen-settings.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) +install( FILES kdev-gen-settings.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) -##### tdev-gen-settings-tdeconf_update (executable) +##### kdev-gen-settings-tdeconf_update (executable) -tde_add_executable( tdev-gen-settings-tdeconf_update - SOURCES tdev-gen-settings-tdeconf_update.cpp +tde_add_executable( kdev-gen-settings-tdeconf_update + SOURCES kdev-gen-settings-tdeconf_update.cpp LINK ${TQT_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR}/tdeconf_update_bin ) diff --git a/src/tdeconf_update/Makefile.am b/src/tdeconf_update/Makefile.am index 4cf2dab5..f806baa2 100644 --- a/src/tdeconf_update/Makefile.am +++ b/src/tdeconf_update/Makefile.am @@ -1,18 +1,18 @@ AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT $(all_includes) -update_DATA = tdev-gen-settings.upd +update_DATA = kdev-gen-settings.upd updatedir = $(kde_datadir)/tdeconf_update # The Qt app cannot go into kde_datadir, that is not portable. # install to kde_bindir/tdeconf_update_bin instead. # KDE 3.2 will allow tdeconf_update scripts to run directly from there, # but for us that's too late. Use the .sh script as a workaround. -tdeconf_PROGRAMS = tdev-gen-settings-tdeconf_update +tdeconf_PROGRAMS = kdev-gen-settings-tdeconf_update tdeconfdir = $(libdir)/tdeconf_update_bin -tdev_gen_settings_tdeconf_update_SOURCES = tdev-gen-settings-tdeconf_update.cpp -tdev_gen_settings_tdeconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -tdev_gen_settings_tdeconf_update_LDADD = $(LIB_QT) +kdev_gen_settings_tdeconf_update_SOURCES = kdev-gen-settings-tdeconf_update.cpp +kdev_gen_settings_tdeconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kdev_gen_settings_tdeconf_update_LDADD = $(LIB_QT) # vim: set noet: diff --git a/src/tdeconf_update/tdev-gen-settings-tdeconf_update.cpp b/src/tdeconf_update/kdev-gen-settings-tdeconf_update.cpp index ae20ae57..63e4a834 100644 --- a/src/tdeconf_update/tdev-gen-settings-tdeconf_update.cpp +++ b/src/tdeconf_update/kdev-gen-settings-tdeconf_update.cpp @@ -33,7 +33,7 @@ void parseKey( const TQString &group, const TQString &key, { //qcerr << "*** group='" << group << "'" << endl; - if ( group == "General Options" && key == "Embed TDevDesigner") + if ( group == "General Options" && key == "Embed KDevDesigner") { newKeyValue = "Designer App"; if ( value.lower() == "true" ) diff --git a/src/tdeconf_update/tdev-gen-settings.upd b/src/tdeconf_update/kdev-gen-settings.upd index 1fd3803f..1fd3803f 100644 --- a/src/tdeconf_update/tdev-gen-settings.upd +++ b/src/tdeconf_update/kdev-gen-settings.upd |