Fix scons and revert the now not needed r29669.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29692 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/cmake/src/CMakeLists.txt b/development/cmake/src/CMakeLists.txt
index 6965d68da4a6173cd01bedc2ef474bef6fd27dc7..08043da04a566fc1ab035ab4208128858e77dc60 100644 (file)
--- a/development/cmake/src/CMakeLists.txt
+++ b/development/cmake/src/CMakeLists.txt
@@ -35,7 +35,7 @@ if (ASPELL_FOUND)
 endif()
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR}
-       ${ZLIB_INCLUDE_DIR} ${QT_INCLUDES})
+       ${ZLIB_INCLUDE_DIR})
 
 lyx_add_msvc_pch(lyx)
 

diff --git a/development/cmake/src/insets/CMakeLists.txt b/development/cmake/src/insets/CMakeLists.txt
index 380eebf68a302d252d847d033aa5d6f17eb1f417..c86faf58d0ed4036265c797c931a79cf21aa6931 100644 (file)
--- a/development/cmake/src/insets/CMakeLists.txt
+++ b/development/cmake/src/insets/CMakeLists.txt
@@ -13,7 +13,7 @@ list(REMOVE_ITEM insets_sources ${TOP_SRC_DIR}/src/insets/InsetTheorem.cpp)
 
 lyx_add_msvc_pch(insets)
 
-include_directories(${TOP_SRC_DIR}/src/insets ${QT_INCLUDES})
+include_directories(${TOP_SRC_DIR}/src/insets)
 
 
 if(NOT MERGE_FILES)

diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index 14c1c8417945edecbe773f8d26c089e7c409ff52..88c1792b693555d3b096d1918eef0d2bafaa6b81 100644 (file)
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -289,6 +289,7 @@ src_support_header_files = Split('''
     SignalSlot.h
     SignalSlotPrivate.h
     Systemcall.h
+    SystemcallPrivate.h
     Timeout.h
     Translator.h
     convert.h

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 4001cf8f15c5e9dc6f89c1fe8c77afb5936a33b7..8a374d511d42b9ff2ffa95dd42f0da8654ec2a64 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -12,7 +12,7 @@ BUILT_SOURCES = $(PCH_FILE)
 #########################  Qt stuff  #############################
 #
 
-MOCHEADER = SignalSlotPrivate.h Systemcall.h
+MOCHEADER = SignalSlotPrivate.h SystemcallPrivate.h
 
 MOCEDFILES = $(MOCHEADER:%.h=moc_%.cpp)
 

diff --git a/src/support/Systemcall.cpp b/src/support/Systemcall.cpp
index 058de000d895152f8e545eb630cfe0cbe0404d2a..e51fc169ca16350259b06a9070ec973b94492788 100644 (file)
--- a/src/support/Systemcall.cpp
+++ b/src/support/Systemcall.cpp
@@ -17,6 +17,7 @@
 #include "support/lstrings.h"
 #include "support/qstring_helpers.h"
 #include "support/Systemcall.h"
+#include "support/SystemcallPrivate.h"
 #include "support/os.h"
 
 #include <cstdlib>
@@ -206,7 +207,7 @@ void ConOut::stdErr()
        }
 }
 
-#include "moc_Systemcall.cpp"
+#include "moc_SystemcallPrivate.cpp"
 #endif
 
 } // namespace support

diff --git a/src/support/Systemcall.h b/src/support/Systemcall.h
index 2205ebc9b2a780fa62daa39058962a2abe0cd29d..61ba092a2dde0a3c93296de11a6650569faea15c 100644 (file)
--- a/src/support/Systemcall.h
+++ b/src/support/Systemcall.h
@@ -16,9 +16,6 @@
 #define SYSTEMCALL_H
 
 #include <string>
-#include <QObject>
-
-class QProcess;
 
 namespace lyx {
 namespace support {
@@ -48,48 +45,6 @@ public:
        int startscript(Starttype how, std::string const & what);
 };
 
-
-/**
- * Outputs to the console terminal the line buffered standard output and
- * error of a spawned process when there is a controlling terminal and 
- * stdout/stderr have not been redirected.
- */
-class ConOut : public QObject
-{
-       Q_OBJECT
-public:
-       ConOut(QProcess * proc);
-       ~ConOut();
-
-       /// Should the standard output be displayed?
-       void showout() { showout_ = true; }
-
-       /// Should the standard error be displayed?
-       void showerr() { showerr_ = true; }
-
-private:
-       /// Pointer to the process to monitor.
-       QProcess * proc_;
-       /// Index to the standard output buffer.
-       size_t outindex_;
-       /// Index to the standard error buffer.
-       size_t errindex_;
-       /// Size of buffers.
-       static size_t const bufsize_ = 200;
-       /// Standard output buffer.
-       char outdata_[bufsize_];
-       /// Standard error buffer.
-       char errdata_[bufsize_];
-       /// 
-       bool showout_;
-       /// 
-       bool showerr_;
-
-public Q_SLOTS:
-       void stdOut();
-       void stdErr();
-};
-
 } // namespace support
 } // namespace lyx
 

diff --git a/src/support/SystemcallPrivate.h b/src/support/SystemcallPrivate.h
new file mode 100644 (file)
index 0000000..93918ac
--- /dev/null
+++ b/src/support/SystemcallPrivate.h
@@ -0,0 +1,66 @@
+// -*- C++ -*-
+/**
+ * \file SystemcallPrivate.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Enrico Forestieri
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
+#ifndef SYSTEMCALLPRIVATE_H
+#define SYSTEMCALLPRIVATE_H
+
+#include <QObject>
+
+class QProcess;
+
+namespace lyx {
+namespace support {
+
+/**
+ * Outputs to the console terminal the line buffered standard output and
+ * error of a spawned process when there is a controlling terminal and 
+ * stdout/stderr have not been redirected.
+ */
+class ConOut : public QObject
+{
+       Q_OBJECT
+public:
+       ConOut(QProcess * proc);
+       ~ConOut();
+
+       /// Should the standard output be displayed?
+       void showout() { showout_ = true; }
+
+       /// Should the standard error be displayed?
+       void showerr() { showerr_ = true; }
+
+private:
+       /// Pointer to the process to monitor.
+       QProcess * proc_;
+       /// Index to the standard output buffer.
+       size_t outindex_;
+       /// Index to the standard error buffer.
+       size_t errindex_;
+       /// Size of buffers.
+       static size_t const bufsize_ = 200;
+       /// Standard output buffer.
+       char outdata_[bufsize_];
+       /// Standard error buffer.
+       char errdata_[bufsize_];
+       /// 
+       bool showout_;
+       /// 
+       bool showerr_;
+
+public Q_SLOTS:
+       void stdOut();
+       void stdErr();
+};
+
+} // namespace support
+} // namespace lyx
+
+#endif // SYSTEMCALLPRIVATE_H