diff options
| -rw-r--r-- | ConfigureChecks.cmake | 2 | ||||
| -rw-r--r-- | qtinterface/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | qtinterface/interface_tqt3/_tqdummy_.h | 0 | ||||
| -rw-r--r-- | qtinterface/interface_tqt3/tqapplication.cpp | 23 | ||||
| -rw-r--r-- | qtinterface/interface_tqt3/tqapplication.h | 34 | ||||
| -rw-r--r-- | qtinterface/interface_tqt3/tqconfig.h | 28 | ||||
| -rw-r--r-- | qtinterface/interface_tqt3/tqmodules.h | 28 |
7 files changed, 3 insertions, 116 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index a389b5c..94d85c4 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -81,7 +81,7 @@ set( CMAKE_REQUIRED_LIBRARIES -L${TQT_LIBRARY_DIR} ${TQT_LIBRARIES} ) qt_message( "Looking for native TQt3..." ) check_cxx_source_compiles(" - #include <ntqapplication.h> + #include <tqapplication.h> int main(int argc, char **argv) { TQApplication app(argc, argv); return 0; } " HAVE_USABLE_QT) if( NOT HAVE_USABLE_QT ) diff --git a/qtinterface/CMakeLists.txt b/qtinterface/CMakeLists.txt index d029e71..169b642 100644 --- a/qtinterface/CMakeLists.txt +++ b/qtinterface/CMakeLists.txt @@ -30,9 +30,7 @@ link_directories( ##### headers ################################### install( FILES - ${IFACE}/tqapplication.h - ${IFACE}/tqconfig.h - ${IFACE}/tqmodules.h + ${IFACE}/_tqdummy_.h DESTINATION ${INCLUDE_INSTALL_DIR} ) ##### tqt pkgconfig ############################# diff --git a/qtinterface/interface_tqt3/_tqdummy_.h b/qtinterface/interface_tqt3/_tqdummy_.h new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/qtinterface/interface_tqt3/_tqdummy_.h diff --git a/qtinterface/interface_tqt3/tqapplication.cpp b/qtinterface/interface_tqt3/tqapplication.cpp index c313897..251f1b2 100644 --- a/qtinterface/interface_tqt3/tqapplication.cpp +++ b/qtinterface/interface_tqt3/tqapplication.cpp @@ -19,25 +19,4 @@ Boston, MA 02110-1301, USA. */ -#include <tqt.h> -#include <ntqapplication.h> -#include <X11/X.h> - -extern Time tqt_x_time; -extern Time tqt_x_user_time; - -void set_tqt_x_time(unsigned long x) { - tqt_x_time = x; -} - -unsigned long get_tqt_x_time(void) { - return tqt_x_time; -} - -void set_tqt_x_user_time(unsigned long x) { - tqt_x_user_time = x; -} - -unsigned long get_tqt_x_user_time(void) { - return tqt_x_user_time; -} +#include <tqapplication.h> diff --git a/qtinterface/interface_tqt3/tqapplication.h b/qtinterface/interface_tqt3/tqapplication.h deleted file mode 100644 index ca5357a..0000000 --- a/qtinterface/interface_tqt3/tqapplication.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - -Copyright (C) 2010 Timothy Pearson <[email protected]> - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public -License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public License -along with this library; see the file COPYING.LIB. If not, write to -the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. - -*/ - -#ifndef TQT_TQAPPLICATION_H -#define TQT_TQAPPLICATION_H - -#include <tqt.h> -#include <ntqapplication.h> - -// X11/X.h defines Time as unsigned long -void set_tqt_x_time(unsigned long x); -unsigned long get_tqt_x_time(void); -void set_tqt_x_user_time(unsigned long x); -unsigned long get_tqt_x_user_time(void); - -#endif /* TQT_TQAPPLICATION_H */ diff --git a/qtinterface/interface_tqt3/tqconfig.h b/qtinterface/interface_tqt3/tqconfig.h deleted file mode 100644 index 6f2e51b..0000000 --- a/qtinterface/interface_tqt3/tqconfig.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - -Copyright (C) 2010 Timothy Pearson <[email protected]> - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public -License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public License -along with this library; see the file COPYING.LIB. If not, write to -the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. - -*/ - -#ifndef TQT_TQCONFIG_H -#define TQT_TQCONFIG_H - -#include <tqt.h> -#include <ntqconfig.h> - -#endif /* TQT_TQCONFIG_H */ diff --git a/qtinterface/interface_tqt3/tqmodules.h b/qtinterface/interface_tqt3/tqmodules.h deleted file mode 100644 index 01706d7..0000000 --- a/qtinterface/interface_tqt3/tqmodules.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - -Copyright (C) 2010 Timothy Pearson <[email protected]> - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public -License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public License -along with this library; see the file COPYING.LIB. If not, write to -the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. - -*/ - -#ifndef TQT_TQMODULES_H -#define TQT_TQMODULES_H - -#include <tqt.h> -#include <ntqmodules.h> - -#endif /* TQT_TQMODULES_H */ |