A nice thing and a bad thing.

Good: I've moved the tests under a tests subdir, a.l.a. kdelibs.
To compile them:
$ cd tests
$ unsermake check
In this way, less code is compiled and installed as default

Bad: I've commented with #if 0 a pair of constructors that don't compile
here, and I don't know how to fix, sorry :(

CCMAIL: kstars@30doradus.org

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=456393

diff --git a/extdate/Makefile.am b/extdate/Makefile.am
index fa0b080f477f98eb72fd296073ae0d55c37c34f5..e2234d10682ab993a74a961185670b572b6351dd 100644 (file)
--- a/extdate/Makefile.am
+++ b/extdate/Makefile.am
@@ -1,4 +1,4 @@
-bin_PROGRAMS = test_extdate test_extdatepicker
+SUBDIRS = . tests
 
 INCLUDES= $(all_includes)
 
@@ -9,13 +9,4 @@ libextdate_la_SOURCES = extdatetime.cpp extcalendarsystem.cpp extcalendarsystemg
 libextdate_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
 libextdate_la_LIBADD = $(LIB_KDEUI)
 
-test_extdate_SOURCES = test_extdate.cc
-test_extdate_LDADD = libextdate.la
-test_extdate_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-
-test_extdatepicker_SOURCES = testwidget.cpp main.cpp
-test_extdatepicker_LDADD = libextdate.la
-test_extdatepicker_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-
 METASOURCES = AUTO
-

diff --git a/extdate/extdatetimeedit.cpp b/extdate/extdatetimeedit.cpp
index e625fd6760649a3ba45345f8ce641722a36149e8..673a54c20c0a94f5b4c69db37b76b43e76d216c4 100644 (file)
--- a/extdate/extdatetimeedit.cpp
+++ b/extdate/extdatetimeedit.cpp
@@ -34,9 +34,11 @@ ExtDateEdit::ExtDateEdit( const ExtDate &d, QWidget *parent )
        m_DateFormat.replace( "y", "Y" );
 }
 
+#if 0
 ExtDateEdit::ExtDateEdit( int jd, QWidget *parent ) {
        ExtDateEdit( ExtDate(jd), parent );
 }
+#endif
 
 ExtDateEdit::~ExtDateEdit() {
 }
@@ -100,9 +102,11 @@ ExtDateTimeEdit::ExtDateTimeEdit( const ExtDateTime &dt, QWidget *parent )
        hlay->addWidget( m_TimeEdit );
 }
 
+#if 0
 ExtDateTimeEdit::ExtDateTimeEdit( const ExtDate &d, const QTime &t, QWidget *parent ) {
        ExtDateTimeEdit( ExtDateTime( d, t ), parent );
 }
+#endif
 
 ExtDateTimeEdit::~ExtDateTimeEdit() {
 }

diff --git a/extdate/extdatetimeedit.h b/extdate/extdatetimeedit.h
index 56e46f96b561eefe89118c9b7238b5042596a4c5..de94e7d89f3168e8d2634afdb99881a8d3f42225 100644 (file)
--- a/extdate/extdatetimeedit.h
+++ b/extdate/extdatetimeedit.h
@@ -59,7 +59,9 @@ class ExtDateEdit : public QSpinBox {
 
        public:
                ExtDateEdit( const ExtDate &d = ExtDate::currentDate(), QWidget *parent = 0 );
+#if 0
                ExtDateEdit( int jd, QWidget *parent = 0 );
+#endif
                ~ExtDateEdit();
 
                void stepBy( int steps );
@@ -90,7 +92,9 @@ class ExtDateTimeEdit : public QWidget {
 
        public:
                ExtDateTimeEdit( const ExtDateTime &dt = ExtDateTime::currentDateTime(), QWidget *p=0 );
+#if 0
                ExtDateTimeEdit( const ExtDate &d, const QTime &t, QWidget *p=0 );
+#endif
                ~ExtDateTimeEdit();
 
        private:

diff --git a/extdate/tests/Makefile.am b/extdate/tests/Makefile.am
new file mode 100644 (file)
index 0000000..7a5163d
--- /dev/null
+++ b/extdate/tests/Makefile.am
@@ -0,0 +1,12 @@
+INCLUDES = -I$(top_srcdir)/libkdeedu/extdate $(all_includes)
+
+LDADD = ../libextdate.la
+
+AM_LDFLAGS = $(QT_LDFLAGS) $(X_LDFLAGS) $(KDE_RPATH)
+
+check_PROGRAMS = test_extdate test_extdatepicker
+
+test_extdate_SOURCES = test_extdate.cc
+test_extdatepicker_SOURCES = testwidget.cpp main.cpp
+
+METASOURCES = AUTO

diff --git a/extdate/main.cpp b/extdate/tests/main.cpp
similarity index 100%
rename from extdate/main.cpp
rename to extdate/tests/main.cpp

diff --git a/extdate/test_extdate.cc b/extdate/tests/test_extdate.cc
similarity index 100%
rename from extdate/test_extdate.cc
rename to extdate/tests/test_extdate.cc

diff --git a/extdate/testwidget.cpp b/extdate/tests/testwidget.cpp
similarity index 100%
rename from extdate/testwidget.cpp
rename to extdate/tests/testwidget.cpp

diff --git a/extdate/testwidget.h b/extdate/tests/testwidget.h
similarity index 100%
rename from extdate/testwidget.h
rename to extdate/tests/testwidget.h