Use TDE cmake macro to set version

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 57e74b846a)

CMakeLists.txt

@@ -0,0 +1,103 @@
+############################################
+#                                          #
+#  Improvements and feedbacks are welcome  #
+#                                          #
+#  This file is released under GPL >= 3    #
+#                                          #
+############################################
+
+
+cmake_minimum_required( VERSION 3.1 )
+
+
+#### general package setup
+
+project( tqscintilla )
+
+
+#### include essential cmake modules
+
+include( FindPkgConfig          )
+include( CheckFunctionExists    )
+include( CheckSymbolExists      )
+include( CheckIncludeFile       )
+include( CheckLibraryExists     )
+include( CheckCSourceCompiles   )
+include( CheckCXXSourceCompiles )
+include( GNUInstallDirs OPTIONAL )
+
+
+#### include our cmake modules
+
+include( TDEMacros )
+
+
+##### set version number ########################
+
+tde_set_project_version( )
+
+
+##### setup install paths
+
+if( CMAKE_INSTALL_LIBDIR )
+  tde_setup_install_path( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" )
+endif()
+tde_setup_install_path( HTML_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/lib${PROJECT_NAME}/HTML" )
+
+include( TDESetupPaths )
+tde_setup_paths( )
+
+
+##### optional stuff
+
+option( WITH_ALL_OPTIONS    "Enable all optional support" OFF )
+option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
+
+
+##### user requested modules
+
+option( BUILD_ALL          "Build all" ON )
+option( BUILD_PLUGIN       "Build qscintilla plugin" ${BUILD_ALL} )
+option( BUILD_DOC          "Build documentation"     ${BUILD_ALL} )
+
+
+##### configure checks 
+
+include( ConfigureChecks.cmake )
+
+
+###### global compiler settings 
+
+add_definitions( -DHAVE_CONFIG_H )
+
+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
+set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
+set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" )
+
+
+##### directories
+
+add_subdirectory( src )
+add_subdirectory( qt  )
+tde_conditional_add_subdirectory( BUILD_PLUGIN designer )
+tde_conditional_add_project_docs( BUILD_DOC )
+
+
+##### write configure files
+
+configure_file( config.h.cmake config.h @ONLY )
+
+
+# pkg-config
+
+set( prefix ${CMAKE_INSTALL_PREFIX} )
+string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_EXEC_PREFIX ${EXEC_INSTALL_PREFIX} )
+string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_INCLUDE_DIR ${TQT_INCLUDES_DIR}    )
+string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_LIB_DIR     ${LIB_INSTALL_DIR}     )
+
+configure_file( qscintilla.pc.cmake qscintilla.pc @ONLY )
+
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/qscintilla.pc
+    DESTINATION ${PKGCONFIG_INSTALL_DIR}
+)

ConfigureChecks.cmake

@@ -0,0 +1,60 @@
+###########################################
+#                                         #
+#  Improvements and feedback are welcome  #
+#                                         #
+#  This file is released under GPL >= 3   #
+#                                         #
+###########################################
+
+# required stuff
+find_package( TQt )
+
+tde_setup_architecture_flags( )
+
+include(TestBigEndian)
+test_big_endian(WORDS_BIGENDIAN)
+
+tde_setup_largefiles( )
+
+
+##### check for gcc visibility support
+
+if( WITH_GCC_VISIBILITY )
+  tde_setup_gcc_visibility( )
+endif( WITH_GCC_VISIBILITY )
+
+
+##### Look for tqt3 plugins location
+
+execute_process(
+    COMMAND ${PKG_CONFIG_EXECUTABLE} tqt-mt --variable=pluginsdir
+    OUTPUT_VARIABLE _pluginsdir
+    RESULT_VARIABLE _result
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+set( TQT_PLUGINS_DIR ${_pluginsdir} )
+message( STATUS "TQT plugins directory: ${TQT_PLUGINS_DIR}" )
+
+
+##### Look for tqt3 translations location
+
+execute_process(
+    COMMAND ${PKG_CONFIG_EXECUTABLE} tqt-mt --variable=translationsdir
+    OUTPUT_VARIABLE _translationsdir
+    RESULT_VARIABLE _result
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+set( TQT_TRANSLATIONS_DIR ${_translationsdir} )
+message( STATUS "TQT translation directory: ${TQT_TRANSLATIONS_DIR}" )
+
+
+##### Look for tqt3 includes location
+
+execute_process(
+    COMMAND ${PKG_CONFIG_EXECUTABLE} tqt-mt --variable=includedir
+    OUTPUT_VARIABLE _includedir
+    RESULT_VARIABLE _result
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+set( TQT_INCLUDES_DIR ${_includedir} )
+message( STATUS "TQT include directory: ${TQT_INCLUDES_DIR}" )

config.h.cmake

@@ -0,0 +1,8 @@
+#define VERSION "@VERSION@"
+
+// Defined if you have fvisibility and fvisibility-inlines-hidden support.
+#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#cmakedefine WORDS_BIGENDIAN @WORDS_BIGENDIAN@

designer/CMakeLists.txt

@@ -0,0 +1,24 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/qt
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### qscintillaplugin (shared)
+
+tde_add_library( qscintillaplugin SHARED
+
+  SOURCES
+        qscintillaplugin.cpp
+  LINK
+     qscintilla-shared
+
+  DESTINATION ${TQT_PLUGINS_DIR}/designer
+)

example/CMakeLists.txt

@@ -0,0 +1,24 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/qt
+  ${CMAKE_SOURCE_DIR}/src
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### app (executable)
+
+tde_add_executable( app AUTOMOC
+
+  SOURCES
+        application.cpp
+        main.cpp
+  LINK
+     qscintilla-shared
+)

example/application.cpp

@@ -18,7 +18,7 @@
 #include <tqmenubar.h>
 #include <tqfile.h>
 #include <tqfiledialog.h>
-#include <statusbar.h>
+#include <tqstatusbar.h>
 #include <tqmessagebox.h>
 #include <tqprinter.h>
 #include <tqapplication.h>
@@ -269,3 +269,5 @@ void ApplicationWindow::aboutTQt()
 {
     TQMessageBox::aboutTQt( this, "TQScintilla Application Example" );
 }
+
+#include "application.moc"

qscintilla.pc.cmake

@@ -0,0 +1,14 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=@PC_EXEC_PREFIX@
+libdir=@PC_LIB_DIR@
+includedir=@PC_INCLUDE_DIR@
+
+pkglibdir=${libdir}
+pkgincludedir=${includedir}
+
+Name: @PROJECT_NAME@
+Version: 1.7.1
+Description: @PROJECT_NAME@ is a source code editing library for TDE.
+
+Cflags: -I${includedir}
+Libs: -L${libdir} -lqscintilla

qt/CMakeLists.txt

@@ -0,0 +1,80 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/include
+  ${CMAKE_SOURCE_DIR}/src
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+add_definitions( -DQT )
+
+##### qscintilla (shared)
+
+tde_add_library( qscintilla SHARED AUTOMOC
+
+  SOURCES
+        qextscintilla.cpp
+        qextscintillaapis.cpp
+        qextscintillabase.cpp
+        qextscintillacommand.cpp
+        qextscintillacommandset.cpp
+        qextscintilladocument.cpp
+        qextscintillalexer.cpp
+        qextscintillalexerbash.cpp
+        qextscintillalexerbatch.cpp
+        qextscintillalexercpp.cpp
+        qextscintillalexercsharp.cpp
+        qextscintillalexercss.cpp
+        qextscintillalexerdiff.cpp
+        qextscintillalexerhtml.cpp
+        qextscintillalexeridl.cpp
+        qextscintillalexerjava.cpp
+        qextscintillalexerjavascript.cpp
+        qextscintillalexerlua.cpp
+        qextscintillalexermakefile.cpp
+        qextscintillalexerperl.cpp
+        qextscintillalexerpov.cpp
+        qextscintillalexerproperties.cpp
+        qextscintillalexerpython.cpp
+        qextscintillalexerruby.cpp
+        qextscintillalexersql.cpp
+        qextscintillalexertex.cpp
+        qextscintillamacro.cpp
+        qextscintillaprinter.cpp
+        SciListBox.cpp
+        PlatQt.cpp
+        ScintillaQt.cpp
+  LINK
+     ${TQT_LIBRARIES}
+     src-static
+
+  VERSION 7.0.1
+
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+
+###### other data
+# translations
+
+file( GLOB _translations RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} qscintilla_*.qm )
+
+install(
+    FILES ${_translations}
+    DESTINATION ${TQT_TRANSLATIONS_DIR}
+)
+
+
+# headers
+
+file( GLOB _includes RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} qextscintilla*.h )
+
+install(
+    FILES ${_includes}
+    DESTINATION ${TQT_INCLUDES_DIR}
+)

qt/PlatQt.cpp

@@ -19,6 +19,9 @@
 // TQScintilla; see the file LICENSE.  If not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -816,7 +819,7 @@ ColourDesired Platform::ChromeHighlight()
 
 const char *Platform::DefaultFont()
 {
-	return TQApplication::font().family();
+	return TQApplication::font().family().utf8();
 }
 
 int Platform::DefaultFontSize()

qt/SciListBox.cpp

@@ -20,6 +20,9 @@
 // TQScintilla; see the file LICENSE.  If not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <stdlib.h>
 #include <string.h>
@@ -326,3 +329,5 @@ void SciListBox::handleDoubleClick(TQListBoxItem *)
 	if (lbx && lbx -> cb_action)
 		lbx -> cb_action(lbx -> cb_data);
 }
+
+#include "SciListBox.moc"

qt/ScintillaQt.cpp

@@ -19,6 +19,9 @@
 // TQScintilla; see the file LICENSE.  If not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <tqapplication.h>
 #include <tqscrollbar.h>

qt/qextscintilla.cpp

@@ -21,6 +21,9 @@
 // TQScintilla; see the file LICENSE.  If not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <string.h>
 #include <tqapplication.h>
@@ -3029,3 +3032,5 @@ void QextScintilla::handleUserListSelection(const char *text, int id)
 {
     emit userListActivated(id, TQString(text));
 }
+
+#include "qextscintilla.moc"

qt/qextscintillaapis.cpp

@@ -19,6 +19,9 @@
 // TQScintilla; see the file LICENSE.  If not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <tqfile.h>
 #include <tqregexp.h>

qt/qextscintillabase.cpp

@@ -19,7 +19,11 @@
 // TQScintilla; see the file LICENSE.  If not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
+#include "qextscintillabase.moc"
 #include <tqapplication.h>
 #include <tqclipboard.h>
 #include <tqscrollbar.h>

qt/qextscintillacommand.cpp

@@ -19,6 +19,9 @@
 // TQScintilla; see the file LICENSE.  If not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <tqnamespace.h>
 #include <tqapplication.h>

qt/qextscintillacommandset.cpp

@@ -19,6 +19,9 @@
 // TQScintilla; see the file LICENSE.  If not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <tqsettings.h>
 

qt/qextscintilladocument.cpp

@@ -19,6 +19,9 @@
 // TQScintilla; see the file LICENSE.  If not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include "qextscintilladocument.h"
 #include "qextscintillabase.h"

qt/qextscintillaglobal.h

@@ -46,8 +46,10 @@
 
 #else
 
-#if __GNUC__ >= 4
+#if defined(__KDE_HAVE_GCC_VISIBILITY)
 #define TQEXTSCINTILLA_EXPORT __attribute__ ((visibility("default")))
+#else
+#define TQEXTSCINTILLA_EXPORT
 #endif
 
 #endif

qt/qextscintillalexer.cpp

@@ -19,6 +19,9 @@
 // TQScintilla; see the file LICENSE.  If not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <tqapplication.h>
 #include <tqcolor.h>
@@ -442,3 +445,5 @@ void QextScintillaLexer::setPaper(const TQColor &c,int style)
         emit paperChanged(c,QextScintillaBase::STYLE_DEFAULT);
     }
 }
+
+#include "qextscintillalexer.moc"

qt/qextscintillalexerbash.cpp

@@ -19,6 +19,9 @@
 // TQScintilla; see the file LICENSE.  If not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <tqcolor.h>
 #include <tqfont.h>
@@ -367,3 +370,5 @@ void QextScintillaLexerBash::setCompactProp()
 {
 	emit propertyChanged("fold.compact",(fold_compact ? "1" : "0"));
 }
+
+#include "qextscintillalexerbash.moc"

qt/qextscintillalexerbatch.cpp

@@ -19,6 +19,9 @@
 // TQScintilla; see the file LICENSE.  If not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <tqcolor.h>
 #include <tqfont.h>
@@ -196,3 +199,5 @@ TQColor QextScintillaLexerBatch::paper(int style) const
 
 	return QextScintillaLexer::paper(style);
 }
+
+#include "qextscintillalexerbatch.moc"

qt/qextscintillalexercpp.cpp

@@ -19,6 +19,9 @@
 // TQScintilla; see the file LICENSE.  If not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <tqcolor.h>
 #include <tqfont.h>
@@ -513,3 +516,5 @@ void QextScintillaLexerCPP::setStylePreprocProp()
 {
 	emit propertyChanged("style.within.preprocessor",(style_preproc ? "1" : "0"));
 }
+
+#include "qextscintillalexercpp.moc"

qt/qextscintillalexercsharp.cpp

@@ -19,6 +19,9 @@
 // TQScintilla; see the file LICENSE.  If not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <tqcolor.h>
 #include <tqfont.h>
@@ -116,3 +119,5 @@ TQColor QextScintillaLexerCSharp::paper(int style) const
 
 	return QextScintillaLexer::paper(style);
 }
+
+#include "qextscintillalexercsharp.moc"

qt/qextscintillalexercss.cpp

@@ -19,6 +19,9 @@
 // TQScintilla; see the file LICENSE.  If not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <tqcolor.h>
 #include <tqfont.h>
@@ -374,3 +377,5 @@ void QextScintillaLexerCSS::setCompactProp()
 {
 	emit propertyChanged("fold.compact",(fold_compact ? "1" : "0"));
 }
+
+#include "qextscintillalexercss.moc"

qt/qextscintillalexerdiff.cpp

@@ -19,6 +19,9 @@
 // TQScintilla; see the file LICENSE.  If not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <tqcolor.h>
 #include <tqfont.h>
@@ -121,3 +124,5 @@ TQString QextScintillaLexerDiff::description(int style) const
 
 	return TQString();
 }
+
+#include "qextscintillalexerdiff.moc"

qt/qextscintillalexerhtml.cpp

@@ -19,6 +19,9 @@
 // TQScintilla; see the file LICENSE.  If not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <tqcolor.h>
 #include <tqfont.h>
@@ -1130,3 +1133,5 @@ void QextScintillaLexerHTML::setPreprocProp()
 {
 	emit propertyChanged("fold.html.preprocessor",(fold_preproc ? "1" : "0"));
 }
+
+#include "qextscintillalexerhtml.moc"

qt/qextscintillalexeridl.cpp

@@ -19,6 +19,9 @@
 // TQScintilla; see the file LICENSE.  If not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <tqcolor.h>
 #include <tqfont.h>
@@ -100,3 +103,5 @@ TQString QextScintillaLexerIDL::description(int style) const
 
 	return QextScintillaLexerCPP::description(style);
 }
+
+#include "qextscintillalexeridl.moc"

qt/qextscintillalexerjava.cpp

@@ -19,6 +19,9 @@
 // TQScintilla; see the file LICENSE.  If not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include "qextscintillalexerjava.h"
 
@@ -57,3 +60,5 @@ const char *QextScintillaLexerJava::keywords(int set) const
 	       "super switch synchronized this throw throws transient try var "
 	       "void volatile while";
 }
+
+#include "qextscintillalexerjava.moc"

qt/qextscintillalexerjavascript.cpp

@@ -19,6 +19,9 @@
 // TQScintilla; see the file LICENSE.  If not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <tqcolor.h>
 #include <tqfont.h>
@@ -118,3 +121,5 @@ TQColor QextScintillaLexerJavaScript::paper(int style) const
 
 	return QextScintillaLexer::paper(style);
 }
+
+#include "qextscintillalexerjavascript.moc"

qt/qextscintillalexerlua.cpp

@@ -19,6 +19,9 @@
 // TQScintilla; see the file LICENSE.  If not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <tqcolor.h>
 #include <tqfont.h>
@@ -344,3 +347,5 @@ void QextScintillaLexerLua::setCompactProp()
 {
 	emit propertyChanged("fold.compact",(fold_compact ? "1" : "0"));
 }
+
+#include "qextscintillalexerlua.moc"

qt/qextscintillalexermakefile.cpp

@@ -19,6 +19,9 @@
 // TQScintilla; see the file LICENSE.  If not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <tqcolor.h>
 #include <tqfont.h>
@@ -154,3 +157,5 @@ TQColor QextScintillaLexerMakefile::paper(int style) const
 
 	return QextScintillaLexer::paper(style);
 }
+
+#include "qextscintillalexermakefile.moc"

qt/qextscintillalexerperl.cpp

@@ -19,6 +19,9 @@
 // TQScintilla; see the file LICENSE.  If not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <tqcolor.h>
 #include <tqfont.h>
@@ -480,3 +483,5 @@ void QextScintillaLexerPerl::setCompactProp()
 {
 	emit propertyChanged("fold.compact",(fold_compact ? "1" : "0"));
 }
+
+#include "qextscintillalexerperl.moc"

qt/qextscintillalexerpov.cpp

@@ -19,6 +19,9 @@
 // TQScintilla; see the file LICENSE.  If not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <tqcolor.h>
 #include <tqfont.h>
@@ -486,3 +489,5 @@ void QextScintillaLexerPOV::setDirectiveProp()
 {
 	emit propertyChanged("fold.directive",(fold_directives ? "1" : "0"));
 }
+
+#include "qextscintillalexerpov.moc"

qt/qextscintillalexerproperties.cpp

@@ -19,6 +19,9 @@
 // TQScintilla; see the file LICENSE.  If not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <tqcolor.h>
 #include <tqfont.h>
@@ -202,3 +205,5 @@ void QextScintillaLexerProperties::setCompactProp()
 {
 	emit propertyChanged("fold.compact",(fold_compact ? "1" : "0"));
 }
+
+#include "qextscintillalexerproperties.moc"

qt/qextscintillalexerpython.cpp

@@ -19,6 +19,9 @@
 // TQScintilla; see the file LICENSE.  If not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <tqcolor.h>
 #include <tqfont.h>
@@ -403,5 +406,7 @@ void QextScintillaLexerPython::setIndentationWarning(IndentationWarning warn)
 // Set the "tab.timmy.whinge.level" property.
 void QextScintillaLexerPython::setTabWhingeProp()
 {
-	emit propertyChanged("tab.timmy.whinge.level",TQString::number(indent_warn));
+	emit propertyChanged("tab.timmy.whinge.level",TQString::number(indent_warn).latin1());
 }
+
+#include "qextscintillalexerpython.moc"

qt/qextscintillalexerruby.cpp

@@ -19,6 +19,9 @@
 // TQScintilla; see the file LICENSE.  If not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <tqcolor.h>
 #include <tqfont.h>
@@ -378,3 +381,5 @@ TQColor QextScintillaLexerRuby::paper(int style) const
 
 	return QextScintillaLexer::paper(style);
 }
+
+#include "qextscintillalexerruby.moc"

qt/qextscintillalexersql.cpp

@@ -19,6 +19,9 @@
 // TQScintilla; see the file LICENSE.  If not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <tqcolor.h>
 #include <tqfont.h>
@@ -450,3 +453,5 @@ void QextScintillaLexerSQL::setBackslashEscapesProp()
 {
 	emit propertyChanged("sql.backslash.escapes",(backslash_escapes ? "1" : "0"));
 }
+
+#include "qextscintillalexersql.moc"

qt/qextscintillalexertex.cpp

@@ -19,6 +19,9 @@
 // TQScintilla; see the file LICENSE.  If not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <tqcolor.h>
 #include <tqfont.h>
@@ -204,3 +207,5 @@ TQString QextScintillaLexerTeX::description(int style) const
 
 	return TQString();
 }
+
+#include "qextscintillalexertex.moc"

qt/qextscintillamacro.cpp

@@ -19,6 +19,9 @@
 // TQScintilla; see the file LICENSE.  If not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <string.h>
 
@@ -327,3 +330,5 @@ static int fromHex(unsigned char ch)
 
 	return -1;
 }
+
+#include "qextscintillamacro.moc"

qt/qextscintillaprinter.cpp

@@ -19,6 +19,9 @@
 // TQScintilla; see the file LICENSE.  If not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <tqprinter.h>
 #include <tqpainter.h>

src/CMakeLists.txt

@@ -0,0 +1,102 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/include
+  ${CMAKE_SOURCE_DIR}/src
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+add_definitions( -DQT -DSCI_LEXER )
+
+
+##### src (static)
+
+tde_add_library( src STATIC_PIC
+
+  SOURCES
+        AutoComplete.cpp
+        CallTip.cpp
+        CellBuffer.cpp
+        ContractionState.cpp
+        CharClassify.cpp
+        Document.cpp
+        DocumentAccessor.cpp
+        Editor.cpp
+        ExternalLexer.cpp
+        Indicator.cpp
+        KeyMap.cpp
+        KeyWords.cpp
+        LexAPDL.cpp
+        LexAU3.cpp
+        LexAVE.cpp
+        LexAda.cpp
+        LexAsm.cpp
+        LexAsn1.cpp
+        LexBaan.cpp
+        LexBash.cpp
+        LexBasic.cpp
+        LexBullant.cpp
+        LexCLW.cpp
+        LexCPP.cpp
+        LexCSS.cpp
+        LexCaml.cpp
+        LexConf.cpp
+        LexCrontab.cpp
+        LexCsound.cpp
+        LexEScript.cpp
+        LexEiffel.cpp
+        LexErlang.cpp
+        LexFlagship.cpp
+        LexForth.cpp
+        LexFortran.cpp
+        LexGui4Cli.cpp
+        LexHTML.cpp
+        LexHaskell.cpp
+        LexInno.cpp
+        LexKix.cpp
+        LexLisp.cpp
+        LexLout.cpp
+        LexLua.cpp
+        LexMMIXAL.cpp
+        LexMPT.cpp
+        LexMSSQL.cpp
+        LexMatlab.cpp
+        LexMetapost.cpp
+        LexNsis.cpp
+        LexOpal.cpp
+        LexOthers.cpp
+        LexPB.cpp
+        LexPOV.cpp
+        LexPS.cpp
+        LexPascal.cpp
+        LexPerl.cpp
+        LexPython.cpp
+        LexRebol.cpp
+        LexRuby.cpp
+        LexSQL.cpp
+        LexScriptol.cpp
+        LexSmalltalk.cpp
+        LexSpecman.cpp
+        LexSpice.cpp
+        LexTADS3.cpp
+        LexTCL.cpp
+        LexTeX.cpp
+        LexVB.cpp
+        LexVHDL.cpp
+        LexVerilog.cpp
+        LexYAML.cpp
+        LineMarker.cpp
+        PropSet.cpp
+        RESearch.cpp
+        ScintillaBase.cpp
+        Style.cpp
+        StyleContext.cpp
+        ViewStyle.cpp
+        WindowAccessor.cpp
+        XPM.cpp
+)

src/Editor.cpp

@@ -1246,7 +1246,7 @@ void Editor::EnsureCaretVisible(bool useMargin, bool vert, bool horiz) {
 	int lineCaret = DisplayFromPosition(posCaret);
 	bool bSlop, bStrict, bJump, bEven;
 
-	//Qt::Vertical positioning
+	// Vertical positioning
 	if (vert && (pt.y < rcClient.top || ptBottomCaret.y > rcClient.bottom || (caretYPolicy & CARET_STRICT) != 0)) {
 		int linesOnScreen = LinesOnScreen();
 		int halfScreen = Platform::Maximum(linesOnScreen - 1, 2) / 2;
@@ -1340,7 +1340,7 @@ void Editor::EnsureCaretVisible(bool useMargin, bool vert, bool horiz) {
 		}
 	}
 
-	//Qt::Horizontal positioning
+	// Horizontal positioning
 	if (horiz && (wrapState == eWrapNone)) {
 		int halfScreen = Platform::Maximum(rcClient.Width() - 4, 4) / 2;
 		int xOffsetNew = xOffset;