summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-02-25 02:56:47 +0100
committerSlávek Banko <slavek.banko@axis.cz>2013-02-25 02:56:47 +0100
commitb5a5082c65b26282be5e5296a928c2040f1d8e58 (patch)
treede75953b17c52097d356376517e75cbbb5f6fc96
parentfb579786982b3002e76cd52414e5e87649d613e9 (diff)
downloadtde-style-lipstik-b5a5082c.tar.gz
tde-style-lipstik-b5a5082c.zip
Fix unintended rename of lipstikconf
-rw-r--r--INSTALL4
-rw-r--r--style/config/Makefile.am4
-rw-r--r--style/config/lipstikconf.cpp (renamed from style/config/lipstitdeconf.cpp)4
-rw-r--r--style/config/lipstikconf.h (renamed from style/config/lipstitdeconf.h)0
4 files changed, 6 insertions, 6 deletions
diff --git a/INSTALL b/INSTALL
index 35c58c1..728c232 100644
--- a/INSTALL
+++ b/INSTALL
@@ -67,7 +67,7 @@ out of the box there.
Some people have reported that building fails with errors related to .moc files.
eg:
- lipstitdeconf.cpp:479:27: lipstitdeconf.moc: No such file or directory
+ lipstikconf.cpp:479:27: lipstikconf.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 lipstitdeconf.moc lipstitdeconf.h
+ moc -o lipstikconf.moc lipstikconf.h
Then run make again, it should work.
diff --git a/style/config/Makefile.am b/style/config/Makefile.am
index e7bfd9f..de50a34 100644
--- a/style/config/Makefile.am
+++ b/style/config/Makefile.am
@@ -1,10 +1,10 @@
INCLUDES = $(all_includes)
-noinst_HEADERS = lipstitdeconf.h
+noinst_HEADERS = lipstikconf.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 = lipstitdeconf.cpp
+kstyle_lipstik_config_la_SOURCES = lipstikconf.cpp
kstyle_lipstik_config_la_METASOURCES = AUTO
diff --git a/style/config/lipstitdeconf.cpp b/style/config/lipstikconf.cpp
index 7087819..d3b167b 100644
--- a/style/config/lipstitdeconf.cpp
+++ b/style/config/lipstikconf.cpp
@@ -43,7 +43,7 @@ DEALINGS IN THE SOFTWARE.
#include <tqspinbox.h>
#include <tqgrid.h>
-#include "lipstitdeconf.h"
+#include "lipstikconf.h"
extern "C"
{
@@ -761,4 +761,4 @@ TQString LipstikStyleConfig::sliderType( int sliderlistnr )
}
}
-#include "lipstitdeconf.moc"
+#include "lipstikconf.moc"
diff --git a/style/config/lipstitdeconf.h b/style/config/lipstikconf.h
index 2a88ba4..2a88ba4 100644
--- a/style/config/lipstitdeconf.h
+++ b/style/config/lipstikconf.h