Browse Source

conversion to the cmake building system

Signed-off-by: gregory guy <g-gregory@gmx.fr>
pull/1/head
gregory guy 3 years ago
parent
commit
6b2ab74c0b
No known key found for this signature in database
GPG Key ID: 6EFE0EF249A874C0
  1. 80
      CMakeLists.txt
  2. 51
      ConfigureChecks.cmake
  3. 11
      config.h.cmake
  4. 1
      doc/CMakeLists.txt
  5. 1
      doc/en/CMakeLists.txt
  6. 5
      man/CMakeLists.txt
  7. 5
      po/CMakeLists.txt
  8. 128
      src/CMakeLists.txt
  9. 8
      src/comment.cpp
  10. 2
      src/comment.h
  11. 12
      src/commentwidget.cpp
  12. 6
      src/commentwidget.h
  13. 58
      src/documentlistview.cpp
  14. 6
      src/documentlistview.h
  15. 8
      src/documentlistviewitem.cpp
  16. 2
      src/documentlistviewitem.h
  17. 12
      src/documentsourceview.cpp
  18. 4
      src/documentsourceview.h
  19. 92
      src/documentwidget.cpp
  20. 8
      src/documentwidget.h
  21. 4
      src/element.cpp
  22. 4
      src/element.h
  23. 2
      src/encoder.h
  24. 6
      src/encoderlatex.cpp
  25. 8
      src/encoderlatex.h
  26. 2
      src/encoderxml.cpp
  27. 6
      src/encoderxml.h
  28. 16
      src/entry.cpp
  29. 8
      src/entry.h
  30. 4
      src/entryfield.h
  31. 60
      src/entrywidget.cpp
  32. 14
      src/entrywidget.h
  33. 8
      src/entrywidgetauthor.cpp
  34. 2
      src/entrywidgetauthor.h
  35. 10
      src/entrywidgetexternal.cpp
  36. 2
      src/entrywidgetexternal.h
  37. 14
      src/entrywidgetkeyword.cpp
  38. 2
      src/entrywidgetkeyword.h
  39. 10
      src/entrywidgetmisc.cpp
  40. 2
      src/entrywidgetmisc.h
  41. 14
      src/entrywidgetother.cpp
  42. 2
      src/entrywidgetother.h
  43. 18
      src/entrywidgetpublication.cpp
  44. 2
      src/entrywidgetpublication.h
  45. 14
      src/entrywidgetsource.cpp
  46. 2
      src/entrywidgetsource.h
  47. 6
      src/entrywidgettab.cpp
  48. 6
      src/entrywidgettab.h
  49. 10
      src/entrywidgettitle.cpp
  50. 2
      src/entrywidgettitle.h
  51. 6
      src/entrywidgetuserdefined.cpp
  52. 2
      src/entrywidgetuserdefined.h
  53. 2
      src/entrywidgetwarningsitem.h
  54. 20
      src/fieldlineedit.cpp
  55. 6
      src/fieldlineedit.h
  56. 24
      src/fieldlistview.cpp
  57. 6
      src/fieldlistview.h
  58. 26
      src/file.cpp
  59. 6
      src/file.h
  60. 6
      src/fileexporter.h
  61. 16
      src/fileexporterbibtex.cpp
  62. 6
      src/fileexporterbibtex.h
  63. 18
      src/fileexporterbibutils.cpp
  64. 2
      src/fileexporterbibutils.h
  65. 8
      src/fileexporterdocbook5.cpp
  66. 2
      src/fileexporterdocbook5.h
  67. 12
      src/fileexporterexternal.cpp
  68. 4
      src/fileexporterexternal.h
  69. 16
      src/fileexporterpdf.cpp
  70. 2
      src/fileexporterpdf.h
  71. 10
      src/fileexporterps.cpp
  72. 2
      src/fileexporterps.h
  73. 4
      src/fileexporterris.cpp
  74. 2
      src/fileexporterris.h
  75. 10
      src/fileexporterrtf.cpp
  76. 2
      src/fileexporterrtf.h
  77. 8
      src/fileexportertoolchain.cpp
  78. 2
      src/fileexportertoolchain.h
  79. 18
      src/fileexporterxml.cpp
  80. 6
      src/fileexporterxml.h
  81. 6
      src/fileexporterxslt.cpp
  82. 2
      src/fileexporterxslt.h
  83. 2
      src/fileimporter.cpp
  84. 4
      src/fileimporter.h
  85. 24
      src/fileimporterbibtex.cpp
  86. 4
      src/fileimporterbibtex.h
  87. 20
      src/fileimporterbibutils.cpp
  88. 6
      src/fileimporterbibutils.h
  89. 10
      src/fileimporterexternal.cpp
  90. 6
      src/fileimporterexternal.h
  91. 8
      src/fileimporterris.cpp
  92. 4
      src/fileimporterris.h
  93. 18
      src/findduplicates.cpp
  94. 2
      src/findduplicates.h
  95. 10
      src/idsuggestions.cpp
  96. 6
      src/idsuggestions.h
  97. 18
      src/idsuggestionswidget.cpp
  98. 4
      src/idsuggestionswidget.h
  99. 2
      src/iso5426converter.cpp
  100. 2
      src/iso5426converter.h
  101. 2
      src/iso6937converter.cpp
  102. 42
      src/kbibtex_part.cpp
  103. 8
      src/kbibtex_part.h
  104. 4
      src/kbibtexshell.cpp
  105. 2
      src/latin1literal.h
  106. 4
      src/macro.cpp
  107. 6
      src/macro.h
  108. 12
      src/macrowidget.cpp
  109. 6
      src/macrowidget.h
  110. 4
      src/main.cpp
  111. 24
      src/mergeelements.cpp
  112. 6
      src/mergeelements.h
  113. 4
      src/preamble.cpp
  114. 2
      src/preamble.h
  115. 4
      src/preamblewidget.cpp
  116. 8
      src/preamblewidget.h
  117. 14
      src/searchbar.cpp
  118. 6
      src/searchbar.h
  119. 26
      src/settings.cpp
  120. 14
      src/settings.h
  121. 16
      src/settingsdlg.cpp
  122. 24
      src/settingsediting.cpp
  123. 2
      src/settingsediting.h
  124. 26
      src/settingsfileio.cpp
  125. 2
      src/settingsfileio.h
  126. 22
      src/settingsidsuggestions.cpp
  127. 4
      src/settingsidsuggestions.h
  128. 20
      src/settingskeyword.cpp
  129. 2
      src/settingskeyword.h
  130. 14
      src/settingssearchurl.cpp
  131. 2
      src/settingssearchurl.h
  132. 12
      src/settingsuserdefinedinput.cpp
  133. 2
      src/settingsuserdefinedinput.h
  134. 12
      src/settingsz3950.cpp
  135. 4
      src/settingsz3950.h
  136. 18
      src/sidebar.cpp
  137. 8
      src/sidebar.h
  138. 6
      src/value.cpp
  139. 2
      src/value.h
  140. 14
      src/valuewidget.cpp
  141. 8
      src/valuewidget.h
  142. 60
      src/webquery.cpp
  143. 4
      src/webquery.h
  144. 12
      src/webqueryamatex.cpp
  145. 2
      src/webqueryamatex.h
  146. 12
      src/webqueryarxiv.cpp
  147. 10
      src/webqueryarxiv.h
  148. 14
      src/webquerybibsonomy.cpp
  149. 2
      src/webquerybibsonomy.h
  150. 12
      src/webquerycitebase.cpp
  151. 2
      src/webquerycitebase.h
  152. 14
      src/webqueryciteseerx.cpp
  153. 8
      src/webqueryciteseerx.h
  154. 22
      src/webquerycsb.cpp
  155. 4
      src/webquerycsb.h
  156. 18
      src/webquerydblp.cpp
  157. 2
      src/webquerydblp.h
  158. 14
      src/webquerygooglescholar.cpp
  159. 8
      src/webquerygooglescholar.h
  160. 12
      src/webqueryieeexplore.cpp
  161. 6
      src/webqueryieeexplore.h
  162. 10
      src/webquerymathscinet.cpp
  163. 2
      src/webquerymathscinet.h
  164. 22
      src/webquerypubmed.cpp
  165. 8
      src/webquerypubmed.h
  166. 14
      src/webquerysciencedirect.cpp
  167. 4
      src/webquerysciencedirect.h
  168. 14
      src/webqueryspireshep.cpp
  169. 2
      src/webqueryspireshep.h
  170. 14
      src/webqueryz3950.cpp
  171. 14
      src/webqueryz3950.h
  172. 10
      src/webqueryzmath.cpp
  173. 2
      src/webqueryzmath.h
  174. 4
      src/xsltransform.cpp
  175. 4
      src/z3950connection.cpp
  176. 6
      src/z3950connection.h
  177. 6
      xslt/CMakeLists.txt

80
CMakeLists.txt

@ -0,0 +1,80 @@
############################################
# #
# Improvements and feedbacks are welcome #
# #
# This file is released under GPL >= 3 #
# #
############################################
cmake_minimum_required( VERSION 2.8 )
#### general package setup
project( kbibtex )
set( VERSION R14.1.0 )
#### include essential cmake modules
include( FindPkgConfig )
include( CheckFunctionExists )
include( CheckSymbolExists )
include( CheckIncludeFile )
include( CheckLibraryExists )
include( CheckCSourceCompiles )
include( CheckCXXSourceCompiles )
#### include our cmake modules
set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
include( TDEMacros )
##### setup install paths
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_DOC "Build documentation" ${BUILD_ALL} )
option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} )
##### configure checks
include( ConfigureChecks.cmake )
###### global compiler settings
add_definitions( -DHAVE_CONFIG_H -UTQT_NO_ASCII_CAST )
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( xslt )
tde_conditional_add_subdirectory( BUILD_DOC doc )
tde_conditional_add_subdirectory( BUILD_DOC man )
tde_conditional_add_subdirectory( BUILD_TRANSLATIONS po )
##### write configure files
configure_file( config.h.cmake config.h @ONLY )

51
ConfigureChecks.cmake

@ -0,0 +1,51 @@
###########################################
# #
# Improvements and feedback are welcome #
# #
# This file is released under GPL >= 3 #
# #
###########################################
# required stuff
find_package( TQt )
find_package( TDE )
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 )
##### check for libxml-2.0
find_package( LibXml2 )
if( NOT LIBXML2_FOUND )
tde_message_fatal( "libxml-2.0 is required, but was not found on your system" )
endif( NOT LIBXML2_FOUND )
##### check for libxslt
find_package( LibXslt )
if( NOT LIBXSLT_FOUND )
tde_message_fatal( "libxslt is required, but was not found on your system" )
endif( NOT LIBXSLT_FOUND )
##### check for libyaz
pkg_search_module( LIBYAZ libyaz yaz )
if( LIBYAZ_FOUND )
set( HAVE_YAZ 1 )
else()
tde_message_fatal( "libyaz is required, but was not found on your system" )
endif( )

11
config.h.cmake

@ -0,0 +1,11 @@
#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@
// Defined if you have libyaz
#cmakedefine HAVE_YAZ 1

1
doc/CMakeLists.txt

@ -0,0 +1 @@
add_subdirectory( en )

1
doc/en/CMakeLists.txt

@ -0,0 +1 @@
tde_create_handbook( DESTINATION ${PROJECT_NAME} )

5
man/CMakeLists.txt

@ -0,0 +1,5 @@
INSTALL(
FILES ${PROJECT_NAME}.1
DESTINATION ${MAN_INSTALL_DIR}/man1
COMPONENT doc
)

5
po/CMakeLists.txt

@ -0,0 +1,5 @@
file( GLOB _srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po )
if( _srcs )
tde_create_translation( LANG auto OUTPUT_NAME ${PROJECT_NAME} )
endif( )

128
src/CMakeLists.txt

@ -0,0 +1,128 @@
include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${LIBXML2_INCLUDE_DIR}
${LIBXSLT_INCLUDE_DIR}
${LIBYAZ_INCLUDE_DIRS}
)
link_directories(
${TQT_LIBRARY_DIRS}
${TDE_LIB_DIR}
${LIBXML2_LIB_DIR}
${LIBXSLT_LIB_DIR}
${LIBYAZ_LIBRARY_DIRS}
)
##### kbibtex (executable)
tde_add_executable( ${PROJECT_NAME} AUTOMOC
SOURCES
kbibtexshell.cpp
main.cpp
LINK
tdecore-shared
tdeio-shared
tdeui-shared
tdeparts-shared
DESTINATION ${BIN_INSTALL_DIR}
)
##### libkbibtexpart (kpart)
tde_add_kpart( libkbibtexpart AUTOMOC
SOURCES
comment.cpp fileexporterdocbook5.cpp
commentwidget.cpp documentlistview.cpp
documentlistviewitem.cpp documentsourceview.cpp
documentwidget.cpp element.cpp
encoder.cpp encoderlatex.cpp
encoderxml.cpp entry.cpp
entryfield.cpp entrywidget.cpp
entrywidgetauthor.cpp entrywidgetexternal.cpp
entrywidgetkeyword.cpp entrywidgetmisc.cpp
entrywidgetother.cpp entrywidgetpublication.cpp
entrywidgetsource.cpp entrywidgettab.cpp
entrywidgettitle.cpp entrywidgetuserdefined.cpp
entrywidgetwarningsitem.cpp z3950connection.cpp
fieldlineedit.cpp fieldlistview.cpp
file.cpp fileexporter.cpp
fileexporterbibtex.cpp fileexporterris.cpp
fileexporterbibutils.cpp fileexporterexternal.cpp
fileexporterpdf.cpp fileexporterps.cpp
fileexporterrtf.cpp fileexportertoolchain.cpp
fileexporterxml.cpp fileexporterxslt.cpp
fileimporter.cpp fileimporterbibtex.cpp
fileimporterbibutils.cpp fileimporterexternal.cpp
fileimporterris.cpp idsuggestions.cpp
idsuggestionswidget.cpp kbibtex_part.cpp
macrowidget.cpp macro.cpp
mergeelements.cpp preamble.cpp
webqueryieeexplore.cpp preamblewidget.cpp
searchbar.cpp settings.cpp
settingsdlg.cpp settingsediting.cpp
settingsfileio.cpp settingsidsuggestions.cpp
settingskeyword.cpp settingssearchurl.cpp
settingsuserdefinedinput.cpp sidebar.cpp value.cpp
valuewidget.cpp webquery.cpp
webqueryamatex.cpp webqueryarxiv.cpp
webqueryciteseerx.cpp webquerybibsonomy.cpp
webquerycsb.cpp webquerycitebase.cpp
webquerydblp.cpp webqueryz3950.cpp
webquerygooglescholar.cpp webquerypubmed.cpp
webqueryspireshep.cpp webqueryzmath.cpp
xsltransform.cpp webquerysciencedirect.cpp
findduplicates.cpp settingsz3950.cpp
messagehandler.cpp iso6937converter.cpp
iso5426converter.cpp webquerymathscinet.cpp
LINK
tdecore-shared
tdeio-shared
tdeui-shared
tdeparts-shared
tdeutils-shared
katepartinterfaces-shared
tdetexteditor
${LIBXML2_LIBRARIES}
${LIBXSLT_LIBRARIES}
${LIBXSLT_EXSLT_LIBRARIES}
${LIBYAZ_LIBRARIES}
DESTINATION ${PLUGIN_INSTALL_DIR}
)
##### icons
tde_install_icons( )
##### other data
install(
FILES z3950-servers.cfg kbibtex_shell.rc
DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}
)
install(
FILES kbibtex_part.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
)
install(
FILES ${PROJECT_NAME}.desktop
DESTINATION ${XDG_APPS_INSTALL_DIR}
)
install(
FILES kbibtex_part.rc
DESTINATION ${DATA_INSTALL_DIR}/kbibtexpart
)

8
src/comment.cpp

@ -17,11 +17,11 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include <ntqregexp.h>
#include <ntqstringlist.h>
#include <tqregexp.h>
#include <tqstringlist.h>
#include <comment.h>
#include <xsltransform.h>
#include "comment.h"
#include "xsltransform.h"
namespace BibTeX
{

2
src/comment.h

@ -20,7 +20,7 @@
#ifndef BIBTEXCOMMENT_H
#define BIBTEXCOMMENT_H
#include <element.h>
#include "element.h"
namespace BibTeX
{

12
src/commentwidget.cpp

@ -17,17 +17,17 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include <ntqlabel.h>
#include <ntqmultilineedit.h>
#include <ntqlayout.h>
#include <ntqcheckbox.h>
#include <tqlabel.h>
#include <tqmultilineedit.h>
#include <tqlayout.h>
#include <tqcheckbox.h>
#include <kdialogbase.h>
#include <tdeglobalsettings.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <comment.h>
#include <element.h>
#include "comment.h"
#include "element.h"
#include "commentwidget.h"

6
src/commentwidget.h

@ -20,10 +20,10 @@
#ifndef COMMENTWIDGET_H
#define COMMENTWIDGET_H
#include <ntqwidget.h>
#include <ntqdialog.h>
#include <tqwidget.h>
#include <tqdialog.h>
#include <comment.h>
#include "comment.h"
class TQMultiLineEdit;
class TQCheckBox;

58
src/documentlistview.cpp

@ -21,17 +21,17 @@
#include <config.h>
#endif
#include <ntqevent.h>
#include <ntqdragobject.h>
#include <ntqfile.h>
#include <ntqvaluelist.h>
#include <ntqcursor.h>
#include <ntqbuffer.h>
#include <ntqlistview.h>
#include <ntqclipboard.h>
#include <ntqheader.h>
#include <ntqtextstream.h>
#include <ntqtimer.h>
#include <tqevent.h>
#include <tqdragobject.h>
#include <tqfile.h>
#include <tqvaluelist.h>
#include <tqcursor.h>
#include <tqbuffer.h>
#include <tqlistview.h>
#include <tqclipboard.h>
#include <tqheader.h>
#include <tqtextstream.h>
#include <tqtimer.h>
#include <tdeapplication.h>
#include <tdeio/netaccess.h>
@ -46,24 +46,24 @@
#include <kprogress.h>
#include <kiconloader.h>
#include <kbibtex_part.h>
#include <documentlistviewitem.h>
#include <file.h>
#include <fileimporterbibutils.h>
#include <fileimporterris.h>
#include <fileimporterbibtex.h>
#include <fileexporterbibtex.h>
#include <element.h>
#include <entry.h>
#include <macro.h>
#include <comment.h>
#include <preamblewidget.h>
#include <preamble.h>
#include <entrywidget.h>
#include <commentwidget.h>
#include <macrowidget.h>
#include <settings.h>
#include <encoderlatex.h>
#include "kbibtex_part.h"
#include "documentlistviewitem.h"
#include "file.h"
#include "fileimporterbibutils.h"
#include "fileimporterris.h"
#include "fileimporterbibtex.h"
#include "fileexporterbibtex.h"
#include "element.h"
#include "entry.h"
#include "macro.h"
#include "comment.h"
#include "preamblewidget.h"
#include "preamble.h"
#include "entrywidget.h"
#include "commentwidget.h"
#include "macrowidget.h"
#include "settings.h"
#include "encoderlatex.h"
#include "documentlistview.h"

6
src/documentlistview.h

@ -23,9 +23,9 @@
#include <tdelistview.h>
#include <kxmlguifactory.h>
#include <fileimporter.h>
#include <settings.h>
#include <file.h>
#include "fileimporter.h"
#include "settings.h"
#include "file.h"
class TQString;
class KURL;

8
src/documentlistviewitem.cpp

@ -17,16 +17,16 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include <ntqlistview.h>
#include <ntqpainter.h>
#include <ntqpen.h>
#include <tqlistview.h>
#include <tqpainter.h>
#include <tqpen.h>
#include <tdelocale.h>
#include "documentlistviewitem.h"
#include "entry.h"
#include "comment.h"
#include <preamble.h>
#include "preamble.h"
#include "macro.h"
namespace KBibTeX

2
src/documentlistviewitem.h

@ -22,7 +22,7 @@
#include <tdelistview.h>
#include <element.h>
#include "element.h"
#include "documentlistview.h"
namespace KBibTeX

12
src/documentsourceview.cpp

@ -17,9 +17,9 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include <ntqbuffer.h>
#include <ntqlayout.h>
#include <ntqfile.h>
#include <tqbuffer.h>
#include <tqlayout.h>
#include <tqfile.h>
#include <klibloader.h>
#include <kxmlguifactory.h>
@ -38,9 +38,9 @@
#include <tdetexteditor/editorchooser.h>
#include <tdetexteditor/undointerface.h>
#include <fileexporterbibtex.h>
#include <fileimporterbibtex.h>
#include <settings.h>
#include "fileexporterbibtex.h"
#include "fileimporterbibtex.h"
#include "settings.h"
#include "documentsourceview.h"
namespace KBibTeX

4
src/documentsourceview.h

@ -20,9 +20,9 @@
#ifndef KBIBTEXDOCUMENTSOURCEVIEW_H
#define KBIBTEXDOCUMENTSOURCEVIEW_H
#include <ntqwidget.h>
#include <tqwidget.h>
#include <file.h>
#include "file.h"
#include <tdetexteditor/editinterface.h>
#include <kate/view.h>

92
src/documentwidget.cpp

@ -19,19 +19,19 @@
***************************************************************************/
#include <cmath>
#include <ntqlayout.h>
#include <ntqfile.h>
#include <ntqdragobject.h>
#include <ntqregexp.h>
#include <ntqsplitter.h>
#include <ntqurl.h>
#include <ntqtextedit.h>
#include <ntqprogressdialog.h>
#include <ntqbuffer.h>
#include <ntqtooltip.h>
#include <ntqapplication.h>
#include <ntqpushbutton.h>
#include <ntqfileinfo.h>
#include <tqlayout.h>
#include <tqfile.h>
#include <tqdragobject.h>
#include <tqregexp.h>
#include <tqsplitter.h>
#include <tqurl.h>
#include <tqtextedit.h>
#include <tqprogressdialog.h>
#include <tqbuffer.h>
#include <tqtooltip.h>
#include <tqapplication.h>
#include <tqpushbutton.h>
#include <tqfileinfo.h>
#include <kdebug.h>
#include <tdelocale.h>
@ -53,39 +53,39 @@
#include <config.h>
#endif
#include <searchbar.h>
#include <sidebar.h>
#include <documentlistview.h>
#include <documentlistviewitem.h>
#include <documentsourceview.h>
#include <macrowidget.h>
#include <preamblewidget.h>
#include <commentwidget.h>
#include <entrywidget.h>
#include <fileimporterbibtex.h>
#include <fileimporterbibutils.h>
#include <fileimporterris.h>
#include <fileexporterbibtex.h>
#include <fileexporterbibutils.h>
#include <fileexporterris.h>
#include <fileexporterxml.h>
#include <fileexporterrtf.h>
#include <fileexporterdocbook5.h>
#include <fileexporterpdf.h>
#include <fileexporterps.h>
#include <fileexporterxslt.h>
#include <fileimporterexternal.h>
#include <fileexporterexternal.h>
#include <xsltransform.h>
#include <entry.h>
#include <entryfield.h>
#include <comment.h>
#include <macro.h>
#include <preamble.h>
#include <settings.h>
#include <webquery.h>
#include <mergeelements.h>
#include <idsuggestions.h>
#include "searchbar.h"
#include "sidebar.h"
#include "documentlistview.h"
#include "documentlistviewitem.h"
#include "documentsourceview.h"
#include "macrowidget.h"
#include "preamblewidget.h"
#include "commentwidget.h"
#include "entrywidget.h"
#include "fileimporterbibtex.h"
#include "fileimporterbibutils.h"
#include "fileimporterris.h"
#include "fileexporterbibtex.h"
#include "fileexporterbibutils.h"
#include "fileexporterris.h"
#include "fileexporterxml.h"
#include "fileexporterrtf.h"
#include "fileexporterdocbook5.h"
#include "fileexporterpdf.h"
#include "fileexporterps.h"
#include "fileexporterxslt.h"
#include "fileimporterexternal.h"
#include "fileexporterexternal.h"
#include "xsltransform.h"
#include "entry.h"
#include "entryfield.h"
#include "comment.h"
#include "macro.h"
#include "preamble.h"
#include "settings.h"
#include "webquery.h"
#include "mergeelements.h"
#include "idsuggestions.h"
#include "documentwidget.h"

8
src/documentwidget.h

@ -20,13 +20,13 @@
#ifndef KBIBTEXDOCUMENTWIDGET_H
#define KBIBTEXDOCUMENTWIDGET_H
#include <ntqtabwidget.h>
#include <tqtabwidget.h>
#include <kdirwatch.h>
#include <fileimporter.h>
#include <file.h>
#include <settings.h>
#include "fileimporter.h"
#include "file.h"
#include "settings.h"
class TQIODevice;
class TQProgressDialog;

4
src/element.cpp

@ -17,9 +17,9 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include <ntqstring.h>
#include <tqstring.h>
#include <xsltransform.h>
#include "xsltransform.h"
#include "element.h"
namespace BibTeX

4
src/element.h

@ -20,8 +20,8 @@
#ifndef BIBTEXELEMENT_H
#define BIBTEXELEMENT_H
#include <file.h>
#include <entryfield.h>
#include "file.h"
#include "entryfield.h"
class TQString;

2
src/encoder.h

@ -20,7 +20,7 @@
#ifndef BIBTEXENCODER_H
#define BIBTEXENCODER_H
#include <entryfield.h>
#include "entryfield.h"
class TQString;

6
src/encoderlatex.cpp

@ -17,9 +17,9 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include <ntqstring.h>
#include <ntqapplication.h>
#include <ntqregexp.h>
#include <tqstring.h>
#include <tqapplication.h>
#include <tqregexp.h>
#include "encoderlatex.h"

8
src/encoderlatex.h

@ -20,11 +20,11 @@
#ifndef ENCODERLATEX_H
#define ENCODERLATEX_H
#include <ntqvaluelist.h>
#include <ntqregexp.h>
#include <tqvaluelist.h>
#include <tqregexp.h>
#include <encoder.h>
#include <entry.h>
#include "encoder.h"
#include "entry.h"
class TQString;

2
src/encoderxml.cpp

@ -17,7 +17,7 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include <ntqregexp.h>
#include <tqregexp.h>
#include "encoderxml.h"

6
src/encoderxml.h

@ -20,10 +20,10 @@
#ifndef BIBTEXENCODERXML_H
#define BIBTEXENCODERXML_H
#include <ntqptrlist.h>
#include <ntqregexp.h>
#include <tqptrlist.h>
#include <tqregexp.h>
#include <encoder.h>
#include "encoder.h"
class TQString;
class TQRegExp;

16
src/entry.cpp

@ -17,14 +17,14 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include <ntqstring.h>
#include <ntqstringlist.h>
#include <ntqregexp.h>
#include <entry.h>
#include <file.h>
#include <xsltransform.h>
#include <entryfield.h>
#include <tqstring.h>
#include <tqstringlist.h>
#include <tqregexp.h>
#include "entry.h"
#include "file.h"
#include "xsltransform.h"
#include "entryfield.h"
#define max(a,b) ((a)>(b)?(a):(b))

8
src/entry.h

@ -20,11 +20,11 @@
#ifndef BIBTEXBIBTEXENTRY_H
#define BIBTEXBIBTEXENTRY_H
#include <ntqvaluelist.h>
#include <ntqstringlist.h>
#include <tqvaluelist.h>
#include <tqstringlist.h>
#include <element.h>
#include <entryfield.h>
#include "element.h"
#include "entryfield.h"
class TQString;
class TQStringList;

4
src/entryfield.h

@ -20,9 +20,9 @@
#ifndef BIBTEXBIBTEXENTRYFIELD_H
#define BIBTEXBIBTEXENTRYFIELD_H
#include <ntqstring.h>
#include <tqstring.h>
#include <value.h>
#include "value.h"
namespace BibTeX
{

60
src/entrywidget.cpp

@ -17,19 +17,19 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include <ntqlayout.h>
#include <ntqcheckbox.h>
#include <ntqtooltip.h>
#include <ntqwhatsthis.h>
#include <ntqlistview.h>
#include <ntqlabel.h>
#include <ntqregexp.h>
#include <ntqpushbutton.h>
#include <ntqpopupmenu.h>
#include <ntqtabwidget.h>
#include <ntqcombobox.h>
#include <ntqtimer.h>
#include <ntqlineedit.h>
#include <tqlayout.h>
#include <tqcheckbox.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
#include <tqlistview.h>
#include <tqlabel.h>
#include <tqregexp.h>
#include <tqpushbutton.h>
#include <tqpopupmenu.h>
#include <tqtabwidget.h>
#include <tqcombobox.h>
#include <tqtimer.h>
#include <tqlineedit.h>
#include <tdelocale.h>
#include <kdebug.h>
@ -39,23 +39,23 @@
#include <tdeconfig.h>
#include <twin.h>
#include <entry.h>
#include <entryfield.h>
#include <file.h>
#include <settings.h>
#include <entrywidgettab.h>
#include <entrywidgettitle.h>
#include <entrywidgetauthor.h>
#include <entrywidgetkeyword.h>
#include <entrywidgetpublication.h>
#include <entrywidgetmisc.h>
#include <entrywidgetexternal.h>
#include <entrywidgetuserdefined.h>
#include <entrywidgetother.h>
#include <entrywidgetwarningsitem.h>
#include <fieldlistview.h>
#include <idsuggestions.h>
#include <webqueryarxiv.h>
#include "entry.h"
#include "entryfield.h"
#include "file.h"
#include "settings.h"
#include "entrywidgettab.h"
#include "entrywidgettitle.h"
#include "entrywidgetauthor.h"
#include "entrywidgetkeyword.h"
#include "entrywidgetpublication.h"
#include "entrywidgetmisc.h"
#include "entrywidgetexternal.h"
#include "entrywidgetuserdefined.h"
#include "entrywidgetother.h"
#include "entrywidgetwarningsitem.h"
#include "fieldlistview.h"
#include "idsuggestions.h"
#include "webqueryarxiv.h"
#include "entrywidget.h"
namespace KBibTeX

14
src/entrywidget.h

@ -20,16 +20,16 @@
#ifndef KBIBTEXENTRYWIDGET_H
#define KBIBTEXENTRYWIDGET_H
#include <ntqwidget.h>
#include <ntqdialog.h>
#include <ntqvaluelist.h>
#include <ntqmap.h>
#include <tqwidget.h>
#include <tqdialog.h>
#include <tqvaluelist.h>
#include <tqmap.h>
#include <kdialogbase.h>
#include <entry.h>
#include <entrywidgetsource.h>
#include <webquery.h>
#include "entry.h"
#include "entrywidgetsource.h"
#include "webquery.h"
class TQComboBox;
class TQLineEdit;

8
src/entrywidgetauthor.cpp

@ -17,14 +17,14 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include <ntqlayout.h>
#include <ntqlabel.h>
#include <tqlayout.h>
#include <tqlabel.h>
#include <kdialog.h>
#include <tdelocale.h>
#include <fieldlistview.h>
#include <entrywidgetwarningsitem.h>
#include "fieldlistview.h"
#include "entrywidgetwarningsitem.h"
#include "entrywidgetauthor.h"
namespace KBibTeX

2
src/entrywidgetauthor.h

@ -20,7 +20,7 @@
#ifndef KBIBTEXENTRYWIDGETAUTHOR_H
#define KBIBTEXENTRYWIDGETAUTHOR_H
#include <entrywidgettab.h>
#include "entrywidgettab.h"
class TQWidget;
class TQScrollView;

10
src/entrywidgetexternal.cpp

@ -17,9 +17,9 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include <ntqlayout.h>
#include <ntqlabel.h>
#include <ntqtooltip.h>
#include <tqlayout.h>
#include <tqlabel.h>
#include <tqtooltip.h>
#include <kpushbutton.h>
#include <kdialog.h>
@ -30,8 +30,8 @@
#include <kiconloader.h>
#include <tdepopupmenu.h>
#include <fieldlineedit.h>
#include <settings.h>
#include "fieldlineedit.h"
#include "settings.h"
#include "entrywidgetexternal.h"
namespace KBibTeX

2
src/entrywidgetexternal.h

@ -20,7 +20,7 @@
#ifndef KBIBTEXENTRYWIDGETEXTERNAL_H
#define KBIBTEXENTRYWIDGETEXTERNAL_H
#include <entrywidgettab.h>
#include "entrywidgettab.h"
class KPushButton;
class KURL;

14
src/entrywidgetkeyword.cpp

@ -17,12 +17,12 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include <ntqlayout.h>
#include <ntqregexp.h>
#include <ntqpushbutton.h>
#include <ntqtooltip.h>
#include <ntqtimer.h>
#include <ntqlabel.h>
#include <tqlayout.h>
#include <tqregexp.h>
#include <tqpushbutton.h>
#include <tqtooltip.h>
#include <tqtimer.h>
#include <tqlabel.h>
#include <kdialog.h>
#include <tdelocale.h>
@ -33,7 +33,7 @@
#include <kguiitem.h>
#include <kdebug.h>
#include <settings.h>
#include "settings.h"
#include "entrywidgetkeyword.h"
namespace KBibTeX

2
src/entrywidgetkeyword.h

@ -20,7 +20,7 @@
#ifndef KBIBTEXENTRYWIDGETKEYWORD_H
#define KBIBTEXENTRYWIDGETKEYWORD_H
#include <entrywidgettab.h>
#include "entrywidgettab.h"
class TQPushButton;
class TDEListView;

10
src/entrywidgetmisc.cpp

@ -17,15 +17,15 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include <ntqlayout.h>
#include <ntqlabel.h>
#include <tqlayout.h>
#include <tqlabel.h>
#include <kdialog.h>
#include <tdelocale.h>
#include <fieldlineedit.h>
#include <value.h>
#include <entryfield.h>
#include "fieldlineedit.h"
#include "value.h"
#include "entryfield.h"
#include "entrywidgetmisc.h"
namespace KBibTeX

2
src/entrywidgetmisc.h

@ -20,7 +20,7 @@
#ifndef KBIBTEXENTRYWIDGETMISC_H
#define KBIBTEXENTRYWIDGETMISC_H
#include <entrywidgettab.h>
#include "entrywidgettab.h"
namespace KBibTeX
{

14
src/entrywidgetother.cpp

@ -17,11 +17,11 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include <ntqstringlist.h>
#include <ntqlayout.h>
#include <ntqtooltip.h>
#include <ntqlabel.h>
#include <ntqwhatsthis.h>
#include <tqstringlist.h>
#include <tqlayout.h>
#include <tqtooltip.h>
#include <tqlabel.h>
#include <tqwhatsthis.h>
#include <kdialog.h>
#include <tdeapplication.h>
@ -32,8 +32,8 @@
#include <kpushbutton.h>
#include <klineedit.h>
#include <fieldlineedit.h>
#include <settings.h>
#include "fieldlineedit.h"
#include "settings.h"
#include "entrywidgetother.h"
namespace KBibTeX

2
src/entrywidg