[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/kioslave/man
From:       Dirk Mueller <mueller () kde ! org>
Date:       2006-04-27 14:28:41
Message-ID: 1146148121.600695.6978.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 534602 by mueller:

compile++


 M  +5 -5      CMakeLists.txt  
 M  +4 -2      kio_man.cpp  
 M  +1 -1      kio_man.h  
 M  +2 -2      kio_man_test.cpp  
 M  +2 -0      man2html.cpp  


--- trunk/KDE/kdebase/kioslave/man/CMakeLists.txt #534601:534602
@@ -6,28 +6,28 @@
 
 ########### next target ###############
 
-set(kio_man_test_SRCS kio_man_test.cpp )
+set(kio_man_test_SRCS kio_man_test.cpp man2html.cpp kio_man.cpp )
 
 kde4_automoc(${kio_man_test_SRCS})
 
 if(KDE4_BUILD_TESTS)
 
 kde4_add_executable(kio_man_test ${kio_man_test_SRCS})
-
+set_target_properties(kio_man_test PROPERTIES COMPILE_FLAGS "-DSIMPLE_MAN2HTML -DKIO_MAN_TEST")
 target_link_libraries(kio_man_test  ${KDE4_KIO_LIBS} )
 
 endif(KDE4_BUILD_TESTS)
 
 ########### next target ###############
 
-set(man2html_SRCS dummy.cpp )
+set(man2html_SRCS man2html.cpp )
 
 kde4_automoc(${man2html_SRCS})
 
 if(KDE4_BUILD_TESTS)
 
 kde4_add_executable(man2html ${man2html_SRCS})
-
+set_target_properties(man2html PROPERTIES COMPILE_FLAGS -DSIMPLE_MAN2HTML)
 target_link_libraries(man2html  ${KDE4_KDECORE_LIBS} )
 
 endif(KDE4_BUILD_TESTS)
@@ -112,7 +112,7 @@
 #messages:
 #	$(XGETTEXT) *.cpp *.h -o $(podir)/kio_man.pot
 #
-#man2html_SOURCES = dummy.cpp
+#man2html_SOURCES = man2html.cpp
 #man2html_LDADD = man2html_simple.o $(LIB_QT)
 #man2html_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 #
--- trunk/KDE/kdebase/kioslave/man/kio_man.cpp #534601:534602
@@ -418,17 +418,19 @@
     }
 }
 
+#ifndef SIMPLE_MAN2HTML
 // called by man2html
-char *read_man_page(const char *filename)
+extern char *read_man_page(const char *filename)
 {
     return MANProtocol::self()->readManPage(filename);
 }
 
 // called by man2html
-void output_real(const char *insert)
+extern void output_real(const char *insert)
 {
     MANProtocol::self()->output(insert);
 }
+#endif
 
 void MANProtocol::get(const KUrl& url )
 {
--- trunk/KDE/kdebase/kioslave/man/kio_man.h #534601:534602
@@ -28,10 +28,10 @@
 //Added by qt3to4:
 #include <QTextStream>
 
-
 #include <kio/global.h>
 #include <kio/slavebase.h>
 
+class KProcess;
 
 class MANProtocol : public QObject, public KIO::SlaveBase
 {
--- trunk/KDE/kdebase/kioslave/man/kio_man_test.cpp #534601:534602
@@ -14,7 +14,7 @@
   Q_OBJECT
 
 public:
-  kio_man_test(const QCString &pool_socket, const QCString &app_socket);
+  kio_man_test(const QByteArray &pool_socket, const QByteArray &app_socket);
 
 protected:
   virtual void data(int);
@@ -27,7 +27,7 @@
 
 int main(int argc, char **argv)
 {
-  KApplication a( argc, argv , "p2");
+  QApplication a( argc, argv , "p2");
 
   MANProtocol testproto("/tmp/kiotest.in", "/tmp/kiotest.out");
   testproto.showIndex("3");
--- trunk/KDE/kdebase/kioslave/man/man2html.cpp #534601:534602
@@ -5621,6 +5621,7 @@
     return man_buf;
 }
 
+#ifndef KIO_MAN_TEST
 int main(int argc, char **argv)
 {
     htmlPath = ".";
@@ -5650,6 +5651,7 @@
     }
     return 0;
 }
+#endif
 
 
 #endif
[prev in list] [next in list] [prev in thread] [next in thread]