Rename a number of libraries and executables to avoid conflicts with KDE4

INSTALL

@@ -67,7 +67,7 @@ out of the box there.
 
 Some people have reported that building fails with errors related to .moc files.
  eg:
-    lipstikconf.cpp:479:27: lipstikconf.moc: No such file or directory
+    lipstitdeconf.cpp:479:27: lipstitdeconf.moc: No such file or directory
 
 If this happens to you, dont panic.
 In the source dir, there are style and style/config subdirs:
@@ -76,7 +76,7 @@ In the source dir, there are style and style/config subdirs:
     moc -o lipstik.moc lipstik.h
 
  And then in the style/config subdir do
-    moc -o lipstikconf.moc lipstikconf.h
+    moc -o lipstitdeconf.moc lipstitdeconf.h
 
 Then run make again, it should work.
 

style/config/Makefile.am

@@ -1,10 +1,10 @@
 INCLUDES = $(all_includes)
 
-noinst_HEADERS = lipstikconf.h
+noinst_HEADERS = lipstitdeconf.h
 kde_module_LTLIBRARIES = kstyle_lipstik_config.la
 kstyle_lipstik_config_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(KDE_PLUGIN) -module
 kstyle_lipstik_config_la_LIBADD  = $(LIB_TDEUI)
-kstyle_lipstik_config_la_SOURCES = lipstikconf.cpp
+kstyle_lipstik_config_la_SOURCES = lipstitdeconf.cpp
 kstyle_lipstik_config_la_METASOURCES = AUTO
 
 

style/config/lipstitdeconf.cpp

@@ -43,7 +43,7 @@ DEALINGS IN THE SOFTWARE.
 #include <tqspinbox.h>
 #include <tqgrid.h>
 
-#include "lipstikconf.h"
+#include "lipstitdeconf.h"
 
 extern "C"
 {
@@ -761,4 +761,4 @@ TQString LipstikStyleConfig::sliderType( int sliderlistnr )
     }
 }
 
-#include "lipstikconf.moc"
+#include "lipstitdeconf.moc"