diff options
168 files changed, 1614 insertions, 1761 deletions
diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 69dd7b2..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "cmake"] - path = cmake - url = https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake diff --git a/CMakeL10n.txt b/CMakeL10n.txt index a525b71..0176702 100644 --- a/CMakeL10n.txt +++ b/CMakeL10n.txt @@ -9,12 +9,15 @@ # ################################################# -cmake_minimum_required( VERSION 2.8 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) ##### include our cmake modules ################# -set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) include( TDEL10n ) diff --git a/CMakeLists.txt b/CMakeLists.txt index 43d481f..91521d3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,13 +7,16 @@ ############################################ -cmake_minimum_required( VERSION 2.8 ) +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) +tde_set_project_version( ) #### general package setup project( kbibtex ) -set( VERSION R14.1.0 ) #### include essential cmake modules @@ -29,7 +32,6 @@ include( CheckCXXSourceCompiles ) #### include our cmake modules -set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) include( TDEMacros ) @@ -70,9 +72,12 @@ set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" 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 ) + + +##### other data ################################ + +tde_conditional_add_project_docs( BUILD_DOC ) +tde_conditional_add_project_translations( BUILD_TRANSLATIONS ) ##### write configure files diff --git a/Doxyfile b/Doxyfile deleted file mode 100644 index d13bcec..0000000 --- a/Doxyfile +++ /dev/null @@ -1,266 +0,0 @@ -# Doxyfile 1.3.7-KDevelop - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- -PROJECT_NAME = kbibtex.tdevelop -PROJECT_NUMBER = 0.2 -OUTPUT_DIRECTORY = -CREATE_SUBDIRS = NO -OUTPUT_LANGUAGE = English -USE_WINDOWS_ENCODING = NO -BRIEF_MEMBER_DESC = YES -REPEAT_BRIEF = YES -ABBREVIATE_BRIEF = "The $name class" \ - "The $name widget" \ - "The $name file" \ - is \ - provides \ - specifies \ - contains \ - represents \ - a \ - an \ - the -ALWAYS_DETAILED_SEC = NO -INLINE_INHERITED_MEMB = NO -FULL_PATH_NAMES = NO -STRIP_FROM_PATH = /home/thomas/Programmierung/kbibtex/ -STRIP_FROM_INC_PATH = -SHORT_NAMES = NO -JAVADOC_AUTOBRIEF = NO -MULTILINE_CPP_IS_BRIEF = NO -DETAILS_AT_TOP = NO -INHERIT_DOCS = YES -DISTRIBUTE_GROUP_DOC = NO -TAB_SIZE = 8 -ALIASES = -OPTIMIZE_OUTPUT_FOR_C = NO -OPTIMIZE_OUTPUT_JAVA = NO -SUBGROUPING = YES -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- -EXTRACT_ALL = NO -EXTRACT_PRIVATE = NO -EXTRACT_STATIC = NO -EXTRACT_LOCAL_CLASSES = YES -EXTRACT_LOCAL_METHODS = NO -HIDE_UNDOC_MEMBERS = NO -HIDE_UNDOC_CLASSES = NO -HIDE_FRIEND_COMPOUNDS = NO -HIDE_IN_BODY_DOCS = NO -INTERNAL_DOCS = NO -CASE_SENSE_NAMES = YES -HIDE_SCOPE_NAMES = NO -SHOW_INCLUDE_FILES = YES -INLINE_INFO = YES -SORT_MEMBER_DOCS = YES -SORT_BRIEF_DOCS = NO -SORT_BY_SCOPE_NAME = NO -GENERATE_TODOLIST = YES -GENERATE_TESTLIST = YES -GENERATE_BUGLIST = YES -GENERATE_DEPRECATEDLIST= YES -ENABLED_SECTIONS = -MAX_INITIALIZER_LINES = 30 -SHOW_USED_FILES = YES -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- -QUIET = NO -WARNINGS = YES -WARN_IF_UNDOCUMENTED = YES -WARN_IF_DOC_ERROR = YES -WARN_FORMAT = "$file:$line: $text" -WARN_LOGFILE = -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- -INPUT = /home/thomas/test/programming/kbibtex -FILE_PATTERNS = *.c \ - *.cc \ - *.cxx \ - *.cpp \ - *.c++ \ - *.java \ - *.ii \ - *.ixx \ - *.ipp \ - *.i++ \ - *.inl \ - *.h \ - *.hh \ - *.hxx \ - *.hpp \ - *.h++ \ - *.idl \ - *.odl \ - *.cs \ - *.php \ - *.php3 \ - *.inc \ - *.m \ - *.mm \ - *.C \ - *.CC \ - *.C++ \ - *.II \ - *.I++ \ - *.H \ - *.HH \ - *.H++ \ - *.CS \ - *.PHP \ - *.PHP3 \ - *.M \ - *.MM \ - *.C \ - *.H \ - *.tlh \ - *.diff \ - *.patch \ - *.moc \ - *.xpm \ - *.dox -RECURSIVE = yes -EXCLUDE = -EXCLUDE_SYMLINKS = NO -EXCLUDE_PATTERNS = -EXAMPLE_PATH = -EXAMPLE_PATTERNS = * -EXAMPLE_RECURSIVE = NO -IMAGE_PATH = -INPUT_FILTER = -FILTER_SOURCE_FILES = NO -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- -SOURCE_BROWSER = NO -INLINE_SOURCES = NO -STRIP_CODE_COMMENTS = YES -REFERENCED_BY_RELATION = YES -REFERENCES_RELATION = YES -VERBATIM_HEADERS = YES -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- -ALPHABETICAL_INDEX = NO -COLS_IN_ALPHA_INDEX = 5 -IGNORE_PREFIX = -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- -GENERATE_HTML = YES -HTML_OUTPUT = html -HTML_FILE_EXTENSION = .html -HTML_HEADER = -HTML_FOOTER = -HTML_STYLESHEET = -HTML_ALIGN_MEMBERS = YES -GENERATE_HTMLHELP = NO -CHM_FILE = -HHC_LOCATION = -GENERATE_CHI = NO -BINARY_TOC = NO -TOC_EXPAND = NO -DISABLE_INDEX = NO -ENUM_VALUES_PER_LINE = 4 -GENERATE_TREEVIEW = NO -TREEVIEW_WIDTH = 250 -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- -GENERATE_LATEX = YES -LATEX_OUTPUT = latex -LATEX_CMD_NAME = latex -MAKEINDEX_CMD_NAME = makeindex -COMPACT_LATEX = NO -PAPER_TYPE = a4wide -EXTRA_PACKAGES = -LATEX_HEADER = -PDF_HYPERLINKS = NO -USE_PDFLATEX = NO -LATEX_BATCHMODE = NO -LATEX_HIDE_INDICES = NO -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- -GENERATE_RTF = NO -RTF_OUTPUT = rtf -COMPACT_RTF = NO -RTF_HYPERLINKS = NO -RTF_STYLESHEET_FILE = -RTF_EXTENSIONS_FILE = -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- -GENERATE_MAN = NO -MAN_OUTPUT = man -MAN_EXTENSION = .3 -MAN_LINKS = NO -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- -GENERATE_XML = yes -XML_OUTPUT = xml -XML_SCHEMA = -XML_DTD = -XML_PROGRAMLISTING = YES -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- -GENERATE_AUTOGEN_DEF = NO -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- -GENERATE_PERLMOD = NO -PERLMOD_LATEX = NO -PERLMOD_PRETTY = YES -PERLMOD_MAKEVAR_PREFIX = -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- -ENABLE_PREPROCESSING = YES -MACRO_EXPANSION = NO -EXPAND_ONLY_PREDEF = NO -SEARCH_INCLUDES = YES -INCLUDE_PATH = -INCLUDE_FILE_PATTERNS = -PREDEFINED = -EXPAND_AS_DEFINED = -SKIP_FUNCTION_MACROS = YES -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- -TAGFILES = -GENERATE_TAGFILE = kbibtex.tag -ALLEXTERNALS = NO -EXTERNAL_GROUPS = YES -PERL_PATH = /usr/bin/perl -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- -CLASS_DIAGRAMS = YES -HIDE_UNDOC_RELATIONS = YES -HAVE_DOT = NO -CLASS_GRAPH = YES -COLLABORATION_GRAPH = YES -UML_LOOK = NO -TEMPLATE_RELATIONS = NO -INCLUDE_GRAPH = YES -INCLUDED_BY_GRAPH = YES -CALL_GRAPH = NO -GRAPHICAL_HIERARCHY = YES -DOT_IMAGE_FORMAT = png -DOT_PATH = -DOTFILE_DIRS = -MAX_DOT_GRAPH_WIDTH = 1024 -MAX_DOT_GRAPH_HEIGHT = 1024 -MAX_DOT_GRAPH_DEPTH = 1000 -GENERATE_LEGEND = YES -DOT_CLEANUP = YES -#--------------------------------------------------------------------------- -# Configuration::additions related to the search engine -#--------------------------------------------------------------------------- -SEARCHENGINE = NO @@ -1,14 +0,0 @@ -KBibTeX - BibTeX editor for TDE. - - -An application to manage bibliography databases in the BibTeX format. -KBibTeX can be used as a standalone program, but can also be embedded -into other TDE applications (e.g. as bibliography editor into Kile). - -KBibTeX can query online ressources (e.g. Google scholar) via -customizable search URLs. It is also able to import complete datasets -from NCBI Pubmed. It also supports tagging references with keywords and -manages references to local files. - -BibTeX files can be exported into HTML, XML, PDF, PS and RTF format -using a number of citation styles. diff --git a/README.md b/README.md new file mode 100644 index 0000000..3d53db1 --- /dev/null +++ b/README.md @@ -0,0 +1,40 @@ + +KBibTeX - BibTeX editor for TDE. + + +An application to manage bibliography databases in the BibTeX format. +KBibTeX can be used as a standalone program, but can also be embedded +into other TDE applications (e.g. as bibliography editor into Kile). + +KBibTeX can query online ressources (e.g. Google scholar) via +customizable search URLs. It is also able to import complete datasets +from NCBI Pubmed. It also supports tagging references with keywords and +manages references to local files. + +BibTeX files can be exported into HTML, XML, PDF, PS and RTF format +using a number of citation styles. + +. + +Contributing +-------------- + +If you wish to contribute to KBibTeX, you might do so: + +- TDE Gitea Workspace (TGW) collaboration tool. + https://mirror.git.trinitydesktop.org/gitea + +- TDE Weblate Translation Workspace (TWTW) collaboration tool. + https://mirror.git.trinitydesktop.org/weblate + + +Translations status +--------------------- + +### messages +[![Translations status](https://mirror.git.trinitydesktop.org/weblate/widgets/applications/-/kbibtex/multi-auto.svg +"Engage in translating")](https://mirror.git.trinitydesktop.org/weblate/projects/applications/kbibtex/) + +### desktop files +[![Translations status](https://mirror.git.trinitydesktop.org/weblate/widgets/applications/-/kbibtex-desktop-files/multi-auto.svg +"Engage in translating")](https://mirror.git.trinitydesktop.org/weblate/projects/applications/kbibtex-desktop-files/) diff --git a/cmake b/cmake deleted file mode 160000 -Subproject 8668335711fa13cec276552d75bfbb4285c7edb diff --git a/config.h.cmake b/config.h.cmake index 3581708..6de3c37 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -1,7 +1,7 @@ #define VERSION "@VERSION@" // Defined if you have fvisibility and fvisibility-inlines-hidden support. -#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1 +#cmakedefine __TDE_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). */ diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt deleted file mode 100644 index c938175..0000000 --- a/doc/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory( en ) diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt deleted file mode 100644 index ba3ef3e..0000000 --- a/doc/en/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -tde_create_handbook( DESTINATION ${PROJECT_NAME} ) diff --git a/doc/en/index.docbook b/doc/en/index.docbook index ef3b136..1c91071 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -93,14 +93,3 @@ Thomas Fischer (Project Manager). </book> - -<!-- -Local Variables: -mode: sgml -sgml-namecase-general: t -sgml-namecase-entity: nil -sgml-general-insert-case: lower -sgml-minimize-attributes: nil -sgml-omittag: nil -End: ---> diff --git a/man/kbibtex.1 b/doc/man/kbibtex.1 index e77cebc..e77cebc 100644 --- a/man/kbibtex.1 +++ b/doc/man/kbibtex.1 diff --git a/kbibtex.tdevelop b/kbibtex.tdevelop deleted file mode 100644 index 79a3baa..0000000 --- a/kbibtex.tdevelop +++ /dev/null @@ -1,299 +0,0 @@ -<?xml version = '1.0'?> -<tdevelop> - <general> - <author>Thomas Fischer</author> - <email>fischer@unix-ag.uni-kl.de</email> - <version>0.2.3.91</version> - <projectmanagement>KDevKDEAutoProject</projectmanagement> - <primarylanguage>C++</primarylanguage> - <keywords> - <keyword>C++</keyword> - <keyword>Code</keyword> - <keyword>Qt</keyword> - <keyword>TDE</keyword> - </keywords> - <projectdirectory>.</projectdirectory> - <absoluteprojectpath>false</absoluteprojectpath> - <description/> - <ignoreparts/> - <secondaryLanguages/> - <defaultencoding/> - <versioncontrol>kdevsubversion</versioncontrol> - <projectname>kbibtex</projectname> - </general> - <kdevautoproject> - <general> - <activetarget>src/kbibtex</activetarget> - <useconfiguration>debug</useconfiguration> - </general> - <run> - <mainprogram>/home/fish/playground/kbibtexKDE3/debug/src/kbibtex</mainprogram> - <directoryradio>build</directoryradio> - <customdirectory>/</customdirectory> - <programargs>--geometry 960x720+0+0</programargs> - <terminal>false</terminal> - <autocompile>true</autocompile> - <envvars> - <envvar value="en_US.utf8" name="LANG" /> - <envvar value="C" name="LC_ALL" /> - </envvars> - <autoinstall>false</autoinstall> - <autokdesu>false</autokdesu> - <globaldebugarguments/> - <globalcwd>/home/fish/playground/kbibtexKDE3/testset</globalcwd> - <useglobalprogram>true</useglobalprogram> - </run> - <configurations> - <optimized> - <builddir>optimized</builddir> - <ccompiler>kdevgccoptions</ccompiler> - <cxxcompiler>kdevgppoptions</cxxcompiler> - <f77compiler>kdevg77options</f77compiler> - <cxxflags>-O2 -g0</cxxflags> - </optimized> - <debug> - <configargs>--enable-debug=full --without-arts</configargs> - <builddir>debug</builddir> - <ccompiler>kdevgccoptions</ccompiler> - <cxxcompiler>kdevgppoptions</cxxcompiler> - <f77compiler>kdevg77options</f77compiler> - <cxxflags>-Wall -g3 -O0</cxxflags> - <envvars> - <envvar value="en_US.utf8" name="LANG" /> - <envvar value="C" name="LC_ALL" /> - </envvars> - <topsourcedir/> - <cppflags>`xml2-config --cflags` `xslt-config --cflags`</cppflags> - <ldflags>`xml2-config --libs` `xslt-config --libs`</ldflags> - <ccompilerbinary/> - <cxxcompilerbinary>g++</cxxcompilerbinary> - <f77compilerbinary>g77</f77compilerbinary> - <cflags>-Wall -g3 -O0</cflags> - <f77flags/> - </debug> - <profiling> - <envvars/> - <configargs>--without-arts</configargs> - <builddir>profiling</builddir> - <topsourcedir/> - <cppflags>`xml2-config --cflags` `xslt-config --cflags`</cppflags> - <ldflags>`xml2-config --libs` `xslt-config --libs`</ldflags> - <ccompiler>kdevgccoptions</ccompiler> - <cxxcompiler>kdevgppoptions</cxxcompiler> - <f77compiler>kdevg77options</f77compiler> - <ccompilerbinary/> - <cxxcompilerbinary/> - <f77compilerbinary/> - <cflags>-Wall -O1 -pg</cflags> - <cxxflags>-Wall -O1 -pg</cxxflags> - <f77flags/> - </profiling> - <default> - <envvars/> - <configargs>--without-arts</configargs> - <builddir>default</builddir> - <topsourcedir/> - <cppflags>`xml2-config --cflags` `xslt-config --cflags`</cppflags> - <ldflags>`xml2-config --libs` `xslt-config --libs`</ldflags> - <ccompiler>kdevgccoptions</ccompiler> - <cxxcompiler>kdevgppoptions</cxxcompiler> - <f77compiler>kdevg77options</f77compiler> - <ccompilerbinary/> - <cxxcompilerbinary/> - <f77compilerbinary/> - <cflags>-Wall -O2</cflags> - <cxxflags>-Wall -O2</cxxflags> - <f77flags/> - </default> - </configurations> - <make> - <envvars> - <envvar value="en_US.utf8" name="LANG" /> - <envvar value="C" name="LC_ALL" /> - </envvars> - <abortonerror>true</abortonerror> - <numberofjobs>2</numberofjobs> - <dontact>false</dontact> - <makebin/> - <prio>2</prio> - <runmultiplejobs>false</runmultiplejobs> - </make> - </kdevautoproject> - <kdevfileview> - <groups> - <group pattern="*.1" name="Man Pages" /> - <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> - <group pattern="*.ui" name="User Interface" /> - <group pattern="*.png" name="Icons" /> - <group pattern="*.po;*.ts" name="Translations" /> - <group pattern="*" name="Others" /> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidenonlocation>false</hidenonlocation> - </groups> - <tree> - <hidepatterns>*.o,*.lo,CVS</hidepatterns> - <hidenonprojectfiles>false</hidenonprojectfiles> - <showvcsfields>false</showvcsfields> - </tree> - </kdevfileview> - <kdevdoctreeview> - <ignoretocs> - <toc>ada</toc> - <toc>ada_bugs_gcc</toc> - <toc>bash</toc> - <toc>bash_bugs</toc> - <toc>clanlib</toc> - <toc>w3c-dom-level2-html</toc> - <toc>fortran_bugs_gcc</toc> - <toc>gnome1</toc> - <toc>gnustep</toc> - <toc>gtk</toc> - <toc>gtk_bugs</toc> - <toc>haskell</toc> - <toc>haskell_bugs_ghc</toc> - <toc>java_bugs_gcc</toc> - <toc>java_bugs_sun</toc> - <toc>pascal_bugs_fp</toc> - <toc>php</toc> - <toc>php_bugs</toc> - <toc>perl</toc> - <toc>perl_bugs</toc> - <toc>python</toc> - <toc>python_bugs</toc> - <toc>ruby</toc> - <toc>ruby_bugs</toc> - <toc>sdl</toc> - <toc>w3c-svg</toc> - <toc>sw</toc> - <toc>w3c-uaag10</toc> - <toc>wxwidgets_bugs</toc> - </ignoretocs> - <ignoreqt_xml> - <toc>qmake User Guide</toc> - </ignoreqt_xml> - </kdevdoctreeview> - <kdevdebugger> - <general> - <dbgshell>/usr/bin/libtool</dbgshell> - <programargs>--geometry 800x640+0+0</programargs> - <gdbpath>/usr/bin/gdb</gdbpath> - <configGdbScript/> - <runShellScript/> - <runGdbScript/> - <breakonloadinglibs>true</breakonloadinglibs> - <separatetty>false</separatetty> - <floatingtoolbar>false</floatingtoolbar> - <raiseGDBOnStart>false</raiseGDBOnStart> - </general> - <display> - <staticmembers>true</staticmembers> - <demanglenames>true</demanglenames> - <outputradix>16</outputradix> - </display> - </kdevdebugger> - <kdevfilecreate> - <filetypes/> - <useglobaltypes> - <type ext="ui" /> - <type ext="cpp" /> - <type ext="h" /> - </useglobaltypes> - </kdevfilecreate> - <kdevcppsupport> - <references/> - <codecompletion> - <includeGlobalFunctions>true</includeGlobalFunctions> - <includeTypes>true</includeTypes> - <includeEnums>true</includeEnums> - <includeTypedefs>false</includeTypedefs> - <automaticCodeCompletion>false</automaticCodeCompletion> - <automaticArgumentsHint>false</automaticArgumentsHint> - <automaticHeaderCompletion>true</automaticHeaderCompletion> - <codeCompletionDelay>250</codeCompletionDelay> - <argumentsHintDelay>400</argumentsHintDelay> - <headerCompletionDelay>250</headerCompletionDelay> - <showOnlyAccessibleItems>false</showOnlyAccessibleItems> - <completionBoxItemOrder>0</completionBoxItemOrder> - <howEvaluationContextMenu>true</howEvaluationContextMenu> - <showCommentWithArgumentHint>true</showCommentWithArgumentHint> - <statusBarTypeEvaluation>true</statusBarTypeEvaluation> - <namespaceAliases>std=_GLIBCXX_STD;__gnu_cxx=std</namespaceAliases> - <processPrimaryTypes>true</processPrimaryTypes> - <processFunctionArguments>true</processFunctionArguments> - <preProcessAllHeaders>true</preProcessAllHeaders> - <parseMissingHeaders>false</parseMissingHeaders> - <resolveIncludePaths>true</resolveIncludePaths> - <alwaysParseInBackground>true</alwaysParseInBackground> - <usePermanentCaching>true</usePermanentCaching> - <alwaysIncludeNamespaces>true</alwaysIncludeNamespaces> - <includePaths>.;</includePaths> - <parseMissingHeadersExperimental>false</parseMissingHeadersExperimental> - <resolveIncludePathsUsingMakeExperimental>false</resolveIncludePathsUsingMakeExperimental> - </codecompletion> - <creategettersetter> - <prefixGet/> - <prefixSet>set</prefixSet> - <prefixVariable>m_,_</prefixVariable> - <parameterName>theValue</parameterName> - <inlineGet>true</inlineGet> - <inlineSet>true</inlineSet> - </creategettersetter> - <qt> - <used>true</used> - <version>3</version> - <root>/usr/lib/qt3</root> - <includestyle>3</includestyle> - <designerintegration>ExternalDesigner</designerintegration> - <qmake>/usr/lib/qt3/bin/qmake</qmake> - <designer>/usr/lib/qt3/bin/designer</designer> - <designerpluginpaths/> - </qt> - <splitheadersource> - <enabled>false</enabled> - <synchronize>true</synchronize> - <orientation>Vertical</orientation> - </splitheadersource> - </kdevcppsupport> - <dist> - <custom>false</custom> - <bzip>false</bzip> - <archname/> - <appname>kbibtex</appname> - <version>0.2.3.91</version> - <release/> - <vendor/> - <licence/> - <summary/> - <group/> - <packager/> - <description/> - <changelog/> - <devpackage>false</devpackage> - <docspackage>false</docspackage> - <appicon>false</appicon> - <arch>0</arch> - <genHTML>false</genHTML> - <useRPM>false</useRPM> - <ftpkde>false</ftpkde> - <appskde>false</appskde> - <url/> - </dist> - <cppsupportpart> - <filetemplates> - <interfacesuffix>.h</interfacesuffix> - <implementationsuffix>.cpp</implementationsuffix> - </filetemplates> - </cppsupportpart> - <kdevdocumentation> - <projectdoc> - <docsystem/> - <docurl/> - <usermanualurl/> - </projectdoc> - </kdevdocumentation> - <ctagspart> - <customArguments/> - <customTagfilePath>//home/fish/playground/kbibtexKDE3/tags</customTagfilePath> - <activeTagsFiles/> - </ctagspart> -</tdevelop> diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt deleted file mode 100644 index 8512250..0000000 --- a/man/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -INSTALL( - FILES ${PROJECT_NAME}.1 - DESTINATION ${MAN_INSTALL_DIR}/man1 - COMPONENT doc -) diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt deleted file mode 100644 index 597c341..0000000 --- a/po/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -file( GLOB _srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po ) - -if( _srcs ) - tde_create_translation( LANG auto OUTPUT_NAME ${PROJECT_NAME} ) -endif( ) diff --git a/src/CMakeL10n.txt b/src/CMakeL10n.txt index 8f0f4e5..e783bab 100644 --- a/src/CMakeL10n.txt +++ b/src/CMakeL10n.txt @@ -1,3 +1,8 @@ ##### create translation templates ############## -tde_l10n_create_template( "kbibtex" ) +tde_l10n_create_template( "messages/kbibtex" ) + +tde_l10n_create_template( + CATALOG "desktop_files/kbibtex-desktops" + SOURCES *.desktop +) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bf18877..43e81e7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -113,15 +113,12 @@ install( DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME} ) -install( - FILES kbibtex_part.desktop +tde_create_translated_desktop( + SOURCE kbibtex_part.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( - FILES ${PROJECT_NAME}.desktop - DESTINATION ${XDG_APPS_INSTALL_DIR} -) +tde_create_translated_desktop( ${PROJECT_NAME}.desktop ) install( FILES kbibtex_part.rc diff --git a/src/comment.h b/src/comment.h index 762caea..9176763 100644 --- a/src/comment.h +++ b/src/comment.h @@ -37,7 +37,7 @@ namespace BibTeX bool useCommand() const; void setUseCommand( bool useCommand ); - bool containsPattern( const TQString& pattern, EntryField::FieldType fieldType = EntryField::ftUnknown, FilterType filterType = BibTeX::Element::ftExact, bool caseSensitive = FALSE ) const; + bool containsPattern( const TQString& pattern, EntryField::FieldType fieldType = EntryField::ftUnknown, FilterType filterType = BibTeX::Element::ftExact, bool caseSensitive = false ) const; Element* clone(); private: diff --git a/src/commentwidget.h b/src/commentwidget.h index 75df8fc..ae75eff 100644 --- a/src/commentwidget.h +++ b/src/commentwidget.h @@ -32,7 +32,7 @@ namespace KBibTeX { class CommentWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: CommentWidget( BibTeX::Comment *comment, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); ~CommentWidget(); diff --git a/src/documentlistview.cpp b/src/documentlistview.cpp index f221b5d..80c62d8 100644 --- a/src/documentlistview.cpp +++ b/src/documentlistview.cpp @@ -75,19 +75,19 @@ namespace KBibTeX setAllColumnsShowFocus( true ); setShowSortIndicator( true ); setSelectionMode( TQListView::Extended ); - header() ->setClickEnabled( TRUE ); - header() ->setMovingEnabled( TRUE ); + header() ->setClickEnabled( true ); + header() ->setMovingEnabled( true ); buildColumns(); setDragEnabled( true ); // setDragAutoScroll( true ); - setAcceptDrops( TRUE ); - setDropVisualizer( TRUE ); + setAcceptDrops( true ); + setDropVisualizer( true ); - connect( header(), SIGNAL( clicked( int ) ), this, SLOT( setSortingColumn( int ) ) ); - connect( this, SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), this, SLOT( showBibtexListContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); - connect( this, SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), this, SLOT( slotDoubleClick( TQListViewItem* ) ) ); - connect( this, SIGNAL( dropped( TQDropEvent*, TQListViewItem* ) ), this, SLOT( slotDropped( TQDropEvent*, TQListViewItem* ) ) ); + connect( header(), TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( setSortingColumn( int ) ) ); + connect( this, TQ_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), this, TQ_SLOT( showBibtexListContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), this, TQ_SLOT( slotDoubleClick( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( dropped( TQDropEvent*, TQListViewItem* ) ), this, TQ_SLOT( slotDropped( TQDropEvent*, TQListViewItem* ) ) ); } DocumentListView::~DocumentListView() @@ -105,7 +105,7 @@ namespace KBibTeX m_bibtexFile = bibtexFile; setItems(); - return TRUE; + return true; } BibTeX::File* DocumentListView::getBibTeXFile( ) @@ -117,13 +117,13 @@ namespace KBibTeX { TQApplication::setOverrideCursor( TQt::waitCursor ); - KProgressDialog *prgDlg = new KProgressDialog( this, "prgDlg", i18n( "List View" ), i18n( "Updating main view ..." ), TRUE ); + KProgressDialog *prgDlg = new KProgressDialog( this, "prgDlg", i18n( "List View" ), i18n( "Updating main view ..." ), true ); prgDlg->show(); KProgress *progress = prgDlg->progressBar(); progress->setTotalSteps( m_bibtexFile->count() ); bool update = viewport()->isUpdatesEnabled(); - viewport()->setUpdatesEnabled( FALSE ); + viewport()->setUpdatesEnabled( false ); int sortCol = sortColumn(); setSortColumn( -1 ); @@ -135,7 +135,7 @@ namespace KBibTeX progress->setProgress( i ); if ( i % 43 == 23 ) - kapp->processEvents(); + tdeApp->processEvents(); } viewport()->setUpdatesEnabled( update ); @@ -180,12 +180,12 @@ namespace KBibTeX m_bibtexFile->appendElement( element, after == NULL ? NULL : after->element() ); after = new DocumentListViewItem( m_bibtexFile, element, this, after ); - after->setUnreadStatus( TRUE ); + after->setUnreadStatus( true ); updateVisiblity( after ); m_unreadItems.append( after ); emit modified(); - TQTimer::singleShot( 3500, this, SLOT( makeNewItemsUnread() ) ); + TQTimer::singleShot( 3500, this, TQ_SLOT( makeNewItemsUnread() ) ); return after; } @@ -227,8 +227,8 @@ namespace KBibTeX void DocumentListView::deferredInitialization() { - connect( header(), SIGNAL( sizeChange( int, int, int ) ), this, SLOT( saveColumnWidths() ) ); - connect( header(), SIGNAL( indexChange( int, int, int ) ), this, SLOT( saveColumnIndex() ) ); + connect( header(), TQ_SIGNAL( sizeChange( int, int, int ) ), this, TQ_SLOT( saveColumnWidths() ) ); + connect( header(), TQ_SIGNAL( indexChange( int, int, int ) ), this, TQ_SLOT( saveColumnIndex() ) ); } void DocumentListView::restoreState() @@ -251,8 +251,8 @@ namespace KBibTeX { m_headerMenu = actionMenu->popupMenu(); m_headerMenu->insertTitle( i18n( "Show Columns" ) ); - m_headerMenu->setCheckable( TRUE ); - connect( m_headerMenu, SIGNAL( activated( int ) ), this, SLOT( activateShowColumnMenu( int ) ) ); + m_headerMenu->setCheckable( true ); + connect( m_headerMenu, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( activateShowColumnMenu( int ) ) ); Settings * settings = Settings::self( m_bibtexFile ); @@ -353,12 +353,12 @@ namespace KBibTeX void DocumentListView::copy() { - kapp->clipboard() ->setText( selectedToBibTeXText() ); + tdeApp->clipboard() ->setText( selectedToBibTeXText() ); } void DocumentListView::copyReferences() { - kapp->clipboard() ->setText( selectedToBibTeXRefs() ); + tdeApp->clipboard() ->setText( selectedToBibTeXRefs() ); } void DocumentListView::cut() @@ -373,7 +373,7 @@ namespace KBibTeX if ( dlvi == NULL ) dlvi = dynamic_cast<KBibTeX::DocumentListViewItem *>( currentItem() ); - TQString clipboardText = kapp->clipboard() ->text(); + TQString clipboardText = tdeApp->clipboard() ->text(); return paste( clipboardText, dlvi ); } @@ -392,10 +392,10 @@ namespace KBibTeX { insertItems( clipboardData, at ); delete clipboardData; - return TRUE; + return true; } else - return FALSE; + return false; } else if ( settings->external_xml2bibAvailable && settings->external_end2xmlAvailable && BibTeX::FileImporterBibUtils::guessCanDecode( text ) ) { @@ -413,10 +413,10 @@ namespace KBibTeX { insertItems( clipboardData, at ); delete clipboardData; - return TRUE; + return true; } else - return FALSE; + return false; } else if ( BibTeX::FileImporterRIS::guessCanDecode( text ) ) { @@ -428,22 +428,22 @@ namespace KBibTeX { insertItems( clipboardData, at ); delete clipboardData; - return TRUE; + return true; } else - return FALSE; + return false; } else { /** Decoding the paste text as bibtex failed. Maybe the user wants to paste the text as link address, abstract, etc... */ if ( !at ) // no list view item selected to add data to - return FALSE; + return false; // fetch BibTeX element from current list view item BibTeX::Entry * element = dynamic_cast<BibTeX::Entry*>( at->element() ); if ( ! element ) - return FALSE; + return false; // build popup menu TDEPopupMenu * popup = new TDEPopupMenu( this, "pastePopup" ); @@ -460,7 +460,7 @@ namespace KBibTeX // show popup menu int selectedId = popup->exec( TQCursor::pos() ); if ( selectedId == cancelId || selectedId == -1 ) - return FALSE; // cancel menu + return false; // cancel menu // determine field to add clipboard value to BibTeX::EntryField::FieldType fieldType = ( BibTeX::EntryField::FieldType ) selectedId; @@ -489,7 +489,7 @@ namespace KBibTeX field->setValue( value ); - return TRUE; + return true; } } @@ -553,12 +553,12 @@ namespace KBibTeX if ( columnWidth( id ) > 0 ) { hideColumn( id ); - m_headerMenu->setItemChecked( id, FALSE ); + m_headerMenu->setItemChecked( id, false ); } else { showColumn( id ); - m_headerMenu->setItemChecked( id, TRUE ); + m_headerMenu->setItemChecked( id, true ); } } } @@ -646,7 +646,7 @@ namespace KBibTeX { for ( TQValueList<DocumentListViewItem*>::ConstIterator it = m_unreadItems.begin() ; it != m_unreadItems.end(); ++it ) { - ( *it ) ->setUnreadStatus( FALSE ); + ( *it ) ->setUnreadStatus( false ); ( *it ) ->repaint(); } @@ -685,7 +685,7 @@ namespace KBibTeX else if ( !TQTextDrag::decode( event, text ) ) return; - event->accept( TRUE ); + event->accept( true ); DocumentListViewItem * dlvi = dynamic_cast<KBibTeX::DocumentListViewItem *>( item ); paste( text, dlvi ); diff --git a/src/documentlistview.h b/src/documentlistview.h index 37adc02..6e3cb5a 100644 --- a/src/documentlistview.h +++ b/src/documentlistview.h @@ -39,7 +39,7 @@ namespace KBibTeX class DocumentListView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: DocumentListView( KBibTeX::DocumentWidget *docWidget, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); ~DocumentListView(); diff --git a/src/documentlistviewitem.cpp b/src/documentlistviewitem.cpp index eadaaeb..b09bc57 100644 --- a/src/documentlistviewitem.cpp +++ b/src/documentlistviewitem.cpp @@ -31,7 +31,7 @@ namespace KBibTeX { - DocumentListViewItem::DocumentListViewItem( BibTeX::File *file, BibTeX::Element *element, DocumentListView *parent ) : TDEListViewItem( parent, parent->lastItem() ), m_element( element ), m_bibtexFile( file ), m_parent( parent ), m_unreadStatus( FALSE ) + DocumentListViewItem::DocumentListViewItem( BibTeX::File *file, BibTeX::Element *element, DocumentListView *parent ) : TDEListViewItem( parent, parent->lastItem() ), m_element( element ), m_bibtexFile( file ), m_parent( parent ), m_unreadStatus( false ) { setTexts(); } @@ -70,7 +70,7 @@ namespace KBibTeX if ( m_unreadStatus ) { TQFont f = p->font(); - f.setBold( TRUE ); + f.setBold( true ); p->setFont( f ); } diff --git a/src/documentsourceview.cpp b/src/documentsourceview.cpp index 9d2b06b..4455609 100644 --- a/src/documentsourceview.cpp +++ b/src/documentsourceview.cpp @@ -56,7 +56,7 @@ namespace KBibTeX DocumentSourceView::~DocumentSourceView() { - kapp->config() ->sync(); + tdeApp->config() ->sync(); } /** @@ -88,10 +88,10 @@ namespace KBibTeX if ( clip ) { clip->paste(); - return TRUE; + return true; } else - return FALSE; + return false; } /** @@ -150,14 +150,14 @@ namespace KBibTeX void DocumentSourceView::find() { - KFindDialog dlg( TRUE, this ); + KFindDialog dlg( true, this ); dlg.setFindHistory( m_findHistory ); - dlg.setHasSelection( FALSE ); + dlg.setHasSelection( false ); #if KDE_IS_VERSION(3,4,0) - dlg.setSupportsWholeWordsFind( FALSE ); - dlg.setSupportsBackwardsFind( FALSE ); - dlg.setSupportsCaseSensitiveFind( FALSE ); - dlg.setSupportsRegularExpressionFind( FALSE ); + dlg.setSupportsWholeWordsFind( false ); + dlg.setSupportsBackwardsFind( false ); + dlg.setSupportsCaseSensitiveFind( false ); + dlg.setSupportsRegularExpressionFind( false ); #endif if ( dlg.exec() == TQDialog::Accepted ) { @@ -210,15 +210,15 @@ namespace KBibTeX { Settings * settings = Settings::self(); - bool result = FALSE; + bool result = false; m_progDlg = new KProgressDialog( this, NULL, i18n( "Source View" ), i18n( "Converting BibTeX document to plain text ..." ), true ); m_progDlg->setAllowCancel( false ); - kapp->processEvents(); + tdeApp->processEvents(); TQBuffer buffer; buffer.open( IO_WriteOnly ); BibTeX::FileExporterBibTeX * exporter = new BibTeX::FileExporterBibTeX(); - connect( exporter, SIGNAL( progress( int, int ) ), this, SLOT( updateProgress( int, int ) ) ); + connect( exporter, TQ_SIGNAL( progress( int, int ) ), this, TQ_SLOT( updateProgress( int, int ) ) ); exporter->setStringDelimiter( settings->fileIO_BibtexStringOpenDelimiter, settings->fileIO_BibtexStringCloseDelimiter ); exporter->setKeywordCasing( settings->fileIO_KeywordCasing ); exporter->setEncoding( "latex" ); @@ -229,7 +229,7 @@ namespace KBibTeX if ( result ) { - kapp->processEvents(); + tdeApp->processEvents(); buffer.open( IO_ReadOnly ); TQTextStream in( &buffer ); in.setEncoding( TQTextStream::UnicodeUTF8 ); @@ -238,10 +238,10 @@ namespace KBibTeX if ( m_editInterface ) { - kapp->processEvents(); + tdeApp->processEvents(); // very strange: to set the text, you have to set - // readwrite to TRUE... - m_document->setReadWrite( TRUE ); + // readwrite to true... + m_document->setReadWrite( true ); m_editInterface->setText( text ); m_document->setReadWrite( !m_isReadOnly ); } @@ -249,7 +249,7 @@ namespace KBibTeX m_bibtexFile = bibtexFile; } - kapp->processEvents(); + tdeApp->processEvents(); delete m_progDlg; return result; @@ -296,7 +296,7 @@ namespace KBibTeX m_editInterface = editInterface( m_document ); m_document->setReadWrite( !m_isReadOnly ); if ( !m_isReadOnly ) - connect( m_document, SIGNAL( textChanged() ), this, SIGNAL( modified() ) ); + connect( m_document, TQ_SIGNAL( textChanged() ), this, TQ_SIGNAL( modified() ) ); TQBoxLayout * layout = new TQVBoxLayout( this ); layout->addWidget( static_cast<TQWidget*>( m_view ) ); @@ -314,13 +314,13 @@ namespace KBibTeX void DocumentSourceView::readConfig() { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); readConfig( config ); } void DocumentSourceView::writeConfig() { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); writeConfig( config ); } @@ -355,7 +355,7 @@ namespace KBibTeX do { - bool result = searchIf->searchText( fromLine, fromCol, m_lastSearchTerm, &foundAtLine, &foundAtCol, &matchLen, FALSE ); + bool result = searchIf->searchText( fromLine, fromCol, m_lastSearchTerm, &foundAtLine, &foundAtCol, &matchLen, false ); if ( result ) { selectionIf->setSelection( foundAtLine, foundAtCol, foundAtLine, foundAtCol + matchLen ); @@ -373,7 +373,7 @@ namespace KBibTeX { m_progDlg->progressBar()->setTotalSteps( total ); m_progDlg->progressBar()->setValue( current ); - kapp->processEvents(); + tdeApp->processEvents(); } } diff --git a/src/documentsourceview.h b/src/documentsourceview.h index 7752092..1536948 100644 --- a/src/documentsourceview.h +++ b/src/documentsourceview.h @@ -39,7 +39,7 @@ namespace KBibTeX */ class DocumentSourceView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: DocumentSourceView( KBibTeX::DocumentWidget *docWidget, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); ~DocumentSourceView(); diff --git a/src/documentwidget.cpp b/src/documentwidget.cpp index e31e868..db02187 100644 --- a/src/documentwidget.cpp +++ b/src/documentwidget.cpp @@ -42,7 +42,7 @@ #include <tdepopupmenu.h> #include <kiconloader.h> #include <tdeio/netaccess.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <tdeapplication.h> #include <klineedit.h> @@ -110,7 +110,7 @@ namespace KBibTeX void DocumentWidget::setupGUI() { - setAcceptDrops( TRUE ); + setAcceptDrops( true ); setFocusPolicy( TQWidget::ClickFocus ); // List view tab widget =============================== @@ -133,7 +133,7 @@ namespace KBibTeX m_listViewElements = new DocumentListView( this, m_isReadOnly, m_vertSplitter ); m_preview = new KTextEdit( m_vertSplitter ); - m_preview->setReadOnly( TRUE ); + m_preview->setReadOnly( true ); m_preview->setAlignment( TQt::AlignTop && TQt::AlignLeft ); // Source view tab widget ============================= @@ -143,25 +143,25 @@ namespace KBibTeX m_sourceView->setFont( TDEGlobalSettings::fixedFont() ); // Setup actions - connect( m_searchBar, SIGNAL( onlineSearch() ), this, SLOT( onlineSearch() ) ); - connect( m_searchBar, SIGNAL( doSearch( const TQString&, BibTeX::Element::FilterType, BibTeX::EntryField::FieldType ) ), m_listViewElements, SLOT( filter( const TQString&, BibTeX::Element::FilterType, BibTeX::EntryField::FieldType ) ) ); - connect( m_listViewElements, SIGNAL( executed( DocumentListViewItem* ) ), this, SLOT( executeElement( DocumentListViewItem* ) ) ); - connect( m_listViewElements, SIGNAL( selectionChanged() ), this, SLOT( slotSelectionChanged() ) ); - connect( m_listViewElements, SIGNAL( currentChanged( TQListViewItem* ) ), this, SLOT( slotPreviewElement( TQListViewItem* ) ) ); - connect( m_listViewElements, SIGNAL( clicked( TQListViewItem* ) ), this, SLOT( slotPreviewElement( TQListViewItem* ) ) ); - connect( this, SIGNAL( currentChanged( TQWidget * ) ), this, SLOT( slotTabChanged( TQWidget* ) ) ); - connect( m_sourceView, SIGNAL( modified() ), this, SLOT( slotModified() ) ); - connect( m_listViewElements, SIGNAL( modified() ), this, SLOT( slotModified() ) ); - connect( m_sideBar, SIGNAL( valueRenamed() ), this, SLOT( slotModified() ) ); - connect( m_sideBar, SIGNAL( valueRenamed() ), this, SLOT( refreshBibTeXFile() ) ); - connect( m_sideBar, SIGNAL( selected( const TQString&, BibTeX::Element::FilterType, BibTeX::EntryField::FieldType ) ), m_searchBar, SLOT( setSearch( const TQString&, BibTeX::Element::FilterType, BibTeX::EntryField::FieldType ) ) ); - connect( &m_dirWatch, SIGNAL( dirty( const TQString& ) ), this, SLOT( slotFileGotDirty( const TQString & ) ) ); + connect( m_searchBar, TQ_SIGNAL( onlineSearch() ), this, TQ_SLOT( onlineSearch() ) ); + connect( m_searchBar, TQ_SIGNAL( doSearch( const TQString&, BibTeX::Element::FilterType, BibTeX::EntryField::FieldType ) ), m_listViewElements, TQ_SLOT( filter( const TQString&, BibTeX::Element::FilterType, BibTeX::EntryField::FieldType ) ) ); + connect( m_listViewElements, TQ_SIGNAL( executed( DocumentListViewItem* ) ), this, TQ_SLOT( executeElement( DocumentListViewItem* ) ) ); + connect( m_listViewElements, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotSelectionChanged() ) ); + connect( m_listViewElements, TQ_SIGNAL( currentChanged( TQListViewItem* ) ), this, TQ_SLOT( slotPreviewElement( TQListViewItem* ) ) ); + connect( m_listViewElements, TQ_SIGNAL( clicked( TQListViewItem* ) ), this, TQ_SLOT( slotPreviewElement( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( currentChanged( TQWidget * ) ), this, TQ_SLOT( slotTabChanged( TQWidget* ) ) ); + connect( m_sourceView, TQ_SIGNAL( modified() ), this, TQ_SLOT( slotModified() ) ); + connect( m_listViewElements, TQ_SIGNAL( modified() ), this, TQ_SLOT( slotModified() ) ); + connect( m_sideBar, TQ_SIGNAL( valueRenamed() ), this, TQ_SLOT( slotModified() ) ); + connect( m_sideBar, TQ_SIGNAL( valueRenamed() ), this, TQ_SLOT( refreshBibTeXFile() ) ); + connect( m_sideBar, TQ_SIGNAL( selected( const TQString&, BibTeX::Element::FilterType, BibTeX::EntryField::FieldType ) ), m_searchBar, TQ_SLOT( setSearch( const TQString&, BibTeX::Element::FilterType, BibTeX::EntryField::FieldType ) ) ); + connect( &m_dirWatch, TQ_SIGNAL( dirty( const TQString& ) ), this, TQ_SLOT( slotFileGotDirty( const TQString & ) ) ); } bool DocumentWidget::open( const TQString &fileName, bool mergeOnly ) { - bool result = FALSE; + bool result = false; if ( !mergeOnly ) m_dirWatch.removeFile( m_filename ); @@ -194,8 +194,8 @@ namespace KBibTeX bool DocumentWidget::open( TQIODevice *iodevice, bool mergeOnly, const TQString &label, BibTeX::FileImporter *importer ) { - bool result = FALSE; - setEnabled( FALSE ); + bool result = false; + setEnabled( false ); bool usingDefaultImporter = importer == NULL; if ( usingDefaultImporter ) @@ -241,40 +241,40 @@ namespace KBibTeX settings->addToCompletion( m_bibtexfile ); m_sideBar->refreshLists( m_bibtexfile ); - result = TRUE; + result = true; } else { kdDebug() << "Could not load bibliography file from io device" << endl; - result = FALSE; + result = false; } - setEnabled( TRUE ); + setEnabled( true ); return result; } bool DocumentWidget::save( const TQString &fileName, TQStringList *errorLog ) { - bool result = FALSE; + bool result = false; m_dirWatch.removeFile( m_filename ); Settings * settings = Settings::self( NULL ); BibTeX::File::FileFormat format = BibTeX::File::formatUndefined; - if ( fileName.endsWith( ".rtf", FALSE ) ) + if ( fileName.endsWith( ".rtf", false ) ) format = BibTeX::File::formatRTF; - else if ( fileName.endsWith( ".pdf", FALSE ) ) + else if ( fileName.endsWith( ".pdf", false ) ) format = BibTeX::File::formatPDF; - else if ( fileName.endsWith( ".bib", FALSE ) ) + else if ( fileName.endsWith( ".bib", false ) ) format = BibTeX::File::formatBibTeX; - else if ( settings->external_xml2bibAvailable && settings->external_end2xmlAvailable && ( fileName.endsWith( ".ref", FALSE ) || fileName.endsWith( ".refer", FALSE ) || fileName.endsWith( ".txt", FALSE ) || fileName.endsWith( ".rfr", FALSE ) ) ) + else if ( settings->external_xml2bibAvailable && settings->external_end2xmlAvailable && ( fileName.endsWith( ".ref", false ) || fileName.endsWith( ".refer", false ) || fileName.endsWith( ".txt", false ) || fileName.endsWith( ".rfr", false ) ) ) format = BibTeX::File::formatEndNote; - else if ( settings->external_xml2bibAvailable && settings->external_end2xmlAvailable && ( fileName.endsWith( ".isi", FALSE ) || fileName.endsWith( ".cgi", FALSE ) ) ) + else if ( settings->external_xml2bibAvailable && settings->external_end2xmlAvailable && ( fileName.endsWith( ".isi", false ) || fileName.endsWith( ".cgi", false ) ) ) format = BibTeX::File::formatISI; - else if ( fileName.endsWith( ".ris", FALSE ) ) + else if ( fileName.endsWith( ".ris", false ) ) format = BibTeX::File::formatRIS; - else if ( fileName.endsWith( ".ps", FALSE ) ) + else if ( fileName.endsWith( ".ps", false ) ) format = BibTeX::File::formatPS; - else if ( fileName.endsWith( ".xml", FALSE ) ) + else if ( fileName.endsWith( ".xml", false ) ) { TQStringList options = TQStringList::split( '|', ( settings->external_xml2bibAvailable && settings->external_end2xmlAvailable ? "DocBook5|MODS|internal XML" : "DocBook5|internal XML" ) ); bool ok = false; @@ -286,7 +286,7 @@ namespace KBibTeX else if ( ok && !answer.isNull() && answer == "internal XML" ) format = BibTeX::File::formatXML; } - else if ( fileName.endsWith( ".html", FALSE ) || fileName.endsWith( ".xhtml", FALSE ) || fileName.endsWith( ".htm", FALSE ) ) + else if ( fileName.endsWith( ".html", false ) || fileName.endsWith( ".xhtml", false ) || fileName.endsWith( ".htm", false ) ) format = BibTeX::File::formatHTML; if ( format != BibTeX::File::formatUndefined ) @@ -320,8 +320,8 @@ namespace KBibTeX { Settings * settings = Settings::self( m_bibtexfile ); - bool result = FALSE; - setEnabled( FALSE ); + bool result = false; + setEnabled( false ); updateFromGUI(); @@ -418,7 +418,7 @@ namespace KBibTeX if ( settings->fileIO_EmbedFiles && !Settings::kpsewhich( "embedfile.sty" ) ) { KMessageBox::sorry( this, i18n( "Embedding files into the PDF file is enabled, but the required file 'embedfile.sty' was not found. Embedding files will be disabled." ), i18n( "Embedding files disabled" ) ); - settings->fileIO_EmbedFiles = FALSE; + settings->fileIO_EmbedFiles = false; } BibTeX::FileExporterPDF *pdfExporter = new BibTeX::FileExporterPDF( settings->fileIO_EmbedFiles ); @@ -428,7 +428,7 @@ namespace KBibTeX for ( TQStringList::Iterator it = settings->editing_DocumentSearchPaths.begin(); it != settings->editing_DocumentSearchPaths.end(); ++it ) searchPaths.append( *it ); if ( m_bibtexfile->fileName != TQString::null ) - searchPaths.append( KURL( m_bibtexfile->fileName ).directory( FALSE, FALSE ) ); + searchPaths.append( KURL( m_bibtexfile->fileName ).directory( false, false ) ); pdfExporter->setDocumentSearchPaths( searchPaths ); exporter = pdfExporter; } @@ -456,7 +456,7 @@ namespace KBibTeX delete exporter; } - setEnabled( TRUE ); + setEnabled( true ); return result; } @@ -476,12 +476,12 @@ namespace KBibTeX m_bibtexfile->appendElement( macro ); settings->addToCompletion( macro ); m_sideBar->refreshLists( m_bibtexfile ); - return TRUE; + return true; } else { delete macro; - return FALSE; + return false; } } else if ( elementType.lower() == "comment" ) @@ -491,12 +491,12 @@ namespace KBibTeX { new DocumentListViewItem( m_bibtexfile, comment, m_listViewElements ); m_bibtexfile->appendElement( comment ); - return TRUE; + return true; } else { delete comment; - return FALSE; + return false; } } else if ( elementType.lower() == "preamble" ) @@ -506,12 +506,12 @@ namespace KBibTeX { new DocumentListViewItem( m_bibtexfile, preamble, m_listViewElements ); m_bibtexfile->appendElement( preamble ); - return TRUE; + return true; } else { delete preamble; - return FALSE; + return false; } } else @@ -519,20 +519,20 @@ namespace KBibTeX TQString name = nextNewEntry(); BibTeX::Entry *entry = new BibTeX::Entry( elementType, name ); m_dirWatch.stopScan(); - if ( EntryWidget::execute( entry, m_bibtexfile, m_isReadOnly, TRUE ) == TQDialog::Accepted ) + if ( EntryWidget::execute( entry, m_bibtexfile, m_isReadOnly, true ) == TQDialog::Accepted ) { new DocumentListViewItem( m_bibtexfile, entry, m_listViewElements ); m_bibtexfile->appendElement( entry ); settings->addToCompletion( entry ); m_sideBar->refreshLists( m_bibtexfile ); m_dirWatch.startScan(); - return TRUE; + return true; } else { delete entry; m_dirWatch.startScan(); - return FALSE; + return false; } } } @@ -593,10 +593,10 @@ namespace KBibTeX delete exporter; } - return TRUE; + return true; } - return FALSE; + return false; } void DocumentWidget::updateViews() @@ -626,10 +626,10 @@ namespace KBibTeX m_viewDocumentActionMenu = dynamic_cast<TDEActionMenu*>( client->action( "view_document" ) ); if ( m_viewDocumentActionMenu != NULL ) - connect( m_viewDocumentActionMenu->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( slotViewDocument( int ) ) ); + connect( m_viewDocumentActionMenu->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotViewDocument( int ) ) ); m_assignKeywordsActionMenu = dynamic_cast<TDEActionMenu*>( client->action( "assign_keywords" ) ); if ( m_assignKeywordsActionMenu != NULL ) - connect( m_assignKeywordsActionMenu->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( slotAssignKeywords( int ) ) ); + connect( m_assignKeywordsActionMenu->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotAssignKeywords( int ) ) ); m_actionEditCut = client->action( "edit_cut" ); m_actionEditCopy = client->action( "edit_copy" ); @@ -667,7 +667,7 @@ namespace KBibTeX if ( currentElement != NULL ) entry = dynamic_cast<BibTeX::Entry*>( currentElement ); - m_viewDocumentActionMenu->setEnabled( FALSE ); + m_viewDocumentActionMenu->setEnabled( false ); if ( entry != NULL ) { KURL::List documentURLs = getEntryURLs( entry ); @@ -676,17 +676,17 @@ namespace KBibTeX for ( KURL::List::Iterator i = documentURLs.begin(); i != documentURLs.end(); ++i ) { TQString prettyURL = ( *i ).prettyURL(); - if ( prettyURL.endsWith( ".pdf", FALSE ) || prettyURL.find( "/pdf/" ) > 0 ) + if ( prettyURL.endsWith( ".pdf", false ) || prettyURL.find( "/pdf/" ) > 0 ) popup->insertItem( SmallIcon( "application-pdf" ), prettyURL ); - else if ( prettyURL.endsWith( ".ps", FALSE ) ) + else if ( prettyURL.endsWith( ".ps", false ) ) popup->insertItem( SmallIcon( "application-postscript" ), prettyURL ); - else if ( prettyURL.endsWith( ".html", FALSE ) || prettyURL.startsWith( "http://", FALSE ) ) + else if ( prettyURL.endsWith( ".html", false ) || prettyURL.startsWith( "http://", false ) ) popup->insertItem( SmallIcon( "text-html" ), prettyURL ); else popup->insertItem( prettyURL ); m_viewDocumentActionMenuURLs.append( prettyURL ); } - m_viewDocumentActionMenu->setEnabled( TRUE ); + m_viewDocumentActionMenu->setEnabled( true ); } } } @@ -772,9 +772,9 @@ namespace KBibTeX /** * Build menu */ - bool popupEmpty = FALSE; + bool popupEmpty = false; if ( allKeywords.isEmpty() ) - popupEmpty = TRUE; + popupEmpty = true; else if ( allKeywords.count() < 24 ) { for ( TQStringList::Iterator it = allKeywords.begin(); it != allKeywords.end(); ++it ) @@ -789,7 +789,7 @@ namespace KBibTeX int maxCountPerSubMenu = ( int )sqrt( allKeywords.count() ) + 1; int countPerSubMenu = 0; TDEPopupMenu *subMenu = new TDEPopupMenu( popup ); - connect( subMenu, SIGNAL( activated( int ) ), this, SLOT( slotAssignKeywords( int ) ) ); + connect( subMenu, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotAssignKeywords( int ) ) ); TQString startWord, endWord; for ( TQStringList::Iterator it = allKeywords.begin(); it != allKeywords.end(); ++it ) { @@ -805,7 +805,7 @@ namespace KBibTeX { popup->insertItem( TQString( i18n( "%1 ... %2" ) ).arg( startWord ).arg( endWord ), subMenu ); subMenu = new TDEPopupMenu( popup ); - connect( subMenu, SIGNAL( activated( int ) ), this, SLOT( slotAssignKeywords( int ) ) ); + connect( subMenu, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotAssignKeywords( int ) ) ); countPerSubMenu = 0; } } @@ -833,7 +833,7 @@ namespace KBibTeX container->setFocusPolicy( TQWidget::ClickFocus ); popup->insertItem( container ); - connect( m_lineEditNewKeyword, SIGNAL( returnPressed() ), this, SLOT( slotAddKeyword() ) ); + connect( m_lineEditNewKeyword, TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( slotAddKeyword() ) ); } void DocumentWidget::deferredInitialization() @@ -878,7 +878,7 @@ namespace KBibTeX void DocumentWidget::executeElement( DocumentListViewItem* item ) { Settings * settings = Settings::self( m_bibtexfile ); - bool openingDocumentOK = FALSE; + bool openingDocumentOK = false; if ( settings->editing_MainListDoubleClickAction == 1 ) { @@ -953,7 +953,7 @@ namespace KBibTeX TQDialog::DialogCode dialogResult = TQDialog::Rejected; BibTeX::Entry * entry = dynamic_cast<BibTeX::Entry*>( element ); if ( entry ) - dialogResult = KBibTeX::EntryWidget::execute( entry, m_bibtexfile, m_isReadOnly, FALSE ); + dialogResult = KBibTeX::EntryWidget::execute( entry, m_bibtexfile, m_isReadOnly, false ); else { BibTeX::Comment * comment = dynamic_cast<BibTeX::Comment*>( element ); @@ -1141,15 +1141,15 @@ namespace KBibTeX { m_progressDialog = new TQProgressDialog( this ); m_progressDialog->setLabelText( label ); - connect( progressFrom, SIGNAL( progress( int, int ) ), this, SLOT( slotShowProgress( int, int ) ) ); - connect( m_progressDialog, SIGNAL( canceled() ), progressFrom, SLOT( cancel( ) ) ); + connect( progressFrom, TQ_SIGNAL( progress( int, int ) ), this, TQ_SLOT( slotShowProgress( int, int ) ) ); + connect( m_progressDialog, TQ_SIGNAL( canceled() ), progressFrom, TQ_SLOT( cancel( ) ) ); TQApplication::setOverrideCursor( TQt::waitCursor ); } void DocumentWidget::endProgress( TQObject * progressFrom ) { - disconnect( progressFrom, SIGNAL( progress( int, int ) ), this, SLOT( slotShowProgress( int, int ) ) ); - disconnect( m_progressDialog, SIGNAL( canceled() ), progressFrom, SLOT( cancel( ) ) ); + disconnect( progressFrom, TQ_SIGNAL( progress( int, int ) ), this, TQ_SLOT( slotShowProgress( int, int ) ) ); + disconnect( m_progressDialog, TQ_SIGNAL( canceled() ), progressFrom, TQ_SLOT( cancel( ) ) ); delete m_progressDialog; m_progressDialog = NULL; TQApplication::restoreOverrideCursor(); @@ -1330,15 +1330,15 @@ namespace KBibTeX BibTeX::FileImporter * importer = NULL; BibTeX::File::FileFormat format = BibTeX::File::formatUndefined; - if ( fileName.endsWith( ".bib", FALSE ) ) + if ( fileName.endsWith( ".bib", false ) ) format = BibTeX::File::formatBibTeX; - else if ( settings->external_xml2bibAvailable && settings->external_end2xmlAvailable && ( fileName.endsWith( ".ref", FALSE ) || fileName.endsWith( ".refer", FALSE ) || fileName.endsWith( ".txt", FALSE ) || fileName.endsWith( ".rfr", FALSE ) ) ) + else if ( settings->external_xml2bibAvailable && settings->external_end2xmlAvailable && ( fileName.endsWith( ".ref", false ) || fileName.endsWith( ".refer", false ) || fileName.endsWith( ".txt", false ) || fileName.endsWith( ".rfr", false ) ) ) format = BibTeX::File::formatEndNote; - else if ( settings->external_xml2bibAvailable && settings->external_end2xmlAvailable && ( fileName.endsWith( ".isi", FALSE ) || fileName.endsWith( ".cgi", FALSE ) ) ) + else if ( settings->external_xml2bibAvailable && settings->external_end2xmlAvailable && ( fileName.endsWith( ".isi", false ) || fileName.endsWith( ".cgi", false ) ) ) format = BibTeX::File::formatISI; - else if ( fileName.endsWith( ".ris", FALSE ) ) + else if ( fileName.endsWith( ".ris", false ) ) format = BibTeX::File::formatRIS; - else if ( fileName.endsWith( ".xml", FALSE ) ) + else if ( fileName.endsWith( ".xml", false ) ) { TQStringList options = TQStringList::split( '|', ( settings->external_xml2bibAvailable && settings->external_end2xmlAvailable ? "MODS|EndNote XML|internal XML" : "internal XML" ) ); bool ok = false; @@ -1459,7 +1459,7 @@ namespace KBibTeX void DocumentWidget::slotTabChanged( TQWidget *tab ) { - setEnabled( FALSE ); + setEnabled( false ); TQApplication::setOverrideCursor( TQt::waitCursor ); BibTeX::File *bibTeXFile = NULL; @@ -1485,9 +1485,9 @@ namespace KBibTeX if ( m_actionEditCut && m_actionEditCopy && m_actionEditPaste ) { - m_actionEditCut->setEnabled( TRUE ); - m_actionEditCopy->setEnabled( TRUE ); - m_actionEditPaste->setEnabled( TRUE ); + m_actionEditCut->setEnabled( true ); + m_actionEditCopy->setEnabled( true ); + m_actionEditPaste->setEnabled( true ); } } else if ( tab == m_container && m_editMode != emList ) @@ -1511,7 +1511,7 @@ namespace KBibTeX m_editMode = emList; } - setEnabled( TRUE ); + setEnabled( true ); if ( tab == m_sourceView ) m_sourceView->setFocus(); @@ -1545,14 +1545,14 @@ namespace KBibTeX if ( path == m_filename ) { m_dirWatch.removeFile( m_filename ); - TQTimer::singleShot( 100, this, SLOT( slotRefreshDirtyFile( ) ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( slotRefreshDirtyFile( ) ) ); } } void DocumentWidget::slotRefreshDirtyFile() { if ( KMessageBox::questionYesNo( this, TQString( i18n( "File '%1' has been modified. Reload file to import changes or ignore changes?" ) ).arg( m_filename ), i18n( "Reload file?" ), KGuiItem( i18n( "Reload" ), "reload" ), KGuiItem( i18n( "Ignore" ), "ignore" ) ) == KMessageBox::Yes ) - open( m_filename, FALSE ); + open( m_filename, false ); else m_dirWatch.addFile( m_filename ); } diff --git a/src/documentwidget.h b/src/documentwidget.h index 9256b96..9afe0a2 100644 --- a/src/documentwidget.h +++ b/src/documentwidget.h @@ -51,13 +51,13 @@ namespace KBibTeX class DocumentWidget : public TQTabWidget { - Q_OBJECT + TQ_OBJECT public: DocumentWidget( bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); ~DocumentWidget(); - bool open( const TQString &fileName, bool mergeOnly = FALSE ); - bool open( TQIODevice *iodevice, bool mergeOnly = FALSE, const TQString &label = TQString::null, BibTeX::FileImporter *importer = NULL ); + bool open( const TQString &fileName, bool mergeOnly = false ); + bool open( TQIODevice *iodevice, bool mergeOnly = false, const TQString &label = TQString::null, BibTeX::FileImporter *importer = NULL ); bool save( const TQString &fileName, TQStringList *errorLog = NULL ); bool save( TQIODevice *iodevice, BibTeX::File::FileFormat format = BibTeX::File::formatBibTeX, const TQString &label = TQString::null, TQStringList *errorLog = NULL ); diff --git a/src/element.cpp b/src/element.cpp index 9e813a0..0723702 100644 --- a/src/element.cpp +++ b/src/element.cpp @@ -38,11 +38,11 @@ namespace BibTeX bool Element::isSimpleString( const TQString &text ) { - bool result = TRUE; + bool result = true; const TQString goodChars = "abcdefghijklmnopqrstuvwxyz0123456789-_"; for ( unsigned int i = 0; result && i < text.length(); i++ ) - result &= goodChars.contains( text.at( i ), FALSE ); + result &= goodChars.contains( text.at( i ), false ); return result; } diff --git a/src/encoderxml.cpp b/src/encoderxml.cpp index bc85fe9..bc3d308 100644 --- a/src/encoderxml.cpp +++ b/src/encoderxml.cpp @@ -66,7 +66,7 @@ namespace BibTeX { int p2 = result.find( ";", p + 1 ); if ( p2 < 0 ) break; - bool ok = FALSE; + bool ok = false; int hex = result.mid( p + 3, p2 - p - 3 ).toInt( &ok, 16 ); if ( ok && hex > 0 ) result.replace( result.mid( p, p2 - p + 1 ), TQChar( hex ) ); @@ -80,7 +80,7 @@ namespace BibTeX { int p2 = result.find( ";", p + 1 ); if ( p2 < 0 ) break; - bool ok = FALSE; + bool ok = false; int dec = result.mid( p + 2, p2 - p - 2 ).toInt( &ok, 10 ); if ( ok && dec > 0 ) result.replace( result.mid( p, p2 - p + 1 ), TQChar( dec ) ); diff --git a/src/entry.cpp b/src/entry.cpp index a20d234..206318f 100644 --- a/src/entry.cpp +++ b/src/entry.cpp @@ -190,16 +190,16 @@ namespace BibTeX if ( plainText != NULL ) { TQString plain = plainText->text(); - int urlPos = plain.find( "\\url{", 0, FALSE ); + int urlPos = plain.find( "\\url{", 0, false ); if ( urlPos > -1 ) { plain = plain.mid( urlPos + 5 ); - urlPos = plain.find( "}", 0, FALSE ); + urlPos = plain.find( "}", 0, false ); if ( urlPos > 0 ) plain = plain.left( urlPos - 1 ); } - if ( fieldNames[ i ] == "doi" && !plain.startsWith( "http", FALSE ) ) + if ( fieldNames[ i ] == "doi" && !plain.startsWith( "http", false ) ) plain.prepend( "http://dx.doi.org/" ); result.append( plain ); @@ -213,7 +213,7 @@ namespace BibTeX bool Entry::addField( EntryField * field ) { m_fields.append( field ); - return TRUE; + return true; } EntryField* Entry::getField( const EntryField::FieldType fieldType ) const @@ -244,10 +244,10 @@ namespace BibTeX { delete( *it ); m_fields.remove( *it ); - return TRUE; + return true; } - return FALSE; + return false; } bool Entry::deleteField( const EntryField::FieldType fieldType ) @@ -257,10 +257,10 @@ namespace BibTeX { delete( *it ); m_fields.remove( it ); - return TRUE; + return true; } - return FALSE; + return false; } Entry::EntryFields::ConstIterator Entry::begin() const diff --git a/src/entry.h b/src/entry.h index 15386b9..e386805 100644 --- a/src/entry.h +++ b/src/entry.h @@ -59,7 +59,7 @@ namespace BibTeX void setId( const TQString& id ); TQString id() const; - bool containsPattern( const TQString& pattern, EntryField::FieldType fieldType = EntryField::ftUnknown, BibTeX::Element::FilterType filterType = BibTeX::Element::ftExact, bool caseSensitive = FALSE ) const; + bool containsPattern( const TQString& pattern, EntryField::FieldType fieldType = EntryField::ftUnknown, BibTeX::Element::FilterType filterType = BibTeX::Element::ftExact, bool caseSensitive = false ) const; TQStringList urls() const; bool addField( EntryField *field ); diff --git a/src/entrywidget.cpp b/src/entrywidget.cpp index c1af4b3..607caab 100644 --- a/src/entrywidget.cpp +++ b/src/entrywidget.cpp @@ -62,7 +62,7 @@ namespace KBibTeX { TQDialog::DialogCode EntryWidget::execute( BibTeX::Entry *entry, BibTeX::File *bibtexfile, bool isReadOnly, bool isNew, TQWidget *parent, const char *name ) { - EntryWidgetDialog *dlg = new EntryWidgetDialog( parent, name, TRUE, i18n( "Edit BibTeX Entry" ), KDialogBase::Ok | KDialogBase::Cancel ); + EntryWidgetDialog *dlg = new EntryWidgetDialog( parent, name, true, i18n( "Edit BibTeX Entry" ), KDialogBase::Ok | KDialogBase::Cancel ); EntryWidget *entryWidget = new EntryWidget( entry, bibtexfile, isReadOnly, isNew, dlg, "entryWidget" ); dlg->setMainWidget( entryWidget ); @@ -77,7 +77,7 @@ namespace KBibTeX EntryWidget::EntryWidget( BibTeX::File *bibtexfile, bool isReadOnly, bool isNew, TQDialog *parent, const char *name ) : TQWidget( parent, name ), m_originalEntry( NULL ), m_bibtexfile( bibtexfile ), m_isReadOnly( isReadOnly ), m_isNew( isNew ), m_lastPage( NULL ), m_dlgParent( parent ), m_wqa( new WebQueryArXiv( NULL ) ) { - setupGUI( parent, FALSE ); + setupGUI( parent, false ); Settings * settings = Settings::self(); m_checkBoxEnableAll->setChecked( settings->editing_EnableAllFields ); @@ -85,8 +85,8 @@ namespace KBibTeX m_pushButtonForceDefaultIdSuggestion->setEnabled( !m_isReadOnly && m_defaultIdSuggestionAvailable ); m_pushButtonIdSuggestions->setEnabled( !m_isReadOnly ); - connect( m_wqa, SIGNAL( foundEntry( BibTeX::Entry*, bool ) ), this, SLOT( useExternalEntry( BibTeX::Entry*, bool ) ) ); - connect( m_wqa, SIGNAL( endSearch( WebQuery::Status ) ), this, SLOT( endExternalSearch( WebQuery::Status ) ) ); + connect( m_wqa, TQ_SIGNAL( foundEntry( BibTeX::Entry*, bool ) ), this, TQ_SLOT( useExternalEntry( BibTeX::Entry*, bool ) ) ); + connect( m_wqa, TQ_SIGNAL( endSearch( WebQuery::Status ) ), this, TQ_SLOT( endExternalSearch( WebQuery::Status ) ) ); } EntryWidget::EntryWidget( BibTeX::Entry *entry, BibTeX::File *bibtexfile, bool isReadOnly, bool isNew, TQDialog *parent, const char *name ) @@ -102,8 +102,8 @@ namespace KBibTeX reset(); - connect( m_wqa, SIGNAL( foundEntry( BibTeX::Entry*, bool ) ), this, SLOT( useExternalEntry( BibTeX::Entry*, bool ) ) ); - connect( m_wqa, SIGNAL( endSearch( WebQuery::Status ) ), this, SLOT( endExternalSearch( WebQuery::Status ) ) ); + connect( m_wqa, TQ_SIGNAL( foundEntry( BibTeX::Entry*, bool ) ), this, TQ_SLOT( useExternalEntry( BibTeX::Entry*, bool ) ) ); + connect( m_wqa, TQ_SIGNAL( endSearch( WebQuery::Status ) ), this, TQ_SLOT( endExternalSearch( WebQuery::Status ) ) ); } EntryWidget::~EntryWidget() @@ -113,7 +113,7 @@ namespace KBibTeX delete m_wqa; - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup( "EntryWidget" ); saveWindowSize( config ); } @@ -125,7 +125,7 @@ namespace KBibTeX if ( ewt != NULL ) ewt->m_fieldLineEditTitle->setFocus(); - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup( "EntryWidget" ); restoreWindowSize( config ); } @@ -199,12 +199,12 @@ namespace KBibTeX m_pushButtonForceDefaultIdSuggestion->setOn( m_defaultIdSuggestionAvailable && settings->idSuggestions_forceDefault && m_isNew ); m_pushButtonForceDefaultIdSuggestion->setEnabled( !m_isReadOnly && m_defaultIdSuggestionAvailable ); - bool foundEntryType = FALSE; + bool foundEntryType = false; for ( int i = 0; !foundEntryType && i < m_comboBoxEntryType->count(); i++ ) if (( BibTeX::Entry::EntryType ) i + BibTeX::Entry::etArticle == entry->entryType() ) { m_comboBoxEntryType->setCurrentItem( i ); - foundEntryType = TRUE; + foundEntryType = true; } if ( !foundEntryType ) m_comboBoxEntryType->setCurrentText( entry->entryTypeString() ); @@ -217,7 +217,7 @@ namespace KBibTeX void EntryWidget::slotForceDefaultIdSuggestion() { - m_isNew = FALSE; + m_isNew = false; m_lineEditID->setEnabled( !m_pushButtonForceDefaultIdSuggestion->isOn() ); m_pushButtonIdSuggestions->setEnabled( !m_pushButtonForceDefaultIdSuggestion->isOn() && !m_isReadOnly ); updateWarnings(); @@ -241,10 +241,10 @@ namespace KBibTeX ( *it ) ->apply( &temporaryEntry ); m_sourcePage->reset( &temporaryEntry ); - m_comboBoxEntryType->setEnabled( FALSE ); - m_lineEditID->setEnabled( FALSE ); - m_pushButtonIdSuggestions->setEnabled( FALSE ); - m_pushButtonForceDefaultIdSuggestion->setEnabled( FALSE ); + m_comboBoxEntryType->setEnabled( false ); + m_lineEditID->setEnabled( false ); + m_pushButtonIdSuggestions->setEnabled( false ); + m_pushButtonForceDefaultIdSuggestion->setEnabled( false ); } else if ( m_lastPage == m_sourcePage ) { @@ -276,7 +276,7 @@ namespace KBibTeX updateWarnings(); } - m_comboBoxEntryType->setEnabled( TRUE ); + m_comboBoxEntryType->setEnabled( true ); m_lineEditID->setEnabled( !m_defaultIdSuggestionAvailable || !m_pushButtonForceDefaultIdSuggestion->isOn() ); m_pushButtonIdSuggestions->setEnabled(( !m_defaultIdSuggestionAvailable || !m_pushButtonForceDefaultIdSuggestion->isOn() ) && !m_isReadOnly ); m_pushButtonForceDefaultIdSuggestion->setEnabled( !m_isReadOnly && m_defaultIdSuggestionAvailable ); @@ -313,7 +313,7 @@ namespace KBibTeX // in the top row on the left, put an entry type label and combobox TQLabel *label = new TQLabel( i18n( "E&ntry Type:" ), this ); layout->addWidget( label, 0, 0 ); - m_comboBoxEntryType = new TQComboBox( TRUE, this, "m_comboBoxEntryType" ); + m_comboBoxEntryType = new TQComboBox( true, this, "m_comboBoxEntryType" ); label->setBuddy( m_comboBoxEntryType ); m_comboBoxEntryType->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed ); m_comboBoxEntryType->setEnabled( !m_isReadOnly ); @@ -331,12 +331,12 @@ namespace KBibTeX m_pushButtonIdSuggestions = new TQPushButton( TQIconSet( BarIcon( "wizard" ) ), "", this, "m_pushButtonIdSuggestions" ); m_menuIdSuggestions = new TQPopupMenu( m_pushButtonIdSuggestions ); - connect( m_menuIdSuggestions, SIGNAL( activated( int ) ), this, SLOT( insertIdSuggestion( int ) ) ); + connect( m_menuIdSuggestions, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( insertIdSuggestion( int ) ) ); m_pushButtonIdSuggestions->setPopup( m_menuIdSuggestions ); layout->addWidget( m_pushButtonIdSuggestions, 0, 4 ); m_pushButtonForceDefaultIdSuggestion = new TQPushButton( TQIconSet( BarIcon( "favorites" ) ), "", this, "m_pushButtonForceDefaultIdSuggestion" ); - m_pushButtonForceDefaultIdSuggestion->setToggleButton( TRUE ); + m_pushButtonForceDefaultIdSuggestion->setToggleButton( true ); layout->addWidget( m_pushButtonForceDefaultIdSuggestion, 0, 5 ); TQToolTip::add( m_pushButtonForceDefaultIdSuggestion, i18n( "Use the default id suggestion to set the entry id" ) ); TQWhatsThis::add( m_pushButtonForceDefaultIdSuggestion, i18n( "Use the default id suggestion to set the entry id.\nYou can edit and select the default id suggestion in the configuration dialog." ) ); @@ -352,7 +352,7 @@ namespace KBibTeX m_pushButtonRefetch = new TQPushButton( TDEGlobal::iconLoader() ->loadIconSet( "reload", TDEIcon::Small ), i18n( "Refetch" ), this ); layout->addWidget( m_pushButtonRefetch, 2, 5 ); - connect( m_pushButtonRefetch, SIGNAL( clicked() ), this, SLOT( refreshFromURL() ) ); + connect( m_pushButtonRefetch, TQ_SIGNAL( clicked() ), this, TQ_SLOT( refreshFromURL() ) ); if ( showWarnings ) { @@ -361,21 +361,21 @@ namespace KBibTeX m_listViewWarnings->addColumn( i18n( "Message" ) ); m_listViewWarnings->setAllColumnsShowFocus( true ); layout->addMultiCellWidget( m_listViewWarnings, 3, 3, 0, 5 ); - connect( m_listViewWarnings, SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), this, SLOT( warningsExecute( TQListViewItem* ) ) ); + connect( m_listViewWarnings, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), this, TQ_SLOT( warningsExecute( TQListViewItem* ) ) ); } else m_listViewWarnings = NULL; - connect( m_checkBoxEnableAll, SIGNAL( toggled( bool ) ), this, SLOT( slotEnableAllFields( ) ) ); - connect( m_comboBoxEntryType, SIGNAL( activated( int ) ), this, SLOT( slotEntryTypeChanged( ) ) ); - connect( m_pushButtonForceDefaultIdSuggestion, SIGNAL( toggled( bool ) ), this, SLOT( slotForceDefaultIdSuggestion() ) ); - connect( m_comboBoxEntryType, SIGNAL( textChanged( const TQString & ) ), this, SLOT( slotEntryTypeChanged() ) ); - connect( m_tabWidget, SIGNAL( currentChanged( TQWidget* ) ), this, SLOT( slotCurrentPageChanged( TQWidget* ) ) ); - connect( parent, SIGNAL( okClicked() ), this, SLOT( apply() ) ); - connect( m_menuIdSuggestions, SIGNAL( aboutToShow() ), this, SLOT( updateIdSuggestionsMenu() ) ); + connect( m_checkBoxEnableAll, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEnableAllFields( ) ) ); + connect( m_comboBoxEntryType, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotEntryTypeChanged( ) ) ); + connect( m_pushButtonForceDefaultIdSuggestion, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotForceDefaultIdSuggestion() ) ); + connect( m_comboBoxEntryType, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotEntryTypeChanged() ) ); + connect( m_tabWidget, TQ_SIGNAL( currentChanged( TQWidget* ) ), this, TQ_SLOT( slotCurrentPageChanged( TQWidget* ) ) ); + connect( parent, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( apply() ) ); + connect( m_menuIdSuggestions, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( updateIdSuggestionsMenu() ) ); m_updateWarningsTimer = new TQTimer( this ); - connect( m_updateWarningsTimer, SIGNAL( timeout() ), this, SLOT( updateWarnings() ) ); + connect( m_updateWarningsTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( updateWarnings() ) ); if ( !m_isReadOnly ) m_updateWarningsTimer->start( 500 ); } @@ -534,7 +534,7 @@ namespace KBibTeX m_idToSuggestion.insert( m_menuIdSuggestions->insertItem( *it ), *it ); if ( m_idToSuggestion.count() == 0 ) - m_menuIdSuggestions->setItemEnabled( m_menuIdSuggestions->insertItem( i18n( "No suggestions available" ) ), FALSE ); + m_menuIdSuggestions->setItemEnabled( m_menuIdSuggestions->insertItem( i18n( "No suggestions available" ) ), false ); } void EntryWidget::insertIdSuggestion( int id ) @@ -548,7 +548,7 @@ namespace KBibTeX int scnum = TQApplication::desktop()->screenNumber( parentWidget() ); TQRect desk = TQApplication::desktop()->screenGeometry( scnum ); int w, h; -#if defined Q_WS_X11 +#if defined TQ_WS_X11 // save maximalization as desktop size + 1 in that direction KWin::WindowInfo info = KWin::windowInfo( m_dlgParent->winId(), NET::WMState ); w = info.state() & NET::MaxHoriz ? desk.width() + 1 : m_dlgParent->width(); @@ -600,7 +600,7 @@ namespace KBibTeX } if ( !size.isEmpty() ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 int state = ( size.width() > desk.width() ? NET::MaxHoriz : 0 ) | ( size.height() > desk.height() ? NET::MaxVert : 0 ); if (( state & NET::Max ) == NET::Max ) diff --git a/src/entrywidget.h b/src/entrywidget.h index 29da6e7..2366847 100644 --- a/src/entrywidget.h +++ b/src/entrywidget.h @@ -48,7 +48,7 @@ namespace KBibTeX class EntryWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT friend class EntryWidgetDialog; @@ -108,7 +108,7 @@ namespace KBibTeX WebQueryArXiv *m_wqa; TQString m_oldId; - void setupGUI( TQWidget *parent, bool showWarnings = TRUE ); + void setupGUI( TQWidget *parent, bool showWarnings = true ); void addTabWidgets(); void addTabWidget( EntryWidgetTab *widget, const TQString& title ); void setupEntryTypes(); @@ -121,7 +121,7 @@ namespace KBibTeX class EntryWidgetDialog: public KDialogBase { - Q_OBJECT + TQ_OBJECT public: EntryWidgetDialog( TQWidget *parent = 0, const char *name = 0, bool modal = true, const TQString &caption = TQString::null, int buttonMask = Ok | Apply | Cancel ) : KDialogBase( parent, name, modal, caption, buttonMask ) {/* nothing */}; ~EntryWidgetDialog() {/* nothing */}; diff --git a/src/entrywidgetauthor.h b/src/entrywidgetauthor.h index c05d31f..bb2581e 100644 --- a/src/entrywidgetauthor.h +++ b/src/entrywidgetauthor.h @@ -34,7 +34,7 @@ namespace KBibTeX */ class EntryWidgetAuthor : public EntryWidgetTab { - Q_OBJECT + TQ_OBJECT public: EntryWidgetAuthor( BibTeX::File *bibtexfile, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); ~EntryWidgetAuthor(); diff --git a/src/entrywidgetexternal.cpp b/src/entrywidgetexternal.cpp index 3f5230a..bd6b8de 100644 --- a/src/entrywidgetexternal.cpp +++ b/src/entrywidgetexternal.cpp @@ -89,9 +89,9 @@ namespace KBibTeX void EntryWidgetExternal::reset( BibTeX::Entry *entry ) { - disconnect( m_fieldLineEditURL, SIGNAL( textChanged() ), this, SLOT( updateGUI() ) ); - disconnect( m_fieldLineEditDoi, SIGNAL( textChanged() ), this, SLOT( updateGUI() ) ); - disconnect( m_fieldLineEditLocalFile, SIGNAL( textChanged() ), this, SLOT( updateGUI() ) ); + disconnect( m_fieldLineEditURL, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( updateGUI() ) ); + disconnect( m_fieldLineEditDoi, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( updateGUI() ) ); + disconnect( m_fieldLineEditLocalFile, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( updateGUI() ) ); BibTeX::EntryField * field = entry->getField( BibTeX::EntryField::ftURL ); @@ -105,9 +105,9 @@ namespace KBibTeX updateGUI(); - connect( m_fieldLineEditURL, SIGNAL( textChanged() ), this, SLOT( updateGUI() ) ); - connect( m_fieldLineEditDoi, SIGNAL( textChanged() ), this, SLOT( updateGUI() ) ); - connect( m_fieldLineEditLocalFile, SIGNAL( textChanged() ), this, SLOT( updateGUI() ) ); + connect( m_fieldLineEditURL, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( updateGUI() ) ); + connect( m_fieldLineEditDoi, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( updateGUI() ) ); + connect( m_fieldLineEditLocalFile, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( updateGUI() ) ); } void EntryWidgetExternal::updateWarnings( BibTeX::Entry::EntryType entryType, TQListView *listViewWarnings ) @@ -132,7 +132,7 @@ namespace KBibTeX if ( url.isValid() ) Settings::openUrl( url, this ); else - m_pushButtonOpenURL->setEnabled( FALSE ); + m_pushButtonOpenURL->setEnabled( false ); } void EntryWidgetExternal::openURL( const TQString &url ) @@ -147,7 +147,7 @@ namespace KBibTeX if ( url.isValid() ) Settings::openUrl( url, this ); else - m_pushButtonOpenDoi->setEnabled( FALSE ); + m_pushButtonOpenDoi->setEnabled( false ); } void EntryWidgetExternal::openLocalFile() @@ -157,7 +157,7 @@ namespace KBibTeX if ( url.isValid() ) Settings::openUrl( url, this ); else - m_pushButtonOpenLocalFile->setEnabled( FALSE ); + m_pushButtonOpenLocalFile->setEnabled( false ); } void EntryWidgetExternal::browseLocalFile( int id ) @@ -226,14 +226,14 @@ namespace KBibTeX m_fieldLineEditURL->setFieldType( BibTeX::EntryField::ftURL ); gridLayout->addWidget( m_fieldLineEditURL, 0, 1 ); label->setBuddy( m_fieldLineEditURL ); - connect( m_fieldLineEditURL, SIGNAL( textChanged() ), this, SLOT( updateGUI() ) ); + connect( m_fieldLineEditURL, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( updateGUI() ) ); m_pushButtonOpenURL = new KPushButton( this ); gridLayout->addWidget( m_pushButtonOpenURL, 0, 2 ); m_pushButtonOpenURL->setIconSet( TQIconSet( SmallIcon( "document-open" ) ) ); m_pushButtonOpenURL->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); TQToolTip::add( m_pushButtonOpenURL, TQString( i18n( "Open %1" ) ).arg( i18n( "URL" ) ) ); - connect( m_pushButtonOpenURL, SIGNAL( clicked() ), this, SLOT( openURL() ) ); + connect( m_pushButtonOpenURL, TQ_SIGNAL( clicked() ), this, TQ_SLOT( openURL() ) ); KURLLabel *urllabel = new KURLLabel( "http://www.doi.org/", TQString( "%1:" ).arg( i18n( "DOI" ) ), this ); TQToolTip::add( urllabel, i18n( "Digital Object Identifier" ) ); @@ -243,15 +243,15 @@ namespace KBibTeX m_fieldLineEditDoi->setFieldType( BibTeX::EntryField::ftDoi ); gridLayout->addWidget( m_fieldLineEditDoi, 1, 1 ); urllabel->setBuddy( m_fieldLineEditDoi ); - connect( m_fieldLineEditDoi, SIGNAL( textChanged() ), this, SLOT( updateGUI() ) ); - connect( urllabel, SIGNAL( leftClickedURL( const TQString& ) ), this, SLOT( openURL( const TQString& ) ) ); + connect( m_fieldLineEditDoi, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( updateGUI() ) ); + connect( urllabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ), this, TQ_SLOT( openURL( const TQString& ) ) ); m_pushButtonOpenDoi = new KPushButton( this ); gridLayout->addWidget( m_pushButtonOpenDoi, 1, 2 ); m_pushButtonOpenDoi->setIconSet( TQIconSet( SmallIcon( "document-open" ) ) ); m_pushButtonOpenDoi->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); TQToolTip::add( m_pushButtonOpenDoi, i18n( "Open DOI" ) ); - connect( m_pushButtonOpenDoi, SIGNAL( clicked() ), this, SLOT( openDoi() ) ); + connect( m_pushButtonOpenDoi, TQ_SIGNAL( clicked() ), this, TQ_SLOT( openDoi() ) ); label = new TQLabel( TQString( "%1:" ).arg( i18n( "Local File" ) ), this ); gridLayout->addWidget( label, 2, 0 ); @@ -259,14 +259,14 @@ namespace KBibTeX m_fieldLineEditLocalFile->setFieldType( BibTeX::EntryField::ftLocalFile ); gridLayout->addWidget( m_fieldLineEditLocalFile, 2, 1 ); label->setBuddy( m_fieldLineEditLocalFile ); - connect( m_fieldLineEditLocalFile, SIGNAL( textChanged() ), this, SLOT( updateGUI() ) ); + connect( m_fieldLineEditLocalFile, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( updateGUI() ) ); m_pushButtonOpenLocalFile = new KPushButton( this ); gridLayout->addWidget( m_pushButtonOpenLocalFile, 2, 2 ); m_pushButtonOpenLocalFile->setIconSet( TQIconSet( SmallIcon( "document-open" ) ) ); m_pushButtonOpenLocalFile->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); TQToolTip::add( m_pushButtonOpenLocalFile, TQString( i18n( "Open %1" ) ).arg( i18n( "Local File" ) ) ); - connect( m_pushButtonOpenLocalFile, SIGNAL( clicked() ), this, SLOT( openLocalFile() ) ); + connect( m_pushButtonOpenLocalFile, TQ_SIGNAL( clicked() ), this, TQ_SLOT( openLocalFile() ) ); TQWidget *container = new TQWidget( this ); TQHBoxLayout *containerLayout = new TQHBoxLayout( container ); @@ -291,7 +291,7 @@ namespace KBibTeX menu->insertItem( TQIconSet( SmallIcon( "folder" ) ), *it, i ); } m_pushButtonBrowseLocalFile->setPopup( menu ); - connect( menu, SIGNAL( activated( int ) ), this, SLOT( browseLocalFile( int ) ) ); + connect( menu, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( browseLocalFile( int ) ) ); } } #include "entrywidgetexternal.moc" diff --git a/src/entrywidgetexternal.h b/src/entrywidgetexternal.h index da764c6..cb88bfc 100644 --- a/src/entrywidgetexternal.h +++ b/src/entrywidgetexternal.h @@ -35,7 +35,7 @@ namespace KBibTeX */ class EntryWidgetExternal : public EntryWidgetTab { - Q_OBJECT + TQ_OBJECT public: EntryWidgetExternal( BibTeX::File *bibtexfile, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); ~EntryWidgetExternal(); diff --git a/src/entrywidgetkeyword.cpp b/src/entrywidgetkeyword.cpp index 8a40c71..c1537fa 100644 --- a/src/entrywidgetkeyword.cpp +++ b/src/entrywidgetkeyword.cpp @@ -63,7 +63,7 @@ namespace KBibTeX } } - EntryWidgetKeyword::EntryWidgetKeyword( BibTeX::File *bibtexfile, bool isReadOnly, TQWidget *parent, const char *name ) : EntryWidgetTab( bibtexfile, isReadOnly, parent, name ), m_bibtexfile( bibtexfile ), m_isModified( FALSE ), m_numKeywords( 0 ) + EntryWidgetKeyword::EntryWidgetKeyword( BibTeX::File *bibtexfile, bool isReadOnly, TQWidget *parent, const char *name ) : EntryWidgetTab( bibtexfile, isReadOnly, parent, name ), m_bibtexfile( bibtexfile ), m_isModified( false ), m_numKeywords( 0 ) { setupGUI(); } @@ -158,7 +158,7 @@ namespace KBibTeX if ( text.isEmpty() ) { item->setText( 0, m_beforeRenaming ); - kwlvi->setOn( FALSE ); + kwlvi->setOn( false ); } else if ( text != m_beforeRenaming ) { @@ -183,16 +183,16 @@ namespace KBibTeX } TQCheckListItem *checkedItem = dynamic_cast<TQCheckListItem*>( item ); if ( checkedItem != NULL ) - checkedItem->setOn( TRUE ); + checkedItem->setOn( true ); } } } void EntryWidgetKeyword::slotNewKeyword() { - KeywordListViewItem * item = new KeywordListViewItem( m_listviewKeywords, TQString( i18n( "May only contain ASCII characters, in case of doubt keep English form", "NewKeyword%1" ) ).arg( ++m_numKeywords ), FALSE ); - m_listviewKeywords->setSelected( item, TRUE ); - TQTimer::singleShot( 100, this, SLOT( slotEditKeyword() ) ); + KeywordListViewItem * item = new KeywordListViewItem( m_listviewKeywords, TQString( i18n( "May only contain ASCII characters, in case of doubt keep English form", "NewKeyword%1" ) ).arg( ++m_numKeywords ), false ); + m_listviewKeywords->setSelected( item, true ); + TQTimer::singleShot( 100, this, TQ_SLOT( slotEditKeyword() ) ); } void EntryWidgetKeyword::slotEditKeyword() @@ -230,31 +230,31 @@ namespace KBibTeX m_listviewKeywords->addColumn( i18n( "Keyword" ) ); m_listviewKeywords->addColumn( i18n( "Origin" ) ); gridLayout->addMultiCellWidget( m_listviewKeywords, 0, 4, 0, 0 ); - m_listviewKeywords->setAllColumnsShowFocus( TRUE ); - connect( m_listviewKeywords, SIGNAL( currentChanged( TQListViewItem* ) ), this, SLOT( slotSelectionChanged() ) ); - connect( m_listviewKeywords, SIGNAL( clicked( TQListViewItem * ) ), this, SLOT( slotSelectionChanged() ) ); - connect( m_listviewKeywords, SIGNAL( itemRenamed( TQListViewItem*, const TQString&, int ) ), this, SLOT( slotKeywordRenamed( TQListViewItem*, const TQString&, int ) ) ); + m_listviewKeywords->setAllColumnsShowFocus( true ); + connect( m_listviewKeywords, TQ_SIGNAL( currentChanged( TQListViewItem* ) ), this, TQ_SLOT( slotSelectionChanged() ) ); + connect( m_listviewKeywords, TQ_SIGNAL( clicked( TQListViewItem * ) ), this, TQ_SLOT( slotSelectionChanged() ) ); + connect( m_listviewKeywords, TQ_SIGNAL( itemRenamed( TQListViewItem*, const TQString&, int ) ), this, TQ_SLOT( slotKeywordRenamed( TQListViewItem*, const TQString&, int ) ) ); m_buttonNew = new TQPushButton( i18n( "keyword", "New" ), this ); m_buttonNew->setEnabled( !m_isReadOnly ); m_buttonNew->setIconSet( TQIconSet( SmallIcon( "add" ) ) ); TQToolTip::add( m_buttonNew, i18n( "Add a new keyword to the list" ) ); gridLayout->addWidget( m_buttonNew, 0, 1 ); - connect( m_buttonNew, SIGNAL( clicked() ), this, SLOT( slotNewKeyword() ) ); + connect( m_buttonNew, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotNewKeyword() ) ); m_buttonEdit = new TQPushButton( i18n( "keyword", "Edit" ), this ); m_buttonEdit->setIconSet( TQIconSet( SmallIcon( "edit" ) ) ); TQToolTip::add( m_buttonEdit, i18n( "Edit the selected keyword" ) ); gridLayout->addWidget( m_buttonEdit, 1, 1 ); - m_buttonEdit->setEnabled( FALSE ); - connect( m_buttonEdit, SIGNAL( clicked() ), this, SLOT( slotEditKeyword() ) ); + m_buttonEdit->setEnabled( false ); + connect( m_buttonEdit, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEditKeyword() ) ); m_buttonToggleGlobal = new TQPushButton( i18n( "keyword", "Toggle &global" ), this ); m_buttonToggleGlobal->setIconSet( TQIconSet( SmallIcon( "package" ) ) ); TQToolTip::add( m_buttonToggleGlobal, i18n( "Add or remove the selected keyword to or from the global list" ) ); gridLayout->addWidget( m_buttonToggleGlobal, 2, 1 ); - m_buttonToggleGlobal->setEnabled( FALSE ); - connect( m_buttonToggleGlobal, SIGNAL( clicked() ), this, SLOT( slotToggleGlobal() ) ); + m_buttonToggleGlobal->setEnabled( false ); + connect( m_buttonToggleGlobal, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotToggleGlobal() ) ); TQLabel *label = new TQLabel( i18n( "There is no need to delete keywords. Simply uncheck unwanted keywords and make them non-global.\nGlobal keywords can also be edited in the settings dialog." ), this ); label->setAlignment( TQLabel::WordBreak | TQLabel::AlignTop ); @@ -269,7 +269,7 @@ namespace KBibTeX { KeywordListViewItem *item = new KeywordListViewItem( m_listviewKeywords, *it, m_globalKeywords.contains( *it ) ); if ( m_usedKeywords.contains( *it ) ) - item->setOn( TRUE ); + item->setOn( true ); } } diff --git a/src/entrywidgetkeyword.h b/src/entrywidgetkeyword.h index 91e3f77..895784f 100644 --- a/src/entrywidgetkeyword.h +++ b/src/entrywidgetkeyword.h @@ -48,7 +48,7 @@ namespace KBibTeX */ class EntryWidgetKeyword : public EntryWidgetTab { - Q_OBJECT + TQ_OBJECT public: EntryWidgetKeyword( BibTeX::File *bibtexfile, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); ~EntryWidgetKeyword(); diff --git a/src/entrywidgetmisc.h b/src/entrywidgetmisc.h index f06bc82..ca0360c 100644 --- a/src/entrywidgetmisc.h +++ b/src/entrywidgetmisc.h @@ -28,7 +28,7 @@ namespace KBibTeX class EntryWidgetMisc : public EntryWidgetTab { - Q_OBJECT + TQ_OBJECT public: EntryWidgetMisc( BibTeX::File *bibtexfile, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); ~EntryWidgetMisc(); diff --git a/src/entrywidgetother.cpp b/src/entrywidgetother.cpp index 6fdc23b..186a50f 100644 --- a/src/entrywidgetother.cpp +++ b/src/entrywidgetother.cpp @@ -40,7 +40,7 @@ namespace KBibTeX { EntryWidgetOther::EntryWidgetOther( BibTeX::File *bibtexfile, bool isReadOnly, TQWidget *parent, const char *name ) - : EntryWidgetTab( bibtexfile, isReadOnly, parent, name ), m_isModified( FALSE ) + : EntryWidgetTab( bibtexfile, isReadOnly, parent, name ), m_isModified( false ) { setupGUI(); } @@ -91,7 +91,7 @@ namespace KBibTeX } } - m_isModified = FALSE; + m_isModified = false; } void EntryWidgetOther::reset( BibTeX::Entry *entry ) @@ -113,7 +113,7 @@ namespace KBibTeX new ValueListViewItem( field->fieldTypeName(), field->value(), m_listViewFields ); } - m_isModified = FALSE; + m_isModified = false; } void EntryWidgetOther::updateWarnings( BibTeX::Entry::EntryType /*entryType*/, TQListView * /*listViewWarnings*/ ) @@ -153,7 +153,7 @@ namespace KBibTeX m_listViewFields->addColumn( i18n( "Key" ) ); m_listViewFields->addColumn( i18n( "Value" ) ); m_listViewFields->setAllColumnsShowFocus( true ); - m_listViewFields->setFullWidth( TRUE ); + m_listViewFields->setFullWidth( true ); gridLayout->addMultiCellWidget( m_listViewFields, 3, 5, 1, 1 ); label = new TQLabel( i18n( "&List:" ), this ); @@ -172,16 +172,16 @@ namespace KBibTeX spacer = new TQSpacerItem( 20, 110, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); gridLayout->addItem( spacer, 5, 2 ); - m_pushButtonOpen->setEnabled( FALSE ); - m_pushButtonAdd->setEnabled( FALSE ); - m_pushButtonDelete->setEnabled( FALSE ); + m_pushButtonOpen->setEnabled( false ); + m_pushButtonAdd->setEnabled( false ); + m_pushButtonDelete->setEnabled( false ); - connect( m_listViewFields, SIGNAL( clicked( TQListViewItem*, const TQPoint&, int ) ), this, SLOT( fieldExecute( TQListViewItem* ) ) ); - connect( m_lineEditKey, SIGNAL( textChanged( const TQString& ) ), this, SLOT( updateGUI() ) ); - connect( m_fieldLineEditValue, SIGNAL( textChanged( ) ), this, SLOT( updateGUI() ) ); - connect( m_pushButtonAdd, SIGNAL( clicked( ) ), this, SLOT( addClicked( ) ) ); - connect( m_pushButtonDelete, SIGNAL( clicked( ) ), this, SLOT( deleteClicked( ) ) ); - connect( m_pushButtonOpen, SIGNAL( clicked() ), this, SLOT( openClicked() ) ); + connect( m_listViewFields, TQ_SIGNAL( clicked( TQListViewItem*, const TQPoint&, int ) ), this, TQ_SLOT( fieldExecute( TQListViewItem* ) ) ); + connect( m_lineEditKey, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( updateGUI() ) ); + connect( m_fieldLineEditValue, TQ_SIGNAL( textChanged( ) ), this, TQ_SLOT( updateGUI() ) ); + connect( m_pushButtonAdd, TQ_SIGNAL( clicked( ) ), this, TQ_SLOT( addClicked( ) ) ); + connect( m_pushButtonDelete, TQ_SIGNAL( clicked( ) ), this, TQ_SLOT( deleteClicked( ) ) ); + connect( m_pushButtonOpen, TQ_SIGNAL( clicked() ), this, TQ_SLOT( openClicked() ) ); } void EntryWidgetOther::updateGUI() @@ -192,7 +192,7 @@ namespace KBibTeX bool isUnknown = BibTeX::EntryField::fieldTypeFromString( text ) == BibTeX::EntryField::ftUnknown; if ( contains ) - m_listViewFields->setSelected( item, TRUE ); + m_listViewFields->setSelected( item, true ); else m_listViewFields->clearSelection(); @@ -201,7 +201,7 @@ namespace KBibTeX m_pushButtonAdd->setText( contains ? i18n( "&Apply" ) : i18n( "&Add" ) ); m_pushButtonAdd->setIconSet( TQIconSet( SmallIcon( contains ? "apply" : "document-open" ) ) ); - bool validURL = FALSE; + bool validURL = false; if ( contains ) { KURL url = Settings::locateFile( item->text( 1 ), m_bibtexfile->fileName, this ); @@ -234,7 +234,7 @@ namespace KBibTeX updateGUI(); - m_isModified = TRUE; + m_isModified = true; } void EntryWidgetOther::deleteClicked() @@ -249,7 +249,7 @@ namespace KBibTeX updateGUI(); } - m_isModified = TRUE; + m_isModified = true; } void EntryWidgetOther::openClicked() @@ -261,7 +261,7 @@ namespace KBibTeX delete value; } else - m_fieldLineEditValue->setEnabled( FALSE ); + m_fieldLineEditValue->setEnabled( false ); } ValueListViewItem::ValueListViewItem( const TQString& title, BibTeX::Value *value, TQListView *parent ) diff --git a/src/entrywidgetother.h b/src/entrywidgetother.h index 7829ae8..45531fb 100644 --- a/src/entrywidgetother.h +++ b/src/entrywidgetother.h @@ -38,7 +38,7 @@ namespace KBibTeX */ class EntryWidgetOther : public EntryWidgetTab { - Q_OBJECT + TQ_OBJECT public: EntryWidgetOther( BibTeX::File *bibtexfile, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); ~EntryWidgetOther(); diff --git a/src/entrywidgetpublication.cpp b/src/entrywidgetpublication.cpp index d68dcde..09f6c7c 100644 --- a/src/entrywidgetpublication.cpp +++ b/src/entrywidgetpublication.cpp @@ -255,7 +255,7 @@ namespace KBibTeX void EntryWidgetPublication::updateWarnings( BibTeX::Entry::EntryType entryType, TQListView *listViewWarnings ) { - bool crossRefValid = FALSE; + bool crossRefValid = false; BibTeX::Value *value = NULL; addMissingWarning( entryType, BibTeX::EntryField::ftHowPublished, m_fieldLineEditHowPublished->caption(), !m_fieldLineEditHowPublished->isEmpty(), m_fieldLineEditHowPublished, listViewWarnings ); @@ -471,7 +471,7 @@ namespace KBibTeX m_fieldLineEditCrossRef->setFieldType( BibTeX::EntryField::ftCrossRef ); label->setBuddy( m_fieldLineEditCrossRef ); gridLayout->addWidget( m_fieldLineEditCrossRef, 8, 1 ); - connect( m_fieldLineEditCrossRef, SIGNAL( textChanged() ), this, SLOT( slotSetCrossRefEntry() ) ); + connect( m_fieldLineEditCrossRef, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( slotSetCrossRefEntry() ) ); label = new TQLabel( TQString( "%1:" ).arg( i18n( "Organization" ) ), this ); gridLayout->addWidget( label, 0, 3 ); @@ -528,7 +528,7 @@ namespace KBibTeX m_fieldLineEditISBN ->setFieldType( BibTeX::EntryField::ftISBN ); label->setBuddy( m_fieldLineEditISBN ); innerLayout->addWidget( m_fieldLineEditISBN ); - connect( m_pushButtonISBN, SIGNAL( clicked() ), this, SLOT( slotOpenISBN() ) ); + connect( m_pushButtonISBN, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOpenISBN() ) ); label = new TQLabel( TQString( "%1:" ).arg( i18n( "ISSN" ) ), this ); gridLayout->addWidget( label, 7, 3 ); @@ -548,7 +548,7 @@ namespace KBibTeX for ( int i = 0; i < 12; i++ ) menuMonths->insertItem( BibTeX::Months[ i ], i ); m_pushButtonMonths->setPopup( menuMonths ); - connect( menuMonths, SIGNAL( activated( int ) ), this, SLOT( slotSetMonth( int ) ) ); + connect( menuMonths, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotSetMonth( int ) ) ); } TQString EntryWidgetPublication::isbn() const diff --git a/src/entrywidgetpublication.h b/src/entrywidgetpublication.h index 9d5b2b7..f655afe 100644 --- a/src/entrywidgetpublication.h +++ b/src/entrywidgetpublication.h @@ -30,7 +30,7 @@ namespace KBibTeX class EntryWidgetPublication : public EntryWidgetTab { - Q_OBJECT + TQ_OBJECT public: EntryWidgetPublication( BibTeX::File *bibtexfile, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); ~EntryWidgetPublication(); diff --git a/src/entrywidgetsource.cpp b/src/entrywidgetsource.cpp index 6f543e7..d0f11dd 100644 --- a/src/entrywidgetsource.cpp +++ b/src/entrywidgetsource.cpp @@ -154,7 +154,7 @@ namespace KBibTeX KPushButton *btnReset = new KPushButton( i18n( "Restore" ), this ); gridLayout->addWidget( btnReset, 1, 1 ); - connect( btnReset, SIGNAL( clicked() ), this, SLOT( restore() ) ); + connect( btnReset, TQ_SIGNAL( clicked() ), this, TQ_SLOT( restore() ) ); } } diff --git a/src/entrywidgetsource.h b/src/entrywidgetsource.h index aff579f..0656163 100644 --- a/src/entrywidgetsource.h +++ b/src/entrywidgetsource.h @@ -32,7 +32,7 @@ namespace KBibTeX */ class EntryWidgetSource : public EntryWidgetTab { - Q_OBJECT + TQ_OBJECT public: EntryWidgetSource( BibTeX::File *bibtexfile, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); ~EntryWidgetSource(); diff --git a/src/entrywidgettab.h b/src/entrywidgettab.h index e8c24f6..c214240 100644 --- a/src/entrywidgettab.h +++ b/src/entrywidgettab.h @@ -33,7 +33,7 @@ namespace KBibTeX class EntryWidgetTab : public TQWidget { - Q_OBJECT + TQ_OBJECT public: EntryWidgetTab( BibTeX::File *bibtexfile, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); ~EntryWidgetTab(); diff --git a/src/entrywidgettitle.cpp b/src/entrywidgettitle.cpp index da7d669..d3d1a5e 100644 --- a/src/entrywidgettitle.cpp +++ b/src/entrywidgettitle.cpp @@ -90,7 +90,7 @@ namespace KBibTeX void EntryWidgetTitle::updateWarnings( BibTeX::Entry::EntryType entryType, TQListView *listViewWarnings ) { - bool crossRefValid = FALSE; + bool crossRefValid = false; addMissingWarning( entryType, BibTeX::EntryField::ftTitle, m_fieldLineEditTitle->caption(), !m_fieldLineEditTitle->isEmpty(), m_fieldLineEditTitle, listViewWarnings ); diff --git a/src/entrywidgettitle.h b/src/entrywidgettitle.h index c233556..4035e23 100644 --- a/src/entrywidgettitle.h +++ b/src/entrywidgettitle.h @@ -28,7 +28,7 @@ namespace KBibTeX class EntryWidgetTitle : public EntryWidgetTab { - Q_OBJECT + TQ_OBJECT public: EntryWidgetTitle( BibTeX::File *bibtexfile, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); ~EntryWidgetTitle(); diff --git a/src/entrywidgetuserdefined.cpp b/src/entrywidgetuserdefined.cpp index e02d067..118f3aa 100644 --- a/src/entrywidgetuserdefined.cpp +++ b/src/entrywidgetuserdefined.cpp @@ -43,8 +43,8 @@ namespace KBibTeX bool EntryWidgetUserDefined::isModified() { - bool result = FALSE; - for ( TQValueList<FieldLineEdit*>::iterator it = m_widgets.begin(); !FALSE && it != m_widgets.end(); ++it ) + bool result = false; + for ( TQValueList<FieldLineEdit*>::iterator it = m_widgets.begin(); !false && it != m_widgets.end(); ++it ) result |= ( *it )->isModified(); return result; } diff --git a/src/entrywidgetuserdefined.h b/src/entrywidgetuserdefined.h index 6affcf8..27b488b 100644 --- a/src/entrywidgetuserdefined.h +++ b/src/entrywidgetuserdefined.h @@ -30,7 +30,7 @@ namespace KBibTeX */ class EntryWidgetUserDefined : public EntryWidgetTab { - Q_OBJECT + TQ_OBJECT public: EntryWidgetUserDefined( BibTeX::File *bibtexfile, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); ~EntryWidgetUserDefined(); diff --git a/src/fieldlineedit.cpp b/src/fieldlineedit.cpp index 910ea12..29aa3c0 100644 --- a/src/fieldlineedit.cpp +++ b/src/fieldlineedit.cpp @@ -38,7 +38,7 @@ namespace KBibTeX { FieldLineEdit::FieldLineEdit( const TQString& caption, InputType inputType, bool isReadOnly, TQWidget *parent, const char *name ) - : TQWidget( parent, name ), m_value( new BibTeX::Value() ), m_caption( caption ), m_lineEdit( NULL ), m_textEdit( NULL ), m_isReadOnly( isReadOnly ), m_enabled( TRUE ), m_inputType( inputType ), m_isModified( FALSE ), m_fieldType( BibTeX::EntryField::ftUnknown ), m_completion( NULL ) + : TQWidget( parent, name ), m_value( new BibTeX::Value() ), m_caption( caption ), m_lineEdit( NULL ), m_textEdit( NULL ), m_isReadOnly( isReadOnly ), m_enabled( true ), m_inputType( inputType ), m_isModified( false ), m_fieldType( BibTeX::EntryField::ftUnknown ), m_completion( NULL ) { setupGUI( name ); } @@ -59,7 +59,7 @@ namespace KBibTeX m_value = new BibTeX::Value(); updateGUI(); - m_isModified = FALSE; + m_isModified = false; } BibTeX::Value *FieldLineEdit::value() @@ -149,7 +149,7 @@ namespace KBibTeX else m_value->items.append( new BibTeX::PlainText( text ) ); } - m_isModified = TRUE; + m_isModified = true; } updateGUI(); @@ -195,7 +195,7 @@ namespace KBibTeX updateGUI(); emit textChanged(); - m_isModified = TRUE; + m_isModified = true; } void FieldLineEdit::slotComplexClicked() @@ -204,7 +204,7 @@ namespace KBibTeX { updateGUI(); emit textChanged(); - m_isModified = TRUE; + m_isModified = true; } } @@ -224,10 +224,10 @@ namespace KBibTeX m_pushButtonString = new TQPushButton( this, subname ); m_pushButtonString->setIconSet( TQIconSet( SmallIcon( "flag" ) ) ); m_pushButtonString->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); - m_pushButtonString->setToggleButton( TRUE ); + m_pushButtonString->setToggleButton( true ); TQToolTip::add( m_pushButtonString, TQString( i18n( "Set '%1' to be a string key" ) ).arg( m_caption ) ); m_pushButtonString->setEnabled( !m_isReadOnly ); - connect( m_pushButtonString, SIGNAL( clicked() ), this, SLOT( slotStringToggled() ) ); + connect( m_pushButtonString, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotStringToggled() ) ); if ( subname != NULL ) { @@ -238,7 +238,7 @@ namespace KBibTeX m_pushButtonComplex->setIconSet( TQIconSet( SmallIcon( "format-justify-left" ) ) ); m_pushButtonComplex->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); TQToolTip::add( m_pushButtonComplex, TQString( i18n( "Edit '%1' as a concatenated value" ) ).arg( m_caption ) ); - connect( m_pushButtonComplex, SIGNAL( clicked() ), this, SLOT( slotComplexClicked() ) ); + connect( m_pushButtonComplex, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotComplexClicked() ) ); TQGridLayout * layout = NULL; switch ( m_inputType ) @@ -290,12 +290,12 @@ namespace KBibTeX if ( subname != NULL ) delete[] subname; - enableSignals( TRUE ); + enableSignals( true ); } void FieldLineEdit::updateGUI() { - enableSignals( FALSE ); + enableSignals( false ); bool inputEnable = ( m_value->items.count() <= 1 ) && m_enabled; m_pushButtonString->setEnabled( inputEnable && !m_isReadOnly ); @@ -344,7 +344,7 @@ namespace KBibTeX break; } - enableSignals( TRUE ); + enableSignals( true ); } void FieldLineEdit::enableSignals( bool enabled ) @@ -353,15 +353,15 @@ namespace KBibTeX { case itSingleLine: if ( enabled ) - connect( m_lineEdit, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChanged( ) ) ); + connect( m_lineEdit, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotTextChanged( ) ) ); else - disconnect( m_lineEdit, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChanged( ) ) ); + disconnect( m_lineEdit, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotTextChanged( ) ) ); break; case itMultiLine: if ( enabled ) - connect( m_textEdit, SIGNAL( textChanged( ) ), this, SLOT( slotTextChanged( ) ) ); + connect( m_textEdit, TQ_SIGNAL( textChanged( ) ), this, TQ_SLOT( slotTextChanged( ) ) ); else - disconnect( m_textEdit, SIGNAL( textChanged( ) ), this, SLOT( slotTextChanged( ) ) ); + disconnect( m_textEdit, TQ_SIGNAL( textChanged( ) ), this, TQ_SLOT( slotTextChanged( ) ) ); break; } } diff --git a/src/fieldlineedit.h b/src/fieldlineedit.h index f8cd7ff..60f4185 100644 --- a/src/fieldlineedit.h +++ b/src/fieldlineedit.h @@ -34,12 +34,12 @@ namespace KBibTeX { class FieldLineEdit : public TQWidget { - Q_OBJECT + TQ_OBJECT public: enum InputType {itSingleLine, itMultiLine}; enum ErrorType {etNoError, etInvalidStringKey}; - FieldLineEdit( const TQString& caption, InputType inputType = itSingleLine, bool readOnly = FALSE, TQWidget *parent = 0, const char *name = 0 ); + FieldLineEdit( const TQString& caption, InputType inputType = itSingleLine, bool readOnly = false, TQWidget *parent = 0, const char *name = 0 ); ~FieldLineEdit(); /** diff --git a/src/fieldlistview.cpp b/src/fieldlistview.cpp index 8b0931b..6dd5eba 100644 --- a/src/fieldlistview.cpp +++ b/src/fieldlistview.cpp @@ -43,7 +43,7 @@ namespace KBibTeX { FieldListView::FieldListView( const TQString& caption, const TQString& prefixNew, bool isReadOnly, TQWidget *parent, const char *name ) - : TQWidget( parent, name ), m_value( new BibTeX::Value() ), m_caption( caption ), m_prefixNew( prefixNew ), m_isReadOnly( isReadOnly ), m_enabled( TRUE ), m_isComplex( FALSE ), m_isModified( FALSE ), m_newValueCounter( 0 ), m_fieldType( BibTeX::EntryField::ftUnknown ) + : TQWidget( parent, name ), m_value( new BibTeX::Value() ), m_caption( caption ), m_prefixNew( prefixNew ), m_isReadOnly( isReadOnly ), m_enabled( true ), m_isComplex( false ), m_isModified( false ), m_newValueCounter( 0 ), m_fieldType( BibTeX::EntryField::ftUnknown ) { setupGUI(); m_listViewElements->installEventFilter( this ); @@ -73,7 +73,7 @@ namespace KBibTeX reset(); updateGUI(); - m_isModified = FALSE; + m_isModified = false; } } @@ -110,7 +110,7 @@ namespace KBibTeX bool FieldListView::isEmpty() { - return m_value != NULL ? m_value->items.isEmpty() : TRUE; + return m_value != NULL ? m_value->items.isEmpty() : true; } bool FieldListView::isModified() @@ -172,7 +172,7 @@ namespace KBibTeX void FieldListView::updateGUI() { - disconnect( m_checkBoxEtAl, SIGNAL( toggled( bool ) ), this, SLOT( apply() ) ); + disconnect( m_checkBoxEtAl, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( apply() ) ); if ( m_value != NULL && !m_isComplex ) { bool isElementSelected = m_listViewElements->selectedItem() != NULL; @@ -186,15 +186,15 @@ namespace KBibTeX } else { - m_pushButtonAdd->setEnabled( FALSE ); - m_pushButtonEdit->setEnabled( FALSE ); - m_pushButtonDelete->setEnabled( FALSE ); - m_pushButtonUp->setEnabled( FALSE ); - m_pushButtonDown->setEnabled( FALSE ); - m_listViewElements->setEnabled( FALSE ); - m_checkBoxEtAl->setEnabled( FALSE ); + m_pushButtonAdd->setEnabled( false ); + m_pushButtonEdit->setEnabled( false ); + m_pushButtonDelete->setEnabled( false ); + m_pushButtonUp->setEnabled( false ); + m_pushButtonDown->setEnabled( false ); + m_listViewElements->setEnabled( false ); + m_checkBoxEtAl->setEnabled( false ); } - connect( m_checkBoxEtAl, SIGNAL( toggled( bool ) ), this, SLOT( apply() ) ); + connect( m_checkBoxEtAl, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( apply() ) ); } void FieldListView::slotAdd() @@ -202,9 +202,9 @@ namespace KBibTeX if ( isSimple() ) { TDEListViewItem * item = new TDEListViewItem( m_listViewElements, m_listViewElements->lastItem(), TQString( "%1%2" ).arg( m_prefixNew ).arg( ++m_newValueCounter ) ); - m_listViewElements->setSelected( item, TRUE ); + m_listViewElements->setSelected( item, true ); updateGUI(); - TQTimer::singleShot( 100, this, SLOT( slotEdit() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( slotEdit() ) ); } } @@ -227,7 +227,7 @@ namespace KBibTeX apply(); updateGUI(); - m_isModified = TRUE; + m_isModified = true; } } @@ -240,7 +240,7 @@ namespace KBibTeX apply(); updateGUI(); - m_isModified = TRUE; + m_isModified = true; } } @@ -253,7 +253,7 @@ namespace KBibTeX apply(); updateGUI(); - m_isModified = TRUE; + m_isModified = true; } } @@ -264,7 +264,7 @@ namespace KBibTeX reset(); updateGUI(); - m_isModified = TRUE; + m_isModified = true; } } @@ -283,7 +283,7 @@ namespace KBibTeX } apply(); - m_isModified = TRUE; + m_isModified = true; } void FieldListView::setupGUI() @@ -300,59 +300,59 @@ namespace KBibTeX m_listViewElements->renameLineEdit() ->completionObject() ->setIgnoreCase( true ); m_listViewElements->setDefaultRenameAction( TQListView::Accept ); m_listViewElements->addColumn( m_caption ); - m_listViewElements->setSorting( -1, TRUE ); - m_listViewElements->setItemsRenameable( TRUE ); + m_listViewElements->setSorting( -1, true ); + m_listViewElements->setItemsRenameable( true ); if ( settings->editing_UseSpecialFont ) m_listViewElements->setFont( settings->editing_SpecialFont ); m_listViewElements->header() ->setFont( TDEGlobalSettings::generalFont() ); - m_listViewElements->header() ->setClickEnabled( FALSE ); - m_listViewElements->header() ->setStretchEnabled( TRUE, 0 ); - connect( m_listViewElements, SIGNAL( selectionChanged() ), this, SLOT( updateGUI() ) ); - connect( m_listViewElements, SIGNAL( clicked( TQListViewItem * ) ), this, SLOT( updateGUI() ) ); - connect( m_listViewElements, SIGNAL( doubleClicked( TQListViewItem * ) ), this, SLOT( slotListViewDoubleClicked( TQListViewItem * ) ) ); - connect( m_listViewElements, SIGNAL( currentChanged( TQListViewItem * ) ), this, SLOT( updateGUI() ) ); - connect( m_listViewElements, SIGNAL( itemRenamed( TQListViewItem*, int, const TQString& ) ), this, SLOT( slotItemRenamed( TQListViewItem*, int, const TQString& ) ) ); + m_listViewElements->header() ->setClickEnabled( false ); + m_listViewElements->header() ->setStretchEnabled( true, 0 ); + connect( m_listViewElements, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( updateGUI() ) ); + connect( m_listViewElements, TQ_SIGNAL( clicked( TQListViewItem * ) ), this, TQ_SLOT( updateGUI() ) ); + connect( m_listViewElements, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), this, TQ_SLOT( slotListViewDoubleClicked( TQListViewItem * ) ) ); + connect( m_listViewElements, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQ_SLOT( updateGUI() ) ); + connect( m_listViewElements, TQ_SIGNAL( itemRenamed( TQListViewItem*, int, const TQString& ) ), this, TQ_SLOT( slotItemRenamed( TQListViewItem*, int, const TQString& ) ) ); m_pushButtonAdd = new TQPushButton( i18n( "Add" ), this ); layout->addWidget( m_pushButtonAdd, 0, 1 ); m_pushButtonAdd->setIconSet( TQIconSet( SmallIcon( "add" ) ) ); - connect( m_pushButtonAdd, SIGNAL( clicked() ), this, SLOT( slotAdd() ) ); + connect( m_pushButtonAdd, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAdd() ) ); TQToolTip::add( m_pushButtonAdd, TQString( i18n( "Add new '%1' item (Ctrl+A)" ) ).arg( m_caption ) ); m_pushButtonEdit = new TQPushButton( i18n( "Edit" ), this ); layout->addWidget( m_pushButtonEdit, 1, 1 ); m_pushButtonEdit->setIconSet( TQIconSet( SmallIcon( "edit" ) ) ); - connect( m_pushButtonEdit, SIGNAL( clicked() ), this, SLOT( slotEdit() ) ); + connect( m_pushButtonEdit, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEdit() ) ); TQToolTip::add( m_pushButtonEdit, TQString( i18n( "Edit current '%1' item (F2)" ) ).arg( m_caption ) ); m_pushButtonDelete = new TQPushButton( i18n( "Delete" ), this ); layout->addWidget( m_pushButtonDelete, 2, 1 ); m_pushButtonDelete->setIconSet( TQIconSet( SmallIcon( "edit-delete" ) ) ); - connect( m_pushButtonDelete, SIGNAL( clicked() ), this, SLOT( slotDelete() ) ); + connect( m_pushButtonDelete, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDelete() ) ); TQToolTip::add( m_pushButtonDelete, TQString( i18n( "Delete current '%1' item (Del)" ) ).arg( m_caption ) ); m_pushButtonUp = new TQPushButton( i18n( "Up" ), this ); layout->addWidget( m_pushButtonUp, 3, 1 ); m_pushButtonUp->setIconSet( TQIconSet( SmallIcon( "go-up" ) ) ); - connect( m_pushButtonUp, SIGNAL( clicked() ), this, SLOT( slotUp() ) ); + connect( m_pushButtonUp, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotUp() ) ); TQToolTip::add( m_pushButtonUp, TQString( i18n( "Move current '%1' item up (Ctrl+Up)" ) ).arg( m_caption ) ); m_pushButtonDown = new TQPushButton( i18n( "Down" ), this ); layout->addWidget( m_pushButtonDown, 4, 1 ); m_pushButtonDown->setIconSet( TQIconSet( SmallIcon( "go-down" ) ) ); - connect( m_pushButtonDown, SIGNAL( clicked() ), this, SLOT( slotDown() ) ); + connect( m_pushButtonDown, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDown() ) ); TQToolTip::add( m_pushButtonDown, TQString( i18n( "Move current '%1' item down (Ctrl+Down)" ) ).arg( m_caption ) ); m_pushButtonComplexEdit = new TQPushButton( i18n( "Complex..." ), this ); layout->addWidget( m_pushButtonComplexEdit, 6, 1 ); m_pushButtonComplexEdit->setIconSet( TQIconSet( SmallIcon( "format-justify-left" ) ) ); - connect( m_pushButtonComplexEdit, SIGNAL( clicked() ), this, SLOT( slotComplex() ) ); + connect( m_pushButtonComplexEdit, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotComplex() ) ); TQToolTip::add( m_pushButtonComplexEdit, TQString( i18n( "Edit current '%1' item as a concatenated string (Ctrl+Alt+C)" ) ).arg( m_caption ) ); m_checkBoxEtAl = new TQCheckBox( i18n( "... and others (et al.)" ), this ); layout->addMultiCellWidget( m_checkBoxEtAl, 7, 7, 0, 1 ); - connect( m_checkBoxEtAl, SIGNAL( toggled( bool ) ), this, SLOT( apply() ) ); + connect( m_checkBoxEtAl, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( apply() ) ); } void FieldListView::apply() @@ -403,11 +403,11 @@ namespace KBibTeX void FieldListView::reset() { - disconnect( m_checkBoxEtAl, SIGNAL( toggled( bool ) ), this, SLOT( apply() ) ); + disconnect( m_checkBoxEtAl, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( apply() ) ); m_listViewElements->clear(); - m_checkBoxEtAl->setChecked( FALSE ); + m_checkBoxEtAl->setChecked( false ); - m_isComplex = FALSE; + m_isComplex = false; for ( TQValueList<BibTeX::ValueItem*>::ConstIterator it = m_value->items.constBegin(); !m_isComplex && it != m_value->items.constEnd(); ++it ) { BibTeX::MacroKey *macroKey = dynamic_cast<BibTeX::MacroKey *>( *it ); @@ -428,7 +428,7 @@ namespace KBibTeX { TQString text = ( *pit )->text(); if ( text == "others" ) - m_checkBoxEtAl->setChecked( TRUE ); + m_checkBoxEtAl->setChecked( true ); else new TQListViewItem( m_listViewElements, m_listViewElements->lastItem(), text ); } @@ -439,7 +439,7 @@ namespace KBibTeX kdDebug() << "Don't know how to handle entries of type " << BibTeX::EntryField::fieldTypeToString( m_fieldType ) << endl; } - connect( m_checkBoxEtAl, SIGNAL( toggled( bool ) ), this, SLOT( apply() ) ); + connect( m_checkBoxEtAl, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( apply() ) ); } bool FieldListView::isSimple() diff --git a/src/fieldlistview.h b/src/fieldlistview.h index e6e2e58..95d9518 100644 --- a/src/fieldlistview.h +++ b/src/fieldlistview.h @@ -39,7 +39,7 @@ namespace KBibTeX */ class FieldListView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: FieldListView( const TQString& caption, const TQString& prefixNew, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); ~FieldListView(); @@ -52,7 +52,7 @@ namespace BibTeX class File : public TQObject { - Q_OBJECT + TQ_OBJECT friend class FileExporterXML; friend class FileExporterBibTeX; diff --git a/src/fileexporter.h b/src/fileexporter.h index 3457878..306606a 100644 --- a/src/fileexporter.h +++ b/src/fileexporter.h @@ -37,7 +37,7 @@ namespace BibTeX */ class FileExporter : public TQObject { - Q_OBJECT + TQ_OBJECT public: FileExporter(); ~FileExporter(); diff --git a/src/fileexporterbibtex.cpp b/src/fileexporterbibtex.cpp index 598f3bf..011322e 100644 --- a/src/fileexporterbibtex.cpp +++ b/src/fileexporterbibtex.cpp @@ -32,7 +32,7 @@ namespace BibTeX { FileExporterBibTeX::FileExporterBibTeX() : FileExporter(), - m_iconvBufferSize( 16384 ), m_stringOpenDelimiter( '"' ), m_stringCloseDelimiter( '"' ), m_keywordCasing( kcCamelCase ), m_encoding( "latex" ), m_protectCasing( FALSE ), cancelFlag( FALSE ) + m_iconvBufferSize( 16384 ), m_stringOpenDelimiter( '"' ), m_stringCloseDelimiter( '"' ), m_keywordCasing( kcCamelCase ), m_encoding( "latex" ), m_protectCasing( false ), cancelFlag( false ) { m_iconvBuffer = new char[m_iconvBufferSize]; } @@ -45,7 +45,7 @@ namespace BibTeX bool FileExporterBibTeX::save( TQIODevice* iodevice, const File* bibtexfile, TQStringList * /*errorLog*/ ) { m_mutex.lock(); - bool result = TRUE; + bool result = true; /** * Categorize elements from the bib file into four groups, @@ -148,7 +148,7 @@ namespace BibTeX bool FileExporterBibTeX::save( TQIODevice* iodevice, const Element* element, TQStringList * /*errorLog*/ ) { m_mutex.lock(); - bool result = FALSE; + bool result = false; const char *encodingTo = m_encoding == "latex" ? "utf-8\0" : m_encoding.append( "\0" ).ascii(); m_iconvHandle = iconv_open( encodingTo, "utf-8" ); @@ -182,7 +182,7 @@ namespace BibTeX void FileExporterBibTeX::cancel() { - cancelFlag = TRUE; + cancelFlag = true; } bool FileExporterBibTeX::writeEntry( TQIODevice &device, const Entry* entry ) @@ -198,7 +198,7 @@ namespace BibTeX writeString( device, TQString( ",\n\t%1 = %2" ).arg( field->fieldTypeName() ).arg( text ) ); } writeString( device, "\n}\n\n" ); - return TRUE; + return true; } bool FileExporterBibTeX::writeMacro( TQIODevice &device, const Macro *macro ) @@ -209,7 +209,7 @@ namespace BibTeX writeString( device, TQString( "@%1{ %2 = %3 }\n\n" ).arg( applyKeywordCasing( "String" ) ).arg( macro->key() ).arg( text ) ); - return TRUE; + return true; } bool FileExporterBibTeX::writeComment( TQIODevice &device, const Comment *comment ) @@ -237,14 +237,14 @@ namespace BibTeX writeString( device, TQString( "@%1{%2}\n\n" ).arg( applyKeywordCasing( "Comment" ) ).arg( text ) ); } - return TRUE; + return true; } bool FileExporterBibTeX::writePreamble( TQIODevice &device, const Preamble* preamble ) { writeString( device, TQString( "@%1{%2}\n\n" ).arg( applyKeywordCasing( "Preamble" ) ).arg( valueToString( preamble->value() ) ) ); - return TRUE; + return true; } bool FileExporterBibTeX::writeString( TQIODevice &device, const TQString& text ) @@ -299,7 +299,7 @@ namespace BibTeX return ""; TQString result; - bool isFirst = TRUE; + bool isFirst = true; EncoderLaTeX *encoder = EncoderLaTeX::currentEncoderLaTeX(); for ( TQValueList<ValueItem*>::ConstIterator it = value->items.begin(); it != value->items.end(); ++it ) @@ -307,7 +307,7 @@ namespace BibTeX if ( !isFirst ) result.append( " # " ); else - isFirst = FALSE; + isFirst = false; MacroKey *macroKey = dynamic_cast<MacroKey*>( *it ); if ( macroKey != NULL ) @@ -323,30 +323,30 @@ namespace BibTeX text = plainText->text(); else if ( keywordContainer != NULL ) { - bool first = TRUE; + bool first = true; for ( TQValueList<Keyword*>::Iterator it = keywordContainer->keywords.begin(); it != keywordContainer->keywords.end(); ++it ) { if ( !first ) text.append( ", " ); else - first = FALSE; + first = false; text.append(( *it )->text() ); } } else if ( personContainer != NULL ) { - bool first = TRUE; + bool first = true; for ( TQValueList<Person*>::Iterator it = personContainer->persons.begin(); it != personContainer->persons.end(); ++it ) { if ( !first ) text.append( " and " ); else - first = FALSE; + first = false; TQString v = ( *it )->firstName(); if ( !v.isEmpty() ) { - bool requiresQuoting = requiresPersonQuoting( v, FALSE ); + bool requiresQuoting = requiresPersonQuoting( v, false ); if ( requiresQuoting ) text.append( "{" ); text.append( v ); if ( requiresQuoting ) text.append( "}" ); @@ -385,7 +385,7 @@ namespace BibTeX text.append( von ); v = v.right( v.length() - von.length() ); } - bool requiresQuoting = requiresPersonQuoting( v, TRUE ); + bool requiresQuoting = requiresPersonQuoting( v, true ); if ( requiresQuoting ) text.append( "{" ); text.append( v ); if ( requiresQuoting ) text.append( "}" ); @@ -439,16 +439,16 @@ namespace BibTeX { if ( isLastName && !text.contains( " " ) ) /** Last name contains NO spaces, no quoting necessary */ - return FALSE; + return false; else if ( isLastName && text[0].category() == TQChar::Letter_Lowercase ) /** Last name starts with lower case character (e.g. as in "van der Linden") */ - return FALSE; + return false; else if ( !isLastName && !text.contains( " and " ) ) /** First name contains no " and " no quoting necessary */ - return FALSE; + return false; else if ( text[0] != '{' || text[text.length()-1] != '}' ) /** as either last name contains spaces or first name contains " and " and there is no protective quoting yet, there must be a protective quoting added */ - return TRUE; + return true; /** check for cases like "{..}..{..}", which must be surrounded with a protective quoting, too */ int bracketCounter = 0; @@ -459,9 +459,9 @@ namespace BibTeX else if ( text[i] == '}' ) --bracketCounter; if ( bracketCounter == 0 && i > 0 ) - return TRUE; + return true; } - return FALSE; + return false; } void FileExporterBibTeX::addProtectiveCasing( TQString &text ) @@ -472,16 +472,16 @@ namespace BibTeX return; } - bool addBrackets = TRUE; + bool addBrackets = true; if ( text[1] == '{' && text[text.length() - 2] == '}' ) { - addBrackets = FALSE; + addBrackets = false; int count = 0; for ( int i = text.length() - 2; !addBrackets && i >= 1; --i ) if ( text[i] == '{' )++count; else if ( text[i] == '}' )--count; - else if ( count == 0 ) addBrackets = TRUE; + else if ( count == 0 ) addBrackets = true; } if ( addBrackets ) diff --git a/src/fileexporterbibutils.cpp b/src/fileexporterbibutils.cpp index 68af9c7..2a5fffa 100644 --- a/src/fileexporterbibutils.cpp +++ b/src/fileexporterbibutils.cpp @@ -101,9 +101,9 @@ namespace BibTeX m_processBuffer->open( IO_WriteOnly ); m_waiting = true; m_process = new TQProcess( TQStringList::split( ' ', "bib2xml -i utf8" ) ); - connect( m_process, SIGNAL( processExited() ), this, SLOT( wakeUp() ) ); - connect( m_process, SIGNAL( readyReadStdout() ), this, SLOT( slotReadyStdout() ) ); - connect( m_process, SIGNAL( readyReadStderr() ), this, SLOT( slotReadyStderr() ) ); + connect( m_process, TQ_SIGNAL( processExited() ), this, TQ_SLOT( wakeUp() ) ); + connect( m_process, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( slotReadyStdout() ) ); + connect( m_process, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( slotReadyStderr() ) ); m_process->start(); if ( m_process->isRunning() ) @@ -178,9 +178,9 @@ namespace BibTeX if ( m_process != NULL ) { - connect( m_process, SIGNAL( processExited() ), this, SLOT( wakeUp() ) ); - connect( m_process, SIGNAL( readyReadStdout() ), this, SLOT( slotReadyStdout() ) ); - connect( m_process, SIGNAL( readyReadStderr() ), this, SLOT( slotReadyStderr() ) ); + connect( m_process, TQ_SIGNAL( processExited() ), this, TQ_SLOT( wakeUp() ) ); + connect( m_process, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( slotReadyStdout() ) ); + connect( m_process, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( slotReadyStderr() ) ); if ( m_process->start() ) { diff --git a/src/fileexporterbibutils.h b/src/fileexporterbibutils.h index a691747..8b37d53 100644 --- a/src/fileexporterbibutils.h +++ b/src/fileexporterbibutils.h @@ -34,7 +34,7 @@ namespace BibTeX */ class FileExporterBibUtils : public FileExporter { - Q_OBJECT + TQ_OBJECT public: FileExporterBibUtils( BibTeX::File::FileFormat outputFormat ); ~FileExporterBibUtils(); diff --git a/src/fileexporterdocbook5.cpp b/src/fileexporterdocbook5.cpp index 25b568e..eb33e59 100644 --- a/src/fileexporterdocbook5.cpp +++ b/src/fileexporterdocbook5.cpp @@ -43,7 +43,7 @@ namespace BibTeX bool FileExporterDocBook5::save( TQIODevice* iodevice, const File* bibtexfile, TQStringList *errorLog ) { m_mutex.lock(); - bool result = FALSE; + bool result = false; TQFile bibtexFile( bibTeXFilename ); if ( bibtexFile.open( IO_WriteOnly ) ) @@ -64,7 +64,7 @@ namespace BibTeX bool FileExporterDocBook5::save( TQIODevice* iodevice, const Element* element, TQStringList *errorLog ) { m_mutex.lock(); - bool result = FALSE; + bool result = false; TQFile bibtexFile( bibTeXFilename ); if ( bibtexFile.open( IO_WriteOnly ) ) @@ -88,9 +88,9 @@ namespace BibTeX cmdLine << "java" << "-cp" << m_classPath << "net.sf.bib2db5.DB5Converter" << "-O" << "." << "bibtex-to-docbook5.bib"; if ( runProcess( cmdLine, errorLog ) && writeFileToIODevice( outputFilename, iodevice ) ) - return TRUE; + return true; else - return FALSE; + return false; } } diff --git a/src/fileexporterexternal.cpp b/src/fileexporterexternal.cpp index fc02819..da570f6 100644 --- a/src/fileexporterexternal.cpp +++ b/src/fileexporterexternal.cpp @@ -76,7 +76,7 @@ namespace BibTeX bool FileExporterExternal::generateOutput( TQBuffer &input, TQIODevice *output ) { - bool result = FALSE; + bool result = false; TQString commandLine; switch ( m_fileformat ) @@ -94,11 +94,11 @@ namespace BibTeX commandLine = "bibconv -informat=bibtex -outformat=html"; break; default: - return FALSE; + return false; } break; default: - return FALSE; + return false; } TQStringList args = TQStringList::split( ' ', commandLine ); @@ -108,10 +108,10 @@ namespace BibTeX TQApplication::setOverrideCursor( TQt::waitCursor ); process = new TQProcess( args ); - connect( process, SIGNAL( processExited() ), this, SLOT( slotProcessExited() ) ); - connect( process, SIGNAL( readyReadStdout() ), this, SLOT( slotReadProcessOutput() ) ); - connect( process, SIGNAL( readyReadStderr() ), this, SLOT( slotReadProcessOutput() ) ); - connect( process, SIGNAL( wroteToStdin() ), this, SLOT( slotWroteToStdin() ) ); + connect( process, TQ_SIGNAL( processExited() ), this, TQ_SLOT( slotProcessExited() ) ); + connect( process, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( slotReadProcessOutput() ) ); + connect( process, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( slotReadProcessOutput() ) ); + connect( process, TQ_SIGNAL( wroteToStdin() ), this, TQ_SLOT( slotWroteToStdin() ) ); if ( process->start() ) { @@ -136,10 +136,10 @@ namespace BibTeX result = process->normalExit(); } - disconnect( process, SIGNAL( wroteToStdin() ), this, SLOT( slotWroteToStdin() ) ); - disconnect( process, SIGNAL( readyReadStdout() ), this, SLOT( slotReadProcessOutput() ) ); - disconnect( process, SIGNAL( readyReadStderr() ), this, SLOT( slotReadProcessOutput() ) ); - disconnect( process, SIGNAL( processExited() ), this, SLOT( slotProcessExited() ) ); + disconnect( process, TQ_SIGNAL( wroteToStdin() ), this, TQ_SLOT( slotWroteToStdin() ) ); + disconnect( process, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( slotReadProcessOutput() ) ); + disconnect( process, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( slotReadProcessOutput() ) ); + disconnect( process, TQ_SIGNAL( processExited() ), this, TQ_SLOT( slotProcessExited() ) ); delete( process ); process = NULL; delete writeTo; diff --git a/src/fileexporterexternal.h b/src/fileexporterexternal.h index 1942671..04cea4f 100644 --- a/src/fileexporterexternal.h +++ b/src/fileexporterexternal.h @@ -35,7 +35,7 @@ namespace BibTeX */ class FileExporterExternal : public FileExporter { - Q_OBJECT + TQ_OBJECT public: enum Exporter { exporterNone = 0, exporterXSLT = 1, exporterBib2XHTML = 2, exporterBibTeX2HTML = 3, exporterBibConv = 4 }; diff --git a/src/fileexporterpdf.cpp b/src/fileexporterpdf.cpp index 8f78fe9..5130833 100644 --- a/src/fileexporterpdf.cpp +++ b/src/fileexporterpdf.cpp @@ -46,7 +46,7 @@ namespace BibTeX bool FileExporterPDF::save( TQIODevice* iodevice, const File* bibtexfile, TQStringList *errorLog ) { m_mutex.lock(); - bool result = FALSE; + bool result = false; m_embeddedFileList.clear(); if ( m_embedFiles ) { @@ -73,7 +73,7 @@ namespace BibTeX bool FileExporterPDF::save( TQIODevice* iodevice, const Element* element, TQStringList *errorLog ) { m_mutex.lock(); - bool result = FALSE; + bool result = false; m_embeddedFileList.clear(); if ( m_embedFiles ) fillEmbeddedFileList( element ); @@ -114,9 +114,9 @@ namespace BibTeX TQStringList cmdLines = TQStringList::split( '|', "pdflatex -halt-on-error bibtex-to-pdf.tex|bibtex bibtex-to-pdf|pdflatex -halt-on-error bibtex-to-pdf.tex|pdflatex -halt-on-error bibtex-to-pdf.tex" ); if ( writeLatexFile( laTeXFilename ) && runProcesses( cmdLines, errorLog ) && writeFileToIODevice( outputFilename, iodevice ) ) - return TRUE; + return true; else - return FALSE; + return false; } bool FileExporterPDF::writeLatexFile( const TQString &filename ) @@ -156,10 +156,10 @@ namespace BibTeX ts << "\\bibliography{bibtex-to-pdf}\n"; ts << "\\end{document}\n"; latexFile.close(); - return TRUE; + return true; } else - return FALSE; + return false; } void FileExporterPDF::fillEmbeddedFileList( const File* bibtexfile ) diff --git a/src/fileexporterpdf.h b/src/fileexporterpdf.h index 54068f3..ffe6daa 100644 --- a/src/fileexporterpdf.h +++ b/src/fileexporterpdf.h @@ -31,7 +31,7 @@ namespace BibTeX class FileExporterPDF : public FileExporterToolchain { public: - FileExporterPDF( bool embedFiles = FALSE ); + FileExporterPDF( bool embedFiles = false ); ~FileExporterPDF(); bool save( TQIODevice* iodevice, const File* bibtexfile, TQStringList *errorLog = NULL ); diff --git a/src/fileexporterps.cpp b/src/fileexporterps.cpp index b808288..04e0997 100644 --- a/src/fileexporterps.cpp +++ b/src/fileexporterps.cpp @@ -44,7 +44,7 @@ namespace BibTeX bool FileExporterPS::save( TQIODevice* iodevice, const File* bibtexfile, TQStringList *errorLog ) { m_mutex.lock(); - bool result = FALSE; + bool result = false; TQFile bibtexFile( bibTeXFilename ); if ( bibtexFile.open( IO_WriteOnly ) ) @@ -65,7 +65,7 @@ namespace BibTeX bool FileExporterPS::save( TQIODevice* iodevice, const Element* element, TQStringList *errorLog ) { m_mutex.lock(); - bool result = FALSE; + bool result = false; TQFile bibtexFile( bibTeXFilename ); if ( bibtexFile.open( IO_WriteOnly ) ) @@ -98,9 +98,9 @@ namespace BibTeX TQStringList cmdLines = TQStringList::split( '|', "latex -halt-on-error bibtex-to-ps.tex|bibtex bibtex-to-ps|latex -halt-on-error bibtex-to-ps.tex|latex -halt-on-error bibtex-to-ps.tex|dvips -o bibtex-to-ps.ps bibtex-to-ps.dvi" ); if ( writeLatexFile( laTeXFilename ) && runProcesses( cmdLines, errorLog ) && writeFileToIODevice( outputFilename, iodevice ) ) - return TRUE; + return true; else - return FALSE; + return false; } bool FileExporterPS::writeLatexFile( const TQString &filename ) @@ -125,10 +125,10 @@ namespace BibTeX ts << "\\bibliography{bibtex-to-ps}\n"; ts << "\\end{document}\n"; latexFile.close(); - return TRUE; + return true; } else - return FALSE; + return false; } diff --git a/src/fileexporterris.cpp b/src/fileexporterris.cpp index 21f92e6..ae54e9d 100644 --- a/src/fileexporterris.cpp +++ b/src/fileexporterris.cpp @@ -39,7 +39,7 @@ namespace BibTeX bool FileExporterRIS::save( TQIODevice* iodevice, const Element* element, TQStringList* /*errorLog*/ ) { m_mutex.lock(); - bool result = FALSE; + bool result = false; TQTextStream stream( iodevice ); const Entry *entry = dynamic_cast<const Entry*>( element ); @@ -53,8 +53,8 @@ namespace BibTeX bool FileExporterRIS::save( TQIODevice* iodevice, const File* bibtexfile, TQStringList* /*errorLog*/ ) { m_mutex.lock(); - bool result = TRUE; - m_cancelFlag = FALSE; + bool result = true; + m_cancelFlag = false; TQTextStream stream( iodevice ); int numElements = (int) bibtexfile->count(), i = 0; @@ -77,12 +77,12 @@ namespace BibTeX void FileExporterRIS::cancel() { - m_cancelFlag = TRUE; + m_cancelFlag = true; } bool FileExporterRIS::writeEntry( TQTextStream &stream, const Entry* entry ) { - bool result = TRUE; + bool result = true; tqDebug( "Writing Entry" ); switch ( entry->entryType() ) @@ -120,13 +120,13 @@ namespace BibTeX result &= writeKeyValue( stream, field->fieldTypeName().right( 2 ), field->value()->simplifiedText() ); else if ( field->fieldType() == EntryField::ftAuthor ) { - TQStringList authors = TQStringList::split( TQRegExp( "\\s+(,|and|&)\\s+", FALSE ), field->value() ->simplifiedText() ); + TQStringList authors = TQStringList::split( TQRegExp( "\\s+(,|and|&)\\s+", false ), field->value() ->simplifiedText() ); for ( TQStringList::Iterator it = authors.begin(); result && it != authors.end(); ++it ) result &= writeKeyValue( stream, "AU", *it ); } else if ( field->fieldType() == EntryField::ftEditor ) { - TQStringList authors = TQStringList::split( TQRegExp( "\\s+(,|and|&)\\s+", FALSE ), field->value() ->simplifiedText() ); + TQStringList authors = TQStringList::split( TQRegExp( "\\s+(,|and|&)\\s+", false ), field->value() ->simplifiedText() ); for ( TQStringList::Iterator it = authors.begin(); result && it != authors.end(); ++it ) result &= writeKeyValue( stream, "ED", *it ); } @@ -194,7 +194,7 @@ namespace BibTeX stream << endl; tqDebug( "%s - %s", key.latin1(), value.latin1() ); - return TRUE; + return true; } } diff --git a/src/fileexporterrtf.cpp b/src/fileexporterrtf.cpp index a1d0423..c5f8749 100644 --- a/src/fileexporterrtf.cpp +++ b/src/fileexporterrtf.cpp @@ -43,7 +43,7 @@ namespace BibTeX bool FileExporterRTF::save( TQIODevice* iodevice, const File* bibtexfile, TQStringList *errorLog ) { m_mutex.lock(); - bool result = FALSE; + bool result = false; TQFile bibtexFile( bibTeXFilename ); if ( bibtexFile.open( IO_WriteOnly ) ) @@ -64,7 +64,7 @@ namespace BibTeX bool FileExporterRTF::save( TQIODevice* iodevice, const Element* element, TQStringList *errorLog ) { m_mutex.lock(); - bool result = FALSE; + bool result = false; TQFile bibtexFile( bibTeXFilename ); if ( bibtexFile.open( IO_WriteOnly ) ) @@ -97,9 +97,9 @@ namespace BibTeX TQStringList cmdLines = TQStringList::split( '|', "latex bibtex-to-rtf.tex|bibtex bibtex-to-rtf|latex bibtex-to-rtf.tex|latex2rtf bibtex-to-rtf.tex" ); if ( writeLatexFile( laTeXFilename ) && runProcesses( cmdLines, errorLog ) && writeFileToIODevice( outputFilename, iodevice ) ) - return TRUE; + return true; else - return FALSE; + return false; } bool FileExporterRTF::writeLatexFile( const TQString &filename ) @@ -124,10 +124,10 @@ namespace BibTeX ts << "\\bibliography{bibtex-to-rtf}\n"; ts << "\\end{document}\n"; latexFile.close(); - return TRUE; + return true; } else - return FALSE; + return false; } diff --git a/src/fileexportertoolchain.cpp b/src/fileexportertoolchain.cpp index 6e96208..3fd57e1 100644 --- a/src/fileexportertoolchain.cpp +++ b/src/fileexportertoolchain.cpp @@ -43,7 +43,7 @@ namespace BibTeX bool FileExporterToolchain::runProcesses( const TQStringList &progs, TQStringList *errorLog ) { - bool result = TRUE; + bool result = true; int i = 0; emit progress( 0, progs.size() ); @@ -60,14 +60,14 @@ namespace BibTeX bool FileExporterToolchain::runProcess( const TQStringList &args, TQStringList *errorLog ) { - bool result = FALSE; + bool result = false; TQApplication::setOverrideCursor( TQt::waitCursor ); m_process = new TQProcess( args ); m_process->setWorkingDirectory( workingDir ); - connect( m_process, SIGNAL( processExited() ), this, SLOT( slotProcessExited() ) ); - connect( m_process, SIGNAL( readyReadStdout() ), this, SLOT( slotReadProcessOutput() ) ); - connect( m_process, SIGNAL( readyReadStderr() ), this, SLOT( slotReadProcessOutput() ) ); + connect( m_process, TQ_SIGNAL( processExited() ), this, TQ_SLOT( slotProcessExited() ) ); + connect( m_process, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( slotReadProcessOutput() ) ); + connect( m_process, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( slotReadProcessOutput() ) ); if ( m_process->start() ) { @@ -92,9 +92,9 @@ namespace BibTeX errorLog->append( TQString( "Process '%1' was not started." ).arg( args.join( " " ) ) ); - disconnect( m_process, SIGNAL( readyReadStdout() ), this, SLOT( slotReadProcessOutput() ) ); - disconnect( m_process, SIGNAL( readyReadStderr() ), this, SLOT( slotReadProcessOutput() ) ); - disconnect( m_process, SIGNAL( processExited() ), this, SLOT( slotProcessExited() ) ); + disconnect( m_process, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( slotReadProcessOutput() ) ); + disconnect( m_process, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( slotReadProcessOutput() ) ); + disconnect( m_process, TQ_SIGNAL( processExited() ), this, TQ_SLOT( slotProcessExited() ) ); delete( m_process ); m_process = NULL; @@ -107,7 +107,7 @@ namespace BibTeX TQFile file( filename ); if ( file.open( IO_ReadOnly ) ) { - bool result = TRUE; + bool result = true; TQ_ULONG buffersize = 0x10000; TQ_LONG amount = 0; char* buffer = new char[ buffersize ]; @@ -122,7 +122,7 @@ namespace BibTeX return result; } else - return FALSE; + return false; } TQString FileExporterToolchain::createTempDir() @@ -201,7 +201,7 @@ namespace BibTeX bool FileExporterToolchain::kpsewhich( const TQString& filename ) { - bool result = FALSE; + bool result = false; int counter = 0; TQWaitCondition waitCond; diff --git a/src/fileexportertoolchain.h b/src/fileexportertoolchain.h index 16be8eb..1fdb497 100644 --- a/src/fileexportertoolchain.h +++ b/src/fileexportertoolchain.h @@ -35,7 +35,7 @@ namespace BibTeX */ class FileExporterToolchain : public FileExporter { - Q_OBJECT + TQ_OBJECT public: FileExporterToolchain(); ~FileExporterToolchain(); diff --git a/src/fileexporterxml.cpp b/src/fileexporterxml.cpp index bbacd11..1b7c2e8 100644 --- a/src/fileexporterxml.cpp +++ b/src/fileexporterxml.cpp @@ -45,8 +45,8 @@ namespace BibTeX bool FileExporterXML::save( TQIODevice* iodevice, const File* bibtexfile, TQStringList * /*errorLog*/ ) { m_mutex.lock(); - bool result = TRUE; - m_cancelFlag = FALSE; + bool result = true; + m_cancelFlag = false; TQTextStream stream( iodevice ); stream.setEncoding( TQTextStream::UnicodeUTF8 ); @@ -79,12 +79,12 @@ namespace BibTeX void FileExporterXML::cancel() { - m_cancelFlag = TRUE; + m_cancelFlag = true; } bool FileExporterXML::write( TQTextStream&stream, const Element *element, const File* bibtexfile ) { - bool result = FALSE; + bool result = false; const Entry *entry = dynamic_cast<const Entry*>( element ); if ( entry != NULL ) @@ -130,7 +130,7 @@ namespace BibTeX { TQString tag = field->fieldTypeName().lower(); stream << " <" << tag << "s>" << endl; - TQStringList persons = TQStringList::split( TQRegExp( "\\s+(,|and|&)+\\s+", FALSE ), EncoderXML::currentEncoderXML() ->encode( valueToString( field->value() ) ) ); + TQStringList persons = TQStringList::split( TQRegExp( "\\s+(,|and|&)+\\s+", false ), EncoderXML::currentEncoderXML() ->encode( valueToString( field->value() ) ) ); for ( TQStringList::Iterator it = persons.begin(); it != persons.end(); it++ ) stream << " <person>" << *it << "</person>" << endl; stream << " </" << tag << "s>" << endl; @@ -139,7 +139,7 @@ namespace BibTeX case EntryField::ftMonth: { stream << " <month"; - bool ok = FALSE; + bool ok = false; int month = -1; TQString tag = ""; @@ -157,7 +157,7 @@ namespace BibTeX month = i + 1; } content.append( Months[ i ] ); - ok = TRUE; + ok = true; break; } } @@ -186,7 +186,7 @@ namespace BibTeX } stream << " </entry>" << endl; - return TRUE; + return true; } bool FileExporterXML::writeMacro( TQTextStream &stream, const Macro *macro ) @@ -195,7 +195,7 @@ namespace BibTeX stream << EncoderXML::currentEncoderXML() ->encode( valueToString( macro->value() ) ); stream << "</string>" << endl; - return TRUE; + return true; } bool FileExporterXML::writeComment( TQTextStream &stream, const Comment *comment ) @@ -204,19 +204,19 @@ namespace BibTeX stream << EncoderXML::currentEncoderXML() ->encode( comment->text() ); stream << "</comment>" << endl; - return TRUE; + return true; } TQString FileExporterXML::valueToString( Value *value ) { TQString result; - bool isFirst = TRUE; + bool isFirst = true; for ( TQValueList<ValueItem*>::ConstIterator it = value->items.begin(); it != value->items.end(); it++ ) { if ( !isFirst ) result.append( ' ' ); - isFirst = FALSE; + isFirst = false; result.append(( *it ) ->simplifiedText() ); } diff --git a/src/fileexporterxslt.cpp b/src/fileexporterxslt.cpp index 0474de3..1cd3a89 100644 --- a/src/fileexporterxslt.cpp +++ b/src/fileexporterxslt.cpp @@ -59,11 +59,11 @@ namespace BibTeX htmlTS.setEncoding( TQTextStream::UnicodeUTF8 ); htmlTS << html << endl; m_mutex.unlock(); - return TRUE; + return true; } m_mutex.unlock(); - return FALSE; + return false; } bool FileExporterXSLT::save( TQIODevice* iodevice, const Element* element, TQStringList *errorLog ) @@ -85,11 +85,11 @@ namespace BibTeX output.setEncoding( TQTextStream::UnicodeUTF8 ); output << html << endl; m_mutex.unlock(); - return TRUE; + return true; } m_mutex.unlock(); - return FALSE; + return false; } } diff --git a/src/fileimporter.h b/src/fileimporter.h index e18425e..c6f00e4 100644 --- a/src/fileimporter.h +++ b/src/fileimporter.h @@ -34,7 +34,7 @@ namespace BibTeX */ class FileImporter : public TQObject { - Q_OBJECT + TQ_OBJECT public: FileImporter(); ~FileImporter(); @@ -44,7 +44,7 @@ namespace BibTeX static bool guessCanDecode( const TQString & ) { - return FALSE; + return false; }; signals: diff --git a/src/fileimporterbibtex.cpp b/src/fileimporterbibtex.cpp index 3fc98fa..af8ef0e 100644 --- a/src/fileimporterbibtex.cpp +++ b/src/fileimporterbibtex.cpp @@ -39,9 +39,9 @@ namespace BibTeX const TQString extraAlphaNumChars = TQString( "?'`-_:.+/$\\\"&" ); const TQRegExp htmlRegExp = TQRegExp( "</?(a|pre)[^>]*>", false ); - FileImporterBibTeX::FileImporterBibTeX( bool personFirstNameFirst, TQString encoding ) : FileImporter(), m_personFirstNameFirst( personFirstNameFirst ), m_currentChar( ' ' ), m_ignoreComments( FALSE ), m_lineBufferSize( 4096 ), m_encoding( encoding ) + FileImporterBibTeX::FileImporterBibTeX( bool personFirstNameFirst, TQString encoding ) : FileImporter(), m_personFirstNameFirst( personFirstNameFirst ), m_currentChar( ' ' ), m_ignoreComments( false ), m_lineBufferSize( 4096 ), m_encoding( encoding ) { - cancelFlag = FALSE; + cancelFlag = false; m_lineBuffer = new char[m_lineBufferSize]; m_textStream = NULL; } @@ -55,7 +55,7 @@ namespace BibTeX File* FileImporterBibTeX::load( TQIODevice *iodevice ) { m_mutex.lock(); - cancelFlag = FALSE; + cancelFlag = false; TQString rawText; const char *encodingFrom = m_encoding == "latex" ? "utf-8\0" : m_encoding.append( "\0" ).ascii(); @@ -163,7 +163,7 @@ namespace BibTeX void FileImporterBibTeX::cancel() { - cancelFlag = TRUE; + cancelFlag = true; } Element *FileImporterBibTeX::nextElement() @@ -204,7 +204,7 @@ namespace BibTeX while ( m_currentChar != '{' && m_currentChar != '(' && !m_textStream->atEnd() ) m_currentChar = nextChar(); - return new Comment( readBracketString( m_currentChar ), TRUE ); + return new Comment( readBracketString( m_currentChar ), true ); } Comment *FileImporterBibTeX::readPlainCommentElement() @@ -219,7 +219,7 @@ namespace BibTeX result.append( readLine() ); m_currentChar = nextChar(); } - return new Comment( result, FALSE ); + return new Comment( result, false ); } Macro *FileImporterBibTeX::readMacroElement() @@ -245,7 +245,7 @@ namespace BibTeX Macro *macro = new Macro( key ); do { - bool isStringKey = FALSE; + bool isStringKey = false; TQString text = readString( isStringKey ).replace( TQRegExp( "\\s+" ), " " ); if ( isStringKey ) macro->value()->items.append( new MacroKey( text ) ); @@ -275,7 +275,7 @@ namespace BibTeX Preamble *preamble = new Preamble( ); do { - bool isStringKey = FALSE; + bool isStringKey = false; TQString text = readString( isStringKey ).replace( TQRegExp( "\\s+" ), " " ); if ( isStringKey ) preamble->value()->items.append( new MacroKey( text ) ); @@ -350,7 +350,7 @@ namespace BibTeX entry->addField( entryField ); } - while ( TRUE ); + while ( true ); return entry; } @@ -403,7 +403,7 @@ namespace BibTeX while ( m_currentChar.isSpace() ) m_currentChar = nextChar(); - isStringKey = FALSE; + isStringKey = false; switch ( m_currentChar.latin1() ) { case '{': @@ -412,7 +412,7 @@ namespace BibTeX case '"': return readQuotedString(); default: - isStringKey = TRUE; + isStringKey = true; return readSimpleString(); } } @@ -513,7 +513,7 @@ namespace BibTeX do { - bool isStringKey = FALSE; + bool isStringKey = false; TQString text = readString( isStringKey ).replace( TQRegExp( "\\s+" ), " " ); switch ( fieldType ) diff --git a/src/fileimporterbibtex.h b/src/fileimporterbibtex.h index a110734..754e111 100644 --- a/src/fileimporterbibtex.h +++ b/src/fileimporterbibtex.h @@ -41,7 +41,7 @@ namespace BibTeX class FileImporterBibTeX : public FileImporter { public: - FileImporterBibTeX( bool personFirstNameFirst = FALSE, TQString encoding = "latex" ); + FileImporterBibTeX( bool personFirstNameFirst = false, TQString encoding = "latex" ); ~FileImporterBibTeX(); File* load( TQIODevice *iodevice ); diff --git a/src/fileimporterbibutils.cpp b/src/fileimporterbibutils.cpp index 169aa73..ef8f0e8 100644 --- a/src/fileimporterbibutils.cpp +++ b/src/fileimporterbibutils.cpp @@ -127,9 +127,9 @@ namespace BibTeX if ( m_process != NULL ) { m_waiting = true; - connect( m_process, SIGNAL( processExited() ), this, SLOT( wakeUp() ) ); - connect( m_process, SIGNAL( readyReadStdout() ), this, SLOT( slotReadyStdout() ) ); - connect( m_process, SIGNAL( readyReadStderr() ), this, SLOT( slotReadyStderr() ) ); + connect( m_process, TQ_SIGNAL( processExited() ), this, TQ_SLOT( wakeUp() ) ); + connect( m_process, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( slotReadyStdout() ) ); + connect( m_process, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( slotReadyStderr() ) ); m_process->start(); if ( m_process->isRunning() ) @@ -181,9 +181,9 @@ namespace BibTeX m_waiting = true; m_process = new TQProcess( TQStringList::split( ' ', "xml2bib -i utf8 -o utf8 -sk" ) ); - connect( m_process, SIGNAL( processExited() ), this, SLOT( wakeUp() ) ); - connect( m_process, SIGNAL( readyReadStdout() ), this, SLOT( slotReadyStdout() ) ); - connect( m_process, SIGNAL( readyReadStderr() ), this, SLOT( slotReadyStderr() ) ); + connect( m_process, TQ_SIGNAL( processExited() ), this, TQ_SLOT( wakeUp() ) ); + connect( m_process, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( slotReadyStdout() ) ); + connect( m_process, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( slotReadyStderr() ) ); if ( m_process->start() ) { diff --git a/src/fileimporterbibutils.h b/src/fileimporterbibutils.h index 2fc46d1..541b341 100644 --- a/src/fileimporterbibutils.h +++ b/src/fileimporterbibutils.h @@ -34,7 +34,7 @@ namespace BibTeX */ class FileImporterBibUtils : public FileImporter { - Q_OBJECT + TQ_OBJECT public: FileImporterBibUtils( BibTeX::File::FileFormat inputFormat ); ~FileImporterBibUtils(); diff --git a/src/fileimporterexternal.cpp b/src/fileimporterexternal.cpp index d962d0a..732037e 100644 --- a/src/fileimporterexternal.cpp +++ b/src/fileimporterexternal.cpp @@ -67,13 +67,13 @@ namespace BibTeX bool FileImporterExternal::fetchInput( TQIODevice *input, TQBuffer &output ) { - bool result = FALSE; + bool result = false; TQString commandLine; switch ( m_fileformat ) { default: - return FALSE; + return false; } TQStringList args = TQStringList::split( ' ', commandLine ); @@ -84,10 +84,10 @@ namespace BibTeX TQApplication::setOverrideCursor( TQt::waitCursor ); process = new TQProcess( args ); - connect( process, SIGNAL( processExited() ), this, SLOT( slotProcessExited() ) ); - connect( process, SIGNAL( readyReadStdout() ), this, SLOT( slotReadProcessOutput() ) ); - connect( process, SIGNAL( readyReadStderr() ), this, SLOT( slotReadProcessOutput() ) ); - connect( process, SIGNAL( wroteToStdin() ), this, SLOT( slotWroteToStdin() ) ); + connect( process, TQ_SIGNAL( processExited() ), this, TQ_SLOT( slotProcessExited() ) ); + connect( process, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( slotReadProcessOutput() ) ); + connect( process, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( slotReadProcessOutput() ) ); + connect( process, TQ_SIGNAL( wroteToStdin() ), this, TQ_SLOT( slotWroteToStdin() ) ); if ( process->start() ) { @@ -109,10 +109,10 @@ namespace BibTeX result = process->normalExit(); } - disconnect( process, SIGNAL( wroteToStdin() ), this, SLOT( slotWroteToStdin() ) ); - disconnect( process, SIGNAL( readyReadStdout() ), this, SLOT( slotReadProcessOutput() ) ); - disconnect( process, SIGNAL( readyReadStderr() ), this, SLOT( slotReadProcessOutput() ) ); - disconnect( process, SIGNAL( processExited() ), this, SLOT( slotProcessExited() ) ); + disconnect( process, TQ_SIGNAL( wroteToStdin() ), this, TQ_SLOT( slotWroteToStdin() ) ); + disconnect( process, TQ_SIGNAL( readyReadStdout() ), this, TQ_SLOT( slotReadProcessOutput() ) ); + disconnect( process, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( slotReadProcessOutput() ) ); + disconnect( process, TQ_SIGNAL( processExited() ), this, TQ_SLOT( slotProcessExited() ) ); delete( process ); process = NULL; delete writeTo; diff --git a/src/fileimporterexternal.h b/src/fileimporterexternal.h index d91f5b6..5ace8a4 100644 --- a/src/fileimporterexternal.h +++ b/src/fileimporterexternal.h @@ -35,7 +35,7 @@ namespace BibTeX */ class FileImporterExternal : public FileImporter { - Q_OBJECT + TQ_OBJECT public: enum Importer {importerNone = 0, importerBibConv = 4}; @@ -46,7 +46,7 @@ namespace BibTeX // FIXME: this is a stub: static bool guessCanDecode( const TQString & ) { - return TRUE; + return true; }; public slots: diff --git a/src/fileimporterris.cpp b/src/fileimporterris.cpp index 2a9055e..2b1a226 100644 --- a/src/fileimporterris.cpp +++ b/src/fileimporterris.cpp @@ -42,7 +42,7 @@ namespace BibTeX File* FileImporterRIS::load( TQIODevice *iodevice ) { m_mutex.lock(); - cancelFlag = FALSE; + cancelFlag = false; m_refNr = 0; TQTextStream textStream( iodevice ); @@ -76,7 +76,7 @@ namespace BibTeX void FileImporterRIS::cancel() { - cancelFlag = TRUE; + cancelFlag = true; } Element *FileImporterRIS::nextElement( TQTextStream &textStream ) @@ -161,7 +161,7 @@ namespace BibTeX splitRegExp = TQRegExp( "\\s*[,\\n]\\s*" ); else splitRegExp = TQRegExp( "\\n" ); - TQStringList newKeywords = TQStringList::split( splitRegExp, text, FALSE ); + TQStringList newKeywords = TQStringList::split( splitRegExp, text, false ); for ( TQStringList::Iterator it = newKeywords.begin(); it != newKeywords.end(); ++it ) keywordList.append( *it ); diff --git a/src/findduplicates.cpp b/src/findduplicates.cpp index 00e7240..bba1e66 100644 --- a/src/findduplicates.cpp +++ b/src/findduplicates.cpp @@ -56,7 +56,7 @@ namespace KBibTeX TQApplication::setOverrideCursor( TQt::waitCursor ); KProgressDialog *progDlg = new KProgressDialog( parent, NULL, i18n( "Find Duplicates" ), i18n( "Searching for duplicates..." ), true ); - connect( progDlg, SIGNAL( cancelClicked() ), this, SLOT( slotCancel() ) ); + connect( progDlg, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( slotCancel() ) ); progDlg->progressBar()->setTotalSteps( len ); determineDistances( file, distVector, mapElementToIndex, progDlg ); @@ -413,7 +413,7 @@ namespace KBibTeX return -1; /** no value item found or is empty */ /** parse value item's text */ - bool ok = FALSE; + bool ok = false; int year = TQString( valueItem->text() ).toInt( &ok ); if ( !ok ) year = -1; diff --git a/src/findduplicates.h b/src/findduplicates.h index 27228d3..26d08c2 100644 --- a/src/findduplicates.h +++ b/src/findduplicates.h @@ -33,7 +33,7 @@ namespace KBibTeX */ class FindDuplicates : public TQObject { - Q_OBJECT + TQ_OBJECT public: typedef TQValueList<BibTeX::Element*> DuplicateClique; typedef TQValueList<DuplicateClique> DuplicateCliqueList; diff --git a/src/idsuggestions.cpp b/src/idsuggestions.cpp index 8e38c9f..dcbafcf 100644 --- a/src/idsuggestions.cpp +++ b/src/idsuggestions.cpp @@ -123,7 +123,7 @@ namespace KBibTeX return -1; /** no value item found or is empty */ /** parse value item's text */ - bool ok = FALSE; + bool ok = false; TQRegExp yearRegExp( "\\b(\\d{2})?\\d{2}\\b" ); yearRegExp.search( valueItem->text() ); int year = TQString( yearRegExp.cap( 0 ) ).toInt( &ok ); @@ -223,8 +223,8 @@ namespace KBibTeX else return TQString::null; } - case 't': return translateTitleToken( entry, token.mid( 1 ), FALSE ); - case 'T': return translateTitleToken( entry, token.mid( 1 ), TRUE ); + case 't': return translateTitleToken( entry, token.mid( 1 ), false ); + case 'T': return translateTitleToken( entry, token.mid( 1 ), true ); case '"': return token.mid( 1 ); default: return TQString::null; } @@ -262,8 +262,8 @@ namespace KBibTeX unsigned int pos = 0; struct IdSuggestionTokenInfo result; result.len = 0x00ffffff; - result.toLower = FALSE; - result.toUpper = FALSE; + result.toLower = false; + result.toUpper = false; result.inBetween = TQString::null; if ( token.length() > pos ) @@ -297,12 +297,12 @@ namespace KBibTeX const TQStringList smallWords = settings->idSuggestions_smallWords; TQString result; - bool first = TRUE; + bool first = true; TQStringList titleWords = TQStringList::split( TQRegExp( "\\s+" ), extractTitle( entry ) ); for ( TQStringList::ConstIterator it = titleWords.begin(); it != titleWords.end(); ++it ) { if ( first ) - first = FALSE; + first = false; else result.append( tti.inBetween ); @@ -322,12 +322,12 @@ namespace KBibTeX /** convert a formatting string into a human readable version (even translated) */ TQString IdSuggestions::formatStrToHuman( const TQString& formatStr ) { - bool first = TRUE; + bool first = true; TQString text; TQStringList elements = TQStringList::split( '|', formatStr ); for ( TQStringList::iterator it = elements.begin();it != elements.end();++it ) { - if ( first ) first = FALSE; else text.append( "\n" ); + if ( first ) first = false; else text.append( "\n" ); if (( *it )[0] == 'a' || ( *it )[0] == 'A' || ( *it )[0] == 'z' ) { struct IdSuggestionTokenInfo info = evalToken(( *it ).mid( 1 ) ); diff --git a/src/idsuggestionswidget.cpp b/src/idsuggestionswidget.cpp index ee7f123..0265933 100644 --- a/src/idsuggestionswidget.cpp +++ b/src/idsuggestionswidget.cpp @@ -63,9 +63,9 @@ namespace KBibTeX layout->addWidget( m_pushButtonDown ); layout->addWidget( m_pushButtonDel ); layout->addStretch( 10 ); - connect( m_pushButtonUp, SIGNAL( clicked() ), this, SLOT( slotUp() ) ); - connect( m_pushButtonDown, SIGNAL( clicked() ), this, SLOT( slotDown() ) ); - connect( m_pushButtonDel, SIGNAL( clicked() ), this, SLOT( slotDelete() ) ); + connect( m_pushButtonUp, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotUp() ) ); + connect( m_pushButtonDown, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDown() ) ); + connect( m_pushButtonDel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDelete() ) ); return container; } @@ -115,7 +115,7 @@ namespace KBibTeX TQLabel *label = new TQLabel( m_title, this ); TQFont labelFont( label->font() ); - labelFont.setBold( TRUE ); + labelFont.setBold( true ); label->setFont( labelFont ); label->setBackgroundColor( TDEGlobalSettings::highlightColor() ); label->setPaletteForegroundColor( TDEGlobalSettings::highlightedTextColor() ); @@ -133,13 +133,13 @@ namespace KBibTeX case 'z': m_comboBoxWhichAuthors->setCurrentItem( 2 ); break; default: m_comboBoxWhichAuthors->setCurrentItem( 0 ); } - connect( m_comboBoxWhichAuthors, SIGNAL( activated( const TQString& ) ), SIGNAL( modified() ) ); + connect( m_comboBoxWhichAuthors, TQ_SIGNAL( activated( const TQString& ) ), TQ_SIGNAL( modified() ) ); struct IdSuggestionTokenInfo info = IdSuggestions::evalToken( text.mid( 1 ) ); label = new TQLabel( i18n( "Casing:" ), this ); layout->addWidget( label, 2, 0 ); - m_comboBoxCasing = new KComboBox( FALSE, this ); + m_comboBoxCasing = new KComboBox( false, this ); label->setBuddy( m_comboBoxCasing ); layout->addWidget( m_comboBoxCasing, 2, 1 ); m_comboBoxCasing->insertItem( i18n( "No change" ) ); @@ -151,7 +151,7 @@ namespace KBibTeX m_comboBoxCasing->setCurrentItem( 2 ); else m_comboBoxCasing->setCurrentItem( 0 ); - connect( m_comboBoxCasing, SIGNAL( activated( const TQString& ) ), SIGNAL( modified() ) ); + connect( m_comboBoxCasing, TQ_SIGNAL( activated( const TQString& ) ), TQ_SIGNAL( modified() ) ); label = new TQLabel( i18n( "Only first letters:" ), this ); layout->addWidget( label, 3, 0 ); @@ -163,7 +163,7 @@ namespace KBibTeX m_spinBoxLen->setSpecialValueText( i18n( "Complete name" ) ); m_spinBoxLen->setValue( info.len > 9 ? 0 : info.len ); m_spinBoxLen->setMinimumWidth( m_spinBoxLen->fontMetrics().width( i18n( "Complete name" ) ) + 32 ); - connect( m_spinBoxLen, SIGNAL( valueChanged( int ) ), SIGNAL( modified() ) ); + connect( m_spinBoxLen, TQ_SIGNAL( valueChanged( int ) ), TQ_SIGNAL( modified() ) ); label = new TQLabel( i18n( "Text between authors:" ), this ); layout->addWidget( label, 4, 0 ); @@ -171,7 +171,7 @@ namespace KBibTeX label->setBuddy( m_lineEditInBetween ); layout->addWidget( m_lineEditInBetween, 4, 1 ); m_lineEditInBetween->setText( info.inBetween ); - connect( m_lineEditInBetween, SIGNAL( textChanged( const TQString& ) ), SIGNAL( modified() ) ); + connect( m_lineEditInBetween, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SIGNAL( modified() ) ); layout->setRowStretch( 5, 1 ); layout->setColStretch( 1, 1 ); @@ -204,7 +204,7 @@ namespace KBibTeX TQLabel *label = new TQLabel( m_title, this ); TQFont labelFont( label->font() ); - labelFont.setBold( TRUE ); + labelFont.setBold( true ); label->setFont( labelFont ); label->setBackgroundColor( TDEGlobalSettings::highlightColor() ); label->setPaletteForegroundColor( TDEGlobalSettings::highlightedTextColor() ); @@ -214,13 +214,13 @@ namespace KBibTeX m_checkBoxRemoveSmallWords = new TQCheckBox( i18n( "Remove small words" ), this ); layout->addMultiCellWidget( m_checkBoxRemoveSmallWords, 1, 1, 0, 1 ); m_checkBoxRemoveSmallWords->setChecked( text[0] == 'T' ); - connect( m_checkBoxRemoveSmallWords, SIGNAL( toggled( bool ) ), SIGNAL( modified() ) ); + connect( m_checkBoxRemoveSmallWords, TQ_SIGNAL( toggled( bool ) ), TQ_SIGNAL( modified() ) ); struct IdSuggestionTokenInfo info = IdSuggestions::evalToken( text.mid( 1 ) ); label = new TQLabel( i18n( "Casing:" ), this ); layout->addWidget( label, 2, 0 ); - m_comboBoxCasing = new KComboBox( FALSE, this ); + m_comboBoxCasing = new KComboBox( false, this ); label->setBuddy( m_comboBoxCasing ); layout->addWidget( m_comboBoxCasing, 2, 1 ); m_comboBoxCasing->insertItem( i18n( "No change" ) ); @@ -232,7 +232,7 @@ namespace KBibTeX m_comboBoxCasing->setCurrentItem( 2 ); else m_comboBoxCasing->setCurrentItem( 0 ); - connect( m_comboBoxCasing, SIGNAL( textChanged( const TQString& ) ), SIGNAL( modified() ) ); + connect( m_comboBoxCasing, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SIGNAL( modified() ) ); label = new TQLabel( i18n( "Only first letters:" ), this ); layout->addWidget( label, 3, 0 ); @@ -244,7 +244,7 @@ namespace KBibTeX m_spinBoxLen->setSpecialValueText( i18n( "Complete title" ) ); m_spinBoxLen->setValue( info.len > 9 ? 0 : info.len ); m_spinBoxLen->setMinimumWidth( m_spinBoxLen->fontMetrics().width( i18n( "Complete title" ) ) + 32 ); - connect( m_spinBoxLen, SIGNAL( valueChanged( int ) ), SIGNAL( modified() ) ); + connect( m_spinBoxLen, TQ_SIGNAL( valueChanged( int ) ), TQ_SIGNAL( modified() ) ); label = new TQLabel( i18n( "Text between words:" ), this ); layout->addWidget( label, 4, 0 ); @@ -252,7 +252,7 @@ namespace KBibTeX label->setBuddy( m_lineEditInBetween ); layout->addWidget( m_lineEditInBetween, 4, 1 ); m_lineEditInBetween->setText( info.inBetween ); - connect( m_lineEditInBetween, SIGNAL( textChanged( const TQString& ) ), SIGNAL( modified() ) ); + connect( m_lineEditInBetween, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SIGNAL( modified() ) ); layout->setRowStretch( 5, 1 ); layout->setColStretch( 1, 1 ); @@ -279,7 +279,7 @@ namespace KBibTeX TQLabel *label = new TQLabel( m_title, this ); TQFont labelFont( label->font() ); - labelFont.setBold( TRUE ); + labelFont.setBold( true ); label->setFont( labelFont ); label->setBackgroundColor( TDEGlobalSettings::highlightColor() ); label->setPaletteForegroundColor( TDEGlobalSettings::highlightedTextColor() ); @@ -294,7 +294,7 @@ namespace KBibTeX m_comboBoxDigits->insertItem( i18n( "2 digits" ) ); m_comboBoxDigits->insertItem( i18n( "4 digits" ) ); m_comboBoxDigits->setCurrentItem( text[0] == 'y' ? 0 : 1 ); - connect( m_comboBoxDigits, SIGNAL( activated( int ) ), SIGNAL( modified() ) ); + connect( m_comboBoxDigits, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( modified() ) ); layout->setColStretch( 1, 1 ); layout->setRowStretch( 2, 1 ); @@ -314,7 +314,7 @@ namespace KBibTeX TQLabel *label = new TQLabel( m_title, this ); TQFont labelFont( label->font() ); - labelFont.setBold( TRUE ); + labelFont.setBold( true ); label->setFont( labelFont ); label->setBackgroundColor( TDEGlobalSettings::highlightColor() ); label->setPaletteForegroundColor( TDEGlobalSettings::highlightedTextColor() ); @@ -327,7 +327,7 @@ namespace KBibTeX label->setBuddy( m_lineEditInBetween ); layout->addWidget( m_lineEditInBetween, 1, 1 ); m_lineEditInBetween->setText( text.mid( 1 ) ); - connect( m_lineEditInBetween, SIGNAL( textChanged( const TQString& ) ), SIGNAL( modified() ) ); + connect( m_lineEditInBetween, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SIGNAL( modified() ) ); layout->setColStretch( 1, 1 ); layout->setRowStretch( 2, 1 ); @@ -428,9 +428,9 @@ namespace KBibTeX if ( component != NULL ) { ++m_componentCount; - connect( component, SIGNAL( moved() ), this, SLOT( updateGUI() ) ); - connect( component, SIGNAL( deleted() ), this, SLOT( componentDeleted() ) ); - connect( component, SIGNAL( modified() ), this, SLOT( updateExample() ) ); + connect( component, TQ_SIGNAL( moved() ), this, TQ_SLOT( updateGUI() ) ); + connect( component, TQ_SIGNAL( deleted() ), this, TQ_SLOT( componentDeleted() ) ); + connect( component, TQ_SIGNAL( modified() ), this, TQ_SLOT( updateExample() ) ); } } @@ -442,7 +442,7 @@ namespace KBibTeX void IdSuggestionsWidget::apply( TQString& formatStr ) { - bool first = TRUE; + bool first = true; formatStr = ""; TQLayoutIterator it = m_listOfComponents->layout()->iterator(); TQLayoutItem *child; @@ -452,7 +452,7 @@ namespace KBibTeX TQString text = TQString::null; if ( component != NULL && ( text = component->text() ) != TQString::null ) { - if ( first ) first = FALSE; else formatStr.append( "|" ); + if ( first ) first = false; else formatStr.append( "|" ); formatStr.append( text ); } ++it; @@ -477,14 +477,14 @@ namespace KBibTeX m_scrollViewComponents->addChild( m_listOfComponents ); gridLayout->addMultiCellWidget( m_scrollViewComponents, 2, 2, 0, 1 ); TQVBoxLayout *listLayout = new TQVBoxLayout( m_listOfComponents, 0, KDialog::spacingHint() ); - listLayout->setAutoAdd( TRUE ); + listLayout->setAutoAdd( true ); TDEPopupMenu *addMenu = new TDEPopupMenu( m_pushButtonAdd ); addMenu->insertItem( i18n( "Author" ), 1 ); addMenu->insertItem( i18n( "Year" ), 2 ); addMenu->insertItem( i18n( "Title" ), 3 ); addMenu->insertItem( i18n( "Text" ), 4 ); - connect( addMenu, SIGNAL( activated( int ) ), this, SLOT( addMenuActivated( int ) ) ); + connect( addMenu, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( addMenuActivated( int ) ) ); m_pushButtonAdd->setPopup( addMenu ); } @@ -506,9 +506,9 @@ namespace KBibTeX comp->show(); - connect( comp, SIGNAL( moved() ), this, SLOT( updateGUI() ) ); - connect( comp, SIGNAL( deleted() ), this, SLOT( componentDeleted() ) ); - connect( comp, SIGNAL( modified() ), this, SLOT( updateExample() ) ); + connect( comp, TQ_SIGNAL( moved() ), this, TQ_SLOT( updateGUI() ) ); + connect( comp, TQ_SIGNAL( deleted() ), this, TQ_SLOT( componentDeleted() ) ); + connect( comp, TQ_SIGNAL( modified() ), this, TQ_SLOT( updateExample() ) ); m_listOfComponents->adjustSize(); m_scrollViewComponents->ensureVisible( 10, m_listOfComponents->height() - 2 ); updateGUI(); @@ -520,7 +520,7 @@ namespace KBibTeX TQLayoutIterator it = m_listOfComponents->layout()->iterator(); TQLayoutItem *child = NULL; IdSuggestionComponent *lastComponent = NULL; - bool first = TRUE; + bool first = true; int i = 0; while (( child = it.current() ) != 0 ) { @@ -530,11 +530,11 @@ namespace KBibTeX { if ( first ) { - first = FALSE; - component->setEnableUpDown( FALSE, m_componentCount > 1 ); + first = false; + component->setEnableUpDown( false, m_componentCount > 1 ); } else - component->setEnableUpDown( TRUE, i < m_componentCount - 1 ); + component->setEnableUpDown( true, i < m_componentCount - 1 ); ++i; lastComponent = component; @@ -542,7 +542,7 @@ namespace KBibTeX } if ( lastComponent != NULL ) - lastComponent->setEnableUpDown( m_componentCount > 1, FALSE ); + lastComponent->setEnableUpDown( m_componentCount > 1, false ); m_scrollViewComponents->updateGeometry(); m_parent->enableButtonOK( m_componentCount > 0 ); diff --git a/src/idsuggestionswidget.h b/src/idsuggestionswidget.h index 0f8b5cb..43c6794 100644 --- a/src/idsuggestionswidget.h +++ b/src/idsuggestionswidget.h @@ -34,7 +34,7 @@ namespace KBibTeX { class IdSuggestionComponent: public TQFrame { - Q_OBJECT + TQ_OBJECT public: IdSuggestionComponent( const TQString& title, TQWidget *parent ); virtual TQString text() const = 0; @@ -105,7 +105,7 @@ namespace KBibTeX class IdSuggestionsScrollView : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: IdSuggestionsScrollView( TQWidget *parent, const char*name = NULL ); ~IdSuggestionsScrollView(); @@ -124,7 +124,7 @@ namespace KBibTeX */ class IdSuggestionsWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ~IdSuggestionsWidget(); int numComponents(); diff --git a/src/kbibtex.desktop b/src/kbibtex.desktop index 5039a0f..6e0d27f 100644 --- a/src/kbibtex.desktop +++ b/src/kbibtex.desktop @@ -6,7 +6,6 @@ Icon=kbibtex Type=Application X-DocPath=kbibtex/index.html Comment=A BibTeX editor for TDE -Comment[de]=Ein BibTeX-Editor für TDE MimeType=text/x-bibtex; Categories=Qt;TDE;Office; X-TDE-HasTempFileOption=true diff --git a/src/kbibtex_part.cpp b/src/kbibtex_part.cpp index fdbb904..bf8d80d 100644 --- a/src/kbibtex_part.cpp +++ b/src/kbibtex_part.cpp @@ -32,7 +32,7 @@ #include <tqlabel.h> #include <tqtextedit.h> #include <tqclipboard.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaction.h> #include <kstdaction.h> #include <tdelistview.h> @@ -46,7 +46,7 @@ #include <tdemessagebox.h> #include <kinputdialog.h> #include <tdeshortcut.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <tdeapplication.h> #include <kxmlguifactory.h> @@ -74,7 +74,7 @@ const TQString inPipeFilename = TQDir::homeDirPath() + "/.kbibtex.in"; KBibTeXPart::KBibTeXPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name ) - : KParts::ReadWritePart( parent, name ), m_defInitCounter( 0 ), m_settingsDlg( NULL ), m_initializationDone( FALSE ), m_inPipe( NULL ) + : KParts::ReadWritePart( parent, name ), m_defInitCounter( 0 ), m_settingsDlg( NULL ), m_initializationDone( false ), m_inPipe( NULL ) { m_mainWindow = dynamic_cast<TDEMainWindow*>( parent ); if ( m_mainWindow == NULL ) @@ -93,15 +93,15 @@ KBibTeXPart::KBibTeXPart( TQWidget *parentWidget, const char *widgetName, setupActions(); // we are read-write by default - setReadWrite( TRUE ); + setReadWrite( true ); // we are not modified since we haven't done anything yet - setModified( FALSE ); + setModified( false ); // read configuration readSettings(); - TQTimer::singleShot( 100, this, SLOT( slotDeferredInitialization() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( slotDeferredInitialization() ) ); } KBibTeXPart::~KBibTeXPart() @@ -116,12 +116,12 @@ void KBibTeXPart::setReadWrite( bool rw ) { if ( rw ) { - connect( m_documentWidget, SIGNAL( modified( ) ), this, SLOT( setModified( ) ) ); + connect( m_documentWidget, TQ_SIGNAL( modified( ) ), this, TQ_SLOT( setModified( ) ) ); m_actionEditElement->setText( i18n( "&Edit" ) ); } else { - disconnect( m_documentWidget, SIGNAL( modified( ) ), this, SLOT( setModified( ) ) ); + disconnect( m_documentWidget, TQ_SIGNAL( modified( ) ), this, TQ_SLOT( setModified( ) ) ); m_actionEditElement->setText( i18n( "&View" ) ); } ReadWritePart::setReadWrite( rw ); @@ -149,7 +149,7 @@ bool KBibTeXPart::queryClose() writeSettings(); if ( !isReadWrite() || !isModified() ) - return TRUE; + return true; TQString docName = url().fileName(); if ( docName.isEmpty() ) docName = i18n( "Untitled" ); @@ -173,12 +173,12 @@ bool KBibTeXPart::queryClose() else save(); } - else if ( abortClose ) return FALSE; + else if ( abortClose ) return false; return waitSaveComplete(); case KMessageBox::No : - return TRUE; + return true; default: - return FALSE; + return false; } } @@ -198,7 +198,7 @@ bool KBibTeXPart::closeURL() bool KBibTeXPart::openFile() { - return m_documentWidget->open( m_file, FALSE ); + return m_documentWidget->open( m_file, false ); } /** @@ -206,8 +206,8 @@ bool KBibTeXPart::openFile() */ bool KBibTeXPart::saveFile() { - if ( isReadWrite() == FALSE ) - return FALSE; + if ( isReadWrite() == false ) + return false; if ( !url().isValid() || url().isEmpty() ) return saveAs(); @@ -218,7 +218,7 @@ bool KBibTeXPart::saveFile() settings->createBackup( url(), widget() ); KTempFile tempBibFile = KTempFile( locateLocal( "tmp", "bibsave" ) ); - tempBibFile.setAutoDelete( TRUE ); + tempBibFile.setAutoDelete( true ); bool success = m_documentWidget->save( tempBibFile.file() ); tempBibFile.close(); if ( success ) @@ -244,7 +244,7 @@ void KBibTeXPart::slotFileSaveAs() bool KBibTeXPart::saveAs() { - bool result = FALSE; + bool result = false; KBibTeX::Settings * settings = KBibTeX::Settings::self( NULL ); TQString startDir = ! url().isEmpty() ? url().url() : TQDir::currentDirPath(); @@ -253,13 +253,13 @@ bool KBibTeXPart::saveAs() if ( saveURL.isValid() && !saveURL.isEmpty() ) { - if ( TDEIO::NetAccess::exists( saveURL, FALSE, widget() ) && KMessageBox::warningContinueCancel( widget(), i18n( "A file named '%1' already exists. Are you sure you want to overwrite it?" ).arg( saveURL.filename() ), TQString::null, i18n( "Overwrite" ) ) != KMessageBox::Continue ) + if ( TDEIO::NetAccess::exists( saveURL, false, widget() ) && KMessageBox::warningContinueCancel( widget(), i18n( "A file named '%1' already exists. Are you sure you want to overwrite it?" ).arg( saveURL.filename() ), TQString::null, i18n( "Overwrite" ) ) != KMessageBox::Continue ) return result; if ( ReadWritePart::saveAs( saveURL ) ) { emit signalAddRecentURL( saveURL ); - result = TRUE; + result = true; } } @@ -274,7 +274,7 @@ void KBibTeXPart::slotFileExport() if ( exportURL.isValid() && !exportURL.isEmpty() ) { - if ( TDEIO::NetAccess::exists( exportURL, FALSE, widget() ) ) + if ( TDEIO::NetAccess::exists( exportURL, false, widget() ) ) { if ( KMessageBox::warningContinueCancel( widget(), i18n( "A file named '%1' already exists. Are you sure you want to overwrite it?" ).arg( exportURL.filename() ), TQString::null, i18n( "Overwrite" ) ) != KMessageBox::Continue ) return ; @@ -285,21 +285,21 @@ void KBibTeXPart::slotFileExport() } KTempFile tempBibFile = KTempFile( locateLocal( "tmp", "bibexport" ) ); - tempBibFile.setAutoDelete( TRUE ); + tempBibFile.setAutoDelete( true ); BibTeX::File::FileFormat format = BibTeX::File::formatBibTeX; - if ( exportURL.fileName().endsWith( ".rtf", FALSE ) ) + if ( exportURL.fileName().endsWith( ".rtf", false ) ) format = BibTeX::File::formatRTF; - else if ( exportURL.fileName().endsWith( ".pdf", FALSE ) ) + else if ( exportURL.fileName().endsWith( ".pdf", false ) ) format = BibTeX::File::formatPDF; - else if ( exportURL.fileName().endsWith( ".ps", FALSE ) ) + else if ( exportURL.fileName().endsWith( ".ps", false ) ) format = BibTeX::File::formatPS; - else if ( settings->external_xml2bibAvailable && settings->external_end2xmlAvailable && ( exportURL.fileName().endsWith( ".ref", FALSE ) || exportURL.fileName().endsWith( ".refer", FALSE ) || exportURL.fileName().endsWith( ".txt", FALSE ) || exportURL.fileName().endsWith( ".rfr", FALSE ) ) ) + else if ( settings->external_xml2bibAvailable && settings->external_end2xmlAvailable && ( exportURL.fileName().endsWith( ".ref", false ) || exportURL.fileName().endsWith( ".refer", false ) || exportURL.fileName().endsWith( ".txt", false ) || exportURL.fileName().endsWith( ".rfr", false ) ) ) format = BibTeX::File::formatEndNote; - else if ( settings->external_xml2bibAvailable && settings->external_end2xmlAvailable && ( exportURL.fileName().endsWith( ".isi", FALSE ) || exportURL.fileName().endsWith( ".cgi", FALSE ) ) ) + else if ( settings->external_xml2bibAvailable && settings->external_end2xmlAvailable && ( exportURL.fileName().endsWith( ".isi", false ) || exportURL.fileName().endsWith( ".cgi", false ) ) ) format = BibTeX::File::formatISI; - else if ( exportURL.fileName().endsWith( ".ris", FALSE ) ) + else if ( exportURL.fileName().endsWith( ".ris", false ) ) format = BibTeX::File::formatRIS; - else if ( exportURL.fileName().endsWith( ".xml", FALSE ) ) + else if ( exportURL.fileName().endsWith( ".xml", false ) ) { TQStringList options = TQStringList::split( '|', ( settings->external_xml2bibAvailable && settings->external_end2xmlAvailable ? "DocBook5|MODS|internal XML" : "DocBook5|internal XML" ) ); bool ok = false; @@ -311,7 +311,7 @@ void KBibTeXPart::slotFileExport() else if ( ok && !answer.isNull() && answer == "internal XML" ) format = BibTeX::File::formatXML; } - else if ( exportURL.fileName().endsWith( ".html", FALSE ) ) + else if ( exportURL.fileName().endsWith( ".html", false ) ) format = BibTeX::File::formatHTML; else { @@ -334,7 +334,7 @@ void KBibTeXPart::slotFileExport() if ( !error ) { tempBibFile.close(); - error = !TDEIO::NetAccess::file_copy( KURL( tempBibFile.name() ), exportURL, -1, TRUE, FALSE, widget() ); + error = !TDEIO::NetAccess::file_copy( KURL( tempBibFile.name() ), exportURL, -1, true, false, widget() ); } if ( error ) @@ -378,18 +378,18 @@ void KBibTeXPart::slotFileMerge() return; extension = extension.mid( extPos ); - if ( !TDEIO::NetAccess::exists( mergeURL, TRUE, widget() ) ) + if ( !TDEIO::NetAccess::exists( mergeURL, true, widget() ) ) { KMessageBox::error( widget(), i18n( "The given file could not be read, check if it exists or if it is readable for the current user." ) ); return ; } KTempFile tempBibFile = KTempFile( locateLocal( "tmp", "bibmerge" ), extension ); - tempBibFile.setAutoDelete( TRUE ); - bool error = !TDEIO::NetAccess::file_copy( mergeURL, KURL( tempBibFile.name() ), -1, TRUE, FALSE, widget() ); + tempBibFile.setAutoDelete( true ); + bool error = !TDEIO::NetAccess::file_copy( mergeURL, KURL( tempBibFile.name() ), -1, true, false, widget() ); if ( !error ) - error = !m_documentWidget->open( tempBibFile.name(), TRUE ); + error = !m_documentWidget->open( tempBibFile.name(), true ); tempBibFile.close(); @@ -399,7 +399,7 @@ void KBibTeXPart::slotFileMerge() return; } else - setModified( TRUE ); + setModified( true ); } void KBibTeXPart::slotPreferences() @@ -424,111 +424,111 @@ void KBibTeXPart::setupActions() { if ( isReadWrite() ) { - KStdAction::save( this, SLOT( save() ), actionCollection() ) ->setToolTip( i18n( "Save the current file" ) ); - KStdAction::saveAs( this, SLOT( slotFileSaveAs() ), actionCollection() ) ->setToolTip( i18n( "Save the current file under a new filename" ) ); + KStdAction::save( this, TQ_SLOT( save() ), actionCollection() ) ->setToolTip( i18n( "Save the current file" ) ); + KStdAction::saveAs( this, TQ_SLOT( slotFileSaveAs() ), actionCollection() ) ->setToolTip( i18n( "Save the current file under a new filename" ) ); } - m_actionFileStatistics = new TDEAction( i18n( "Statistics..." ), CTRL + SHIFT + Key_I, this, SLOT( slotFileStatistics() ), actionCollection(), "file_statistics" ); - m_actionFileFindDups = new TDEAction( i18n( "Find Duplicates..." ), CTRL + SHIFT + Key_D, this, SLOT( slotFileFindDups() ), actionCollection(), "file_finddups" ); - m_actionFileExport = new TDEAction( i18n( "Export..." ), SmallIconSet( "goto" ), CTRL + Key_E, this, SLOT( slotFileExport() ), actionCollection(), "file_export" ); + m_actionFileStatistics = new TDEAction( i18n( "Statistics..." ), CTRL + SHIFT + Key_I, this, TQ_SLOT( slotFileStatistics() ), actionCollection(), "file_statistics" ); + m_actionFileFindDups = new TDEAction( i18n( "Find Duplicates..." ), CTRL + SHIFT + Key_D, this, TQ_SLOT( slotFileFindDups() ), actionCollection(), "file_finddups" ); + m_actionFileExport = new TDEAction( i18n( "Export..." ), SmallIconSet( "goto" ), CTRL + Key_E, this, TQ_SLOT( slotFileExport() ), actionCollection(), "file_export" ); m_actionFileExport->setToolTip( i18n( "Export to a different file format" ) ); - m_actionFileMerge = new TDEAction( i18n( "Merge..." ), SmallIconSet( "reload" ), CTRL + Key_M, this, SLOT( slotFileMerge() ), actionCollection(), "file_merge" ); + m_actionFileMerge = new TDEAction( i18n( "Merge..." ), SmallIconSet( "reload" ), CTRL + Key_M, this, TQ_SLOT( slotFileMerge() ), actionCollection(), "file_merge" ); m_actionFileMerge->setToolTip( i18n( "Merge BibTeX entries from another file" ) ); - m_actionEditCut = KStdAction::cut( m_documentWidget, SLOT( cutElements() ), actionCollection() ); + m_actionEditCut = KStdAction::cut( m_documentWidget, TQ_SLOT( cutElements() ), actionCollection() ); m_actionEditCut->setToolTip( i18n( "Cut the selected BibTeX elements to the clipboard" ) ); - m_actionEditCut->setEnabled( FALSE ); - m_actionEditCopy = KStdAction::copy( m_documentWidget, SLOT( copyElements() ), actionCollection() ); + m_actionEditCut->setEnabled( false ); + m_actionEditCopy = KStdAction::copy( m_documentWidget, TQ_SLOT( copyElements() ), actionCollection() ); m_actionEditCopy->setToolTip( i18n( "Copy the selected BibTeX elements to the clipboard" ) ); - m_actionEditCopy->setEnabled( FALSE ); - m_actionEditUndo = KStdAction::undo( m_documentWidget, SLOT( undoEditor() ), actionCollection() ); - connect( m_documentWidget, SIGNAL( undoChanged( bool ) ), this, SLOT( slotUndoChanged( bool ) ) ); - m_actionEditCopyRef = new TDEAction( i18n( "Copy &Reference" ), CTRL + SHIFT + Key_C, m_documentWidget, SLOT( copyRefElements() ), actionCollection(), "edit_copyref" ); + m_actionEditCopy->setEnabled( false ); + m_actionEditUndo = KStdAction::undo( m_documentWidget, TQ_SLOT( undoEditor() ), actionCollection() ); + connect( m_documentWidget, TQ_SIGNAL( undoChanged( bool ) ), this, TQ_SLOT( slotUndoChanged( bool ) ) ); + m_actionEditCopyRef = new TDEAction( i18n( "Copy &Reference" ), CTRL + SHIFT + Key_C, m_documentWidget, TQ_SLOT( copyRefElements() ), actionCollection(), "edit_copyref" ); m_actionEditCopyRef->setToolTip( i18n( "Copy a reference of the selected BibTeX elements to the clipboard" ) ); - m_actionEditCopyRef->setEnabled( FALSE ); - m_actionEditPaste = KStdAction::paste( m_documentWidget, SLOT( pasteElements() ), actionCollection() ); + m_actionEditCopyRef->setEnabled( false ); + m_actionEditPaste = KStdAction::paste( m_documentWidget, TQ_SLOT( pasteElements() ), actionCollection() ); m_actionEditPaste->setToolTip( i18n( "Paste BibTeX elements from the clipboard" ) ); - m_actionEditSelectAll = KStdAction::selectAll( m_documentWidget, SLOT( selectAll() ), actionCollection() ); + m_actionEditSelectAll = KStdAction::selectAll( m_documentWidget, TQ_SLOT( selectAll() ), actionCollection() ); m_actionEditSelectAll->setToolTip( i18n( "Select all BibTeX elements" ) ); - m_actionElementSendToLyX = new TDEAction( i18n( "Send Reference to &LyX" ), CTRL + SHIFT + Key_L, m_documentWidget, SLOT( sendSelectedToLyx() ), actionCollection(), "element_sendtolyx" ); + m_actionElementSendToLyX = new TDEAction( i18n( "Send Reference to &LyX" ), CTRL + SHIFT + Key_L, m_documentWidget, TQ_SLOT( sendSelectedToLyx() ), actionCollection(), "element_sendtolyx" ); m_actionElementSendToLyX->setToolTip( i18n( "Send a reference of the selected BibTeX elements to LyX" ) ); - m_actionElementSendToLyX->setEnabled( FALSE ); - m_actionEditFind = KStdAction::find( m_documentWidget, SLOT( find() ), actionCollection() ); + m_actionElementSendToLyX->setEnabled( false ); + m_actionEditFind = KStdAction::find( m_documentWidget, TQ_SLOT( find() ), actionCollection() ); m_actionEditFind->setToolTip( i18n( "Find text" ) ); - m_actionEditFindNext = KStdAction::findNext( m_documentWidget, SLOT( findNext() ), actionCollection() ); + m_actionEditFindNext = KStdAction::findNext( m_documentWidget, TQ_SLOT( findNext() ), actionCollection() ); m_actionEditFindNext->setToolTip( i18n( "Find next occurrence" ) ); - m_actionEditFind->setEnabled( FALSE ); - m_actionEditFindNext->setEnabled( FALSE ); + m_actionEditFind->setEnabled( false ); + m_actionEditFindNext->setEnabled( false ); - m_actionSearchOnlineDatabases = new TDEAction( i18n( "Search Online Databases" ), SmallIconSet( "network" ), CTRL + SHIFT + Key_S, m_documentWidget, SLOT( onlineSearch() ), actionCollection(), "search_onlinedatabases" ); + m_actionSearchOnlineDatabases = new TDEAction( i18n( "Search Online Databases" ), SmallIconSet( "network" ), CTRL + SHIFT + Key_S, m_documentWidget, TQ_SLOT( onlineSearch() ), actionCollection(), "search_onlinedatabases" ); m_actionSearchOnlineDatabases->setToolTip( i18n( "Search online databases to import bibliography data" ) ); m_actionMenuSearchWebsites = new TDEActionMenu( i18n( "Search Document Online" ), actionCollection(), "search_document_online" ); m_actionMenuSearchWebsites->setToolTip( i18n( "Search websites for the selected BibTeX element" ) ); - connect( m_actionMenuSearchWebsites->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( slotSearchWebsites( int ) ) ); - m_actionMenuSearchWebsites->setEnabled( FALSE ); + connect( m_actionMenuSearchWebsites->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotSearchWebsites( int ) ) ); + m_actionMenuSearchWebsites->setEnabled( false ); m_actionViewShowColumns = new TDEActionMenu( i18n( "&Show Columns" ), actionCollection(), "view_showcolumns" ); m_actionViewShowColumns->setToolTip( i18n( "Select columns to show in the main list" ) ); m_actionViewDocument = new TDEActionMenu( i18n( "View Document" ), actionCollection(), "view_document" ); m_actionViewDocument->setToolTip( i18n( "View the documents associated with this BibTeX entry" ) ); - m_actionViewDocument->setEnabled( FALSE ); - m_actionViewFirstDocument = new TDEAction( i18n( "View Primary Document" ), 0, m_documentWidget, SLOT( slotViewFirstDocument() ), actionCollection(), "view_first_document" ); + m_actionViewDocument->setEnabled( false ); + m_actionViewFirstDocument = new TDEAction( i18n( "View Primary Document" ), 0, m_documentWidget, TQ_SLOT( slotViewFirstDocument() ), actionCollection(), "view_first_document" ); m_actionViewFirstDocument->setShortcut( TQt::Key_F4 ); - m_actionViewDocumentOnlineRef = new TDEAction( i18n( "View Primary Online Reference" ), 0, m_documentWidget, SLOT( slotViewFirstDocumentsOnlineRef() ), actionCollection(), "view_first_documents_online_ref" ); + m_actionViewDocumentOnlineRef = new TDEAction( i18n( "View Primary Online Reference" ), 0, m_documentWidget, TQ_SLOT( slotViewFirstDocumentsOnlineRef() ), actionCollection(), "view_first_documents_online_ref" ); m_actionViewDocumentOnlineRef->setShortcut( TQt::Key_F5 ); m_actionAssignKeywords = new TDEActionMenu( i18n( "Assign Keywords" ), actionCollection(), "assign_keywords" ); m_actionAssignKeywords->setToolTip( i18n( "Assign keywords to this entry" ) ); - m_actionAssignKeywords->setEnabled( FALSE ); - m_actionNormalizeIds = new TDEAction( i18n( "Normalize Entry Ids" ), 0, m_documentWidget, SLOT( slotNormalizeIds() ), actionCollection( ), "normalize_ids" ); + m_actionAssignKeywords->setEnabled( false ); + m_actionNormalizeIds = new TDEAction( i18n( "Normalize Entry Ids" ), 0, m_documentWidget, TQ_SLOT( slotNormalizeIds() ), actionCollection( ), "normalize_ids" ); m_actionNormalizeIds->setToolTip( i18n( "Set entry ids as specified in the id suggestion settings" ) ); - m_actionNormalizeIds->setEnabled( FALSE ); + m_actionNormalizeIds->setEnabled( false ); - m_actionPreferences = KStdAction::preferences( this, SLOT( slotPreferences() ), actionCollection() ); + m_actionPreferences = KStdAction::preferences( this, TQ_SLOT( slotPreferences() ), actionCollection() ); m_actionPreferences->setToolTip( i18n( "Configure KBibTeX" ) ); - TDEAction *actionSourceEditor = new TDEAction( i18n( "Configure Source View..." ), 0, m_documentWidget, SLOT( configureEditor() ), actionCollection(), "options_configure_editor" ); + TDEAction *actionSourceEditor = new TDEAction( i18n( "Configure Source View..." ), 0, m_documentWidget, TQ_SLOT( configureEditor() ), actionCollection(), "options_configure_editor" ); actionSourceEditor ->setToolTip( i18n( "Configure the Source Editor" ) ); - ( new TDEAction( i18n( "Article" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_article" ) ) ->setToolTip( i18n( "Add an article to the BibTeX file" ) ); - ( new TDEAction( i18n( "Book" ), "element_new_entry_book", CTRL + Key_B, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_book" ) ) ->setToolTip( i18n( "Add a book to the BibTeX file" ) ); - ( new TDEAction( i18n( "Booklet" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_booklet" ) ) ->setToolTip( i18n( "Add a booklet to the BibTeX file" ) ); - ( new TDEAction( i18n( "Electronic (IEEE)" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_electronic" ) ) ->setToolTip( i18n( "Add an electronic reference (IEEE) to the BibTeX file" ) ); - ( new TDEAction( i18n( "InBook" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_inbook" ) ) ->setToolTip( i18n( "Add a part of a book to the BibTeX file" ) ); - ( new TDEAction( i18n( "InCollection" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_incollection" ) ) ->setToolTip( i18n( "Add a publication which is part of some collection to the BibTeX file" ) ); - ( new TDEAction( i18n( "InProceedings" ), "element_new_entry_inproceedings", CTRL + Key_I, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_inproceedings" ) ) ->setToolTip( i18n( "Add a publication which is part of some proceedings to the BibTeX file" ) ); - ( new TDEAction( i18n( "Manual" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_manual" ) ) ->setToolTip( i18n( "Add a manual to the BibTeX file" ) ); - ( new TDEAction( i18n( "MastersThesis" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_mastersthesis" ) ) ->setToolTip( i18n( "Add a master or diploma thesis to the BibTeX file" ) ); - ( new TDEAction( i18n( "Misc" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_misc" ) ) ->setToolTip( i18n( "Add a not specified document or reference to the BibTeX file" ) ); - ( new TDEAction( i18n( "PhDThesis" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_phdthesis" ) ) ->setToolTip( i18n( "Add a PhD thesis to the BibTeX file" ) ); - ( new TDEAction( i18n( "Proceedings" ), "element_new_entry_phdthesis" , CTRL + Key_P, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_proceedings" ) ) ->setToolTip( i18n( "Add some proceedings to the BibTeX file" ) ); - ( new TDEAction( i18n( "TechReport" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_techreport" ) ) ->setToolTip( i18n( "Add a technical report to the BibTeX file" ) ); - ( new TDEAction( i18n( "Unpublished" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_entry_unpublished" ) ) ->setToolTip( i18n( "Add an unpublished document to the BibTeX file" ) ); - ( new TDEAction( i18n( "Preamble" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_preamble" ) ) ->setToolTip( i18n( "Add a preamble to the BibTeX file" ) ); - ( new TDEAction( i18n( "Comment" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_comment" ) ) ->setToolTip( i18n( "Add a comment to the BibTeX file" ) ); - ( new TDEAction( i18n( "Macro" ), 0, this, SLOT( slotNewElement() ), actionCollection(), "element_new_macro" ) ) ->setToolTip( i18n( "Add a macro to the BibTeX file" ) ); - - m_actionEditElement = new TDEAction( i18n( "&Edit" ), 0, m_documentWidget, SLOT( editElement() ), actionCollection(), "element_edit" ); + ( new TDEAction( i18n( "Article" ), 0, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_entry_article" ) ) ->setToolTip( i18n( "Add an article to the BibTeX file" ) ); + ( new TDEAction( i18n( "Book" ), "element_new_entry_book", CTRL + Key_B, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_entry_book" ) ) ->setToolTip( i18n( "Add a book to the BibTeX file" ) ); + ( new TDEAction( i18n( "Booklet" ), 0, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_entry_booklet" ) ) ->setToolTip( i18n( "Add a booklet to the BibTeX file" ) ); + ( new TDEAction( i18n( "Electronic (IEEE)" ), 0, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_entry_electronic" ) ) ->setToolTip( i18n( "Add an electronic reference (IEEE) to the BibTeX file" ) ); + ( new TDEAction( i18n( "InBook" ), 0, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_entry_inbook" ) ) ->setToolTip( i18n( "Add a part of a book to the BibTeX file" ) ); + ( new TDEAction( i18n( "InCollection" ), 0, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_entry_incollection" ) ) ->setToolTip( i18n( "Add a publication which is part of some collection to the BibTeX file" ) ); + ( new TDEAction( i18n( "InProceedings" ), "element_new_entry_inproceedings", CTRL + Key_I, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_entry_inproceedings" ) ) ->setToolTip( i18n( "Add a publication which is part of some proceedings to the BibTeX file" ) ); + ( new TDEAction( i18n( "Manual" ), 0, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_entry_manual" ) ) ->setToolTip( i18n( "Add a manual to the BibTeX file" ) ); + ( new TDEAction( i18n( "MastersThesis" ), 0, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_entry_mastersthesis" ) ) ->setToolTip( i18n( "Add a master or diploma thesis to the BibTeX file" ) ); + ( new TDEAction( i18n( "Misc" ), 0, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_entry_misc" ) ) ->setToolTip( i18n( "Add a not specified document or reference to the BibTeX file" ) ); + ( new TDEAction( i18n( "PhDThesis" ), 0, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_entry_phdthesis" ) ) ->setToolTip( i18n( "Add a PhD thesis to the BibTeX file" ) ); + ( new TDEAction( i18n( "Proceedings" ), "element_new_entry_phdthesis" , CTRL + Key_P, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_entry_proceedings" ) ) ->setToolTip( i18n( "Add some proceedings to the BibTeX file" ) ); + ( new TDEAction( i18n( "TechReport" ), 0, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_entry_techreport" ) ) ->setToolTip( i18n( "Add a technical report to the BibTeX file" ) ); + ( new TDEAction( i18n( "Unpublished" ), 0, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_entry_unpublished" ) ) ->setToolTip( i18n( "Add an unpublished document to the BibTeX file" ) ); + ( new TDEAction( i18n( "Preamble" ), 0, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_preamble" ) ) ->setToolTip( i18n( "Add a preamble to the BibTeX file" ) ); + ( new TDEAction( i18n( "Comment" ), 0, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_comment" ) ) ->setToolTip( i18n( "Add a comment to the BibTeX file" ) ); + ( new TDEAction( i18n( "Macro" ), 0, this, TQ_SLOT( slotNewElement() ), actionCollection(), "element_new_macro" ) ) ->setToolTip( i18n( "Add a macro to the BibTeX file" ) ); + + m_actionEditElement = new TDEAction( i18n( "&Edit" ), 0, m_documentWidget, TQ_SLOT( editElement() ), actionCollection(), "element_edit" ); m_actionEditElement->setToolTip( i18n( "Edit the selected BibTeX element" ) ); - m_actionEditElement->setEnabled( FALSE ); - m_actionDeleteElement = new TDEAction( i18n( "&Delete" ), 0, m_documentWidget, SLOT( deleteElements() ), actionCollection(), "element_delete" ); + m_actionEditElement->setEnabled( false ); + m_actionDeleteElement = new TDEAction( i18n( "&Delete" ), 0, m_documentWidget, TQ_SLOT( deleteElements() ), actionCollection(), "element_delete" ); m_actionDeleteElement->setToolTip( i18n( "Delete the selected BibTeX elements" ) ); - m_actionDeleteElement->setEnabled( FALSE ); + m_actionDeleteElement->setEnabled( false ); - m_actionShowComments = new TDEToggleAction( i18n( "Show &Comments" ), 0, this, SLOT( slotToggleShowSpecialElements() ), actionCollection(), "view_showcomments" ); + m_actionShowComments = new TDEToggleAction( i18n( "Show &Comments" ), 0, this, TQ_SLOT( slotToggleShowSpecialElements() ), actionCollection(), "view_showcomments" ); m_actionShowComments->setToolTip( i18n( "Show the comments of a BibTeX document" ) ); - m_actionShowMacros = new TDEToggleAction( i18n( "Show &Macros" ), 0, this, SLOT( slotToggleShowSpecialElements() ), actionCollection(), "view_showmacros" ); + m_actionShowMacros = new TDEToggleAction( i18n( "Show &Macros" ), 0, this, TQ_SLOT( slotToggleShowSpecialElements() ), actionCollection(), "view_showmacros" ); m_actionShowMacros->setToolTip( i18n( "Show the macros of a BibTeX document" ) ); - m_actionUseInPipe = new TDEToggleAction( i18n( "Accept input from other programs" ), 0, this , SLOT( slotUseInPipe() ), actionCollection(), "useinpipe" ); + m_actionUseInPipe = new TDEToggleAction( i18n( "Accept input from other programs" ), 0, this , TQ_SLOT( slotUseInPipe() ), actionCollection(), "useinpipe" ); - connect( m_documentWidget, SIGNAL( listViewSelectionChanged( int ) ), this, SLOT( slotUpdateMenu( int ) ) ); + connect( m_documentWidget, TQ_SIGNAL( listViewSelectionChanged( int ) ), this, TQ_SLOT( slotUpdateMenu( int ) ) ); if ( m_mainWindow != NULL ) { KStatusBar * statusBar = m_mainWindow->statusBar(); if ( statusBar != NULL ) { - connect( actionCollection(), SIGNAL( actionStatusText( const TQString & ) ), statusBar, SLOT( message( const TQString & ) ) ); - connect( actionCollection(), SIGNAL( clearStatusText() ), statusBar, SLOT( clear() ) ); + connect( actionCollection(), TQ_SIGNAL( actionStatusText( const TQString & ) ), statusBar, TQ_SLOT( message( const TQString & ) ) ); + connect( actionCollection(), TQ_SIGNAL( clearStatusText() ), statusBar, TQ_SLOT( clear() ) ); } } @@ -536,7 +536,7 @@ void KBibTeXPart::setupActions() TDEActionMenu *acmElementNew = new TDEActionMenu( i18n( "&New" ), TQIconSet( SmallIcon( "document-new" ) ), actionCollection(), "element_new" ); acmElementNew->setToolTip( i18n( "Add a new element to this BibTeX document" ) ); - acmElementNew->setEnabled( FALSE ); + acmElementNew->setEnabled( false ); } bool KBibTeXPart::slotNewElement() @@ -554,15 +554,15 @@ bool KBibTeXPart::slotNewElement() else if ( strcmp( sender() ->name(), "element_new_preamble" ) == 0 ) elementType = "preamble"; else - return FALSE; + return false; bool result = m_documentWidget->newElement( elementType ); if ( result ) - setModified( TRUE ); + setModified( true ); return result; } - return FALSE; + return false; } void KBibTeXPart::readSettings() @@ -684,7 +684,7 @@ void KBibTeXPart::slotDeferredInitialization() { m_documentWidget->setFactory( factory(), this ); m_documentWidget->deferredInitialization(); - m_initializationDone = TRUE; + m_initializationDone = true; } else { @@ -695,7 +695,7 @@ void KBibTeXPart::slotDeferredInitialization() KMessageBox::sorry( widget(), i18n( "The KBibTeX part has problems to initialize itself. Only limited functionality will be available." ), i18n( "KBibTeX Part" ) ); return ; } - TQTimer::singleShot( 250, this, SLOT( slotDeferredInitialization() ) ); + TQTimer::singleShot( 250, this, TQ_SLOT( slotDeferredInitialization() ) ); } } @@ -748,7 +748,7 @@ TDEInstance* KBibTeXPartFactory::instance() extern "C" { - KDE_EXPORT void* init_libkbibtexpart() + TDE_EXPORT void* init_libkbibtexpart() { return new KBibTeXPartFactory; } diff --git a/src/kbibtex_part.desktop b/src/kbibtex_part.desktop index bb84803..0507dcb 100644 --- a/src/kbibtex_part.desktop +++ b/src/kbibtex_part.desktop @@ -1,14 +1,6 @@ [Desktop Entry] Encoding=UTF-8 Name=KBibTeXPart -Name[et]=KBibTeX komponent -Name[hi]=KBibTeXपार्ट -Name[sv]=KBibTeX-del -Name[ta]=KBibTeXபாகம் -Name[xx]=xxKBibTeXPartxx -Name[pl]=Moduł KBibTeX -Name[pt_BR]=Parte do KBibTeX -Name[de]=Einbettungsfähige Komponente von KBibTeX MimeType=text/x-bibtex;application/x-endnote-library; X-TDE-ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart X-TDE-Library=libkbibtexpart diff --git a/src/kbibtex_part.h b/src/kbibtex_part.h index 561101c..a04b7cc 100644 --- a/src/kbibtex_part.h +++ b/src/kbibtex_part.h @@ -46,7 +46,7 @@ class TDEMainWindow; class KBibTeXPart : public KParts::ReadWritePart { - Q_OBJECT + TQ_OBJECT public: KBibTeXPart( TQWidget *parentWidget, const char *widgetName, @@ -152,7 +152,7 @@ class TDEAboutData; class KBibTeXPartFactory : public KParts::Factory { - Q_OBJECT + TQ_OBJECT public: KBibTeXPartFactory(); virtual ~KBibTeXPartFactory(); diff --git a/src/kbibtexshell.cpp b/src/kbibtexshell.cpp index 3c297fb..7e672b5 100644 --- a/src/kbibtexshell.cpp +++ b/src/kbibtexshell.cpp @@ -74,8 +74,8 @@ KBibTeXShell::KBibTeXShell( TQWidget* parentWidget, const char* name ) // if we couldn't find our Part, we exit since the Shell by // itself can't do anything useful KMessageBox::error( this, i18n( "Could not find our part!" ) ); - kapp->quit(); - // we return here, cause kapp->quit() only means "exit the + tdeApp->quit(); + // we return here, cause tdeApp->quit() only means "exit the // next time we enter the event loop... return ; } @@ -115,21 +115,21 @@ bool KBibTeXShell::openURL( const KURL& url ) if ( m_part->url().isEmpty() && !m_part->isModified() ) { if ( !m_part->openURL( url ) ) - return FALSE; + return false; } else { KBibTeXShell *shell = new KBibTeXShell(); if ( !shell->part() ->openURL( url ) ) - return FALSE; + return false; else initializePart( shell->part() ); shell->show(); } m_recentFiles->addURL( url ); - return TRUE; + return true; } KParts::ReadWritePart * KBibTeXShell::part() @@ -154,13 +154,13 @@ void KBibTeXShell::writeConfig( TDEConfig *config ) void KBibTeXShell::readConfig() { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); readConfig( config ); } void KBibTeXShell::writeConfig() { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); writeConfig( config ); } @@ -178,28 +178,28 @@ void KBibTeXShell::setupActions() { TDEAction * action; - action = KStdAction::openNew( this, SLOT( slotFileNew() ), actionCollection() ); + action = KStdAction::openNew( this, TQ_SLOT( slotFileNew() ), actionCollection() ); action ->setToolTip( i18n( "Create a new window for a new BibTeX file" ) ); - TDEAction *actionOpen = KStdAction::open( this, SLOT( slotFileOpen() ), actionCollection() ); + TDEAction *actionOpen = KStdAction::open( this, TQ_SLOT( slotFileOpen() ), actionCollection() ); actionOpen->setToolTip( i18n( "Open an existing BibTeX file" ) ); - m_recentFiles = KStdAction::openRecent( this, SLOT( slotFileOpen( const KURL& ) ), actionCollection() ); + m_recentFiles = KStdAction::openRecent( this, TQ_SLOT( slotFileOpen( const KURL& ) ), actionCollection() ); m_recentFiles->setWhatsThis( i18n( "This lists files which you have opened recently, and allows you to easily open them again." ) ); - connect( m_recentFiles, SIGNAL( activated() ), actionOpen, SLOT( activate() ) ); + connect( m_recentFiles, TQ_SIGNAL( activated() ), actionOpen, TQ_SLOT( activate() ) ); - action = KStdAction::close( this, SLOT( slotFileClose() ), actionCollection() ); + action = KStdAction::close( this, TQ_SLOT( slotFileClose() ), actionCollection() ); action->setToolTip( i18n( "Close this KBibTeX window" ) ); - // action = KStdAction::quit( kapp, SLOT( closeAllWindows() ), actionCollection() ); + // action = KStdAction::quit( tdeApp, TQ_SLOT( closeAllWindows() ), actionCollection() ); // action->setToolTip( i18n( "Close all windows and quit KBibTeX" ) ); - m_statusbarAction = KStdAction::showStatusbar( this, SLOT( optionsShowStatusbar() ), actionCollection() ); + m_statusbarAction = KStdAction::showStatusbar( this, TQ_SLOT( optionsShowStatusbar() ), actionCollection() ); m_statusbarAction->setToolTip( i18n( "Show or hide the window's status bar" ) ); - KStdAction::keyBindings( this, SLOT( optionsConfigureKeys() ), actionCollection() ) ->setToolTip( i18n( "Configure key bindings for KBibTeX" ) ); - KStdAction::configureToolbars( this, SLOT( optionsConfigureToolbars() ), actionCollection() ) ->setToolTip( i18n( "Configure the tool bar for KBibTeX" ) ); + KStdAction::keyBindings( this, TQ_SLOT( optionsConfigureKeys() ), actionCollection() ) ->setToolTip( i18n( "Configure key bindings for KBibTeX" ) ); + KStdAction::configureToolbars( this, TQ_SLOT( optionsConfigureToolbars() ), actionCollection() ) ->setToolTip( i18n( "Configure the tool bar for KBibTeX" ) ); - connect( actionCollection(), SIGNAL( actionStatusText( const TQString & ) ), this, SLOT( slotActionStatusText( const TQString & ) ) ); - connect( actionCollection(), SIGNAL( clearStatusText( ) ), statusBar(), SLOT( clear() ) ); + connect( actionCollection(), TQ_SIGNAL( actionStatusText( const TQString & ) ), this, TQ_SLOT( slotActionStatusText( const TQString & ) ) ); + connect( actionCollection(), TQ_SIGNAL( clearStatusText( ) ), statusBar(), TQ_SLOT( clear() ) ); } void KBibTeXShell::slotActionStatusText( const TQString &text ) @@ -260,8 +260,8 @@ void KBibTeXShell::optionsConfigureToolbars() // use the standard toolbar editor KEditToolbar dlg( factory() ); - connect( &dlg, SIGNAL( newToolbarConfig() ), - this, SLOT( applyNewToolbarConfig() ) ); + connect( &dlg, TQ_SIGNAL( newToolbarConfig() ), + this, TQ_SLOT( applyNewToolbarConfig() ) ); dlg.exec(); } @@ -281,7 +281,7 @@ void KBibTeXShell::applyNewToolbarConfig() bool KBibTeXShell::queryClose() { if ( m_part && !m_part ->closeURL() ) - return FALSE; + return false; writeConfig(); @@ -326,7 +326,7 @@ void KBibTeXShell::slotFileOpen( const KURL& url ) { if ( url.isEmpty() ) return ; - if ( !TDEIO::NetAccess::exists( url, TRUE, this ) ) + if ( !TDEIO::NetAccess::exists( url, true, this ) ) { m_recentFiles->removeURL( url ); KMessageBox::error( this, i18n( "The given file could not be read, check if it exists or if it is readable for the current user." ) ); @@ -365,7 +365,7 @@ void KBibTeXShell::initializePart( KParts::ReadWritePart* part ) { if ( part ) { - connect( static_cast<KBibTeXPart*>( part ), SIGNAL( signalAddRecentURL( const KURL & ) ), this, SLOT( slotAddRecentURL( const KURL& ) ) ); + connect( static_cast<KBibTeXPart*>( part ), TQ_SIGNAL( signalAddRecentURL( const KURL & ) ), this, TQ_SLOT( slotAddRecentURL( const KURL& ) ) ); } } diff --git a/src/kbibtexshell.h b/src/kbibtexshell.h index 969dec9..de59905 100644 --- a/src/kbibtexshell.h +++ b/src/kbibtexshell.h @@ -37,7 +37,7 @@ class TDERecentFilesAction; class KBibTeXShell : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: KBibTeXShell( TQWidget* parentWidget = 0, const char* name = 0 ); diff --git a/src/macro.h b/src/macro.h index 50a5400..a620a8e 100644 --- a/src/macro.h +++ b/src/macro.h @@ -41,7 +41,7 @@ namespace BibTeX Value *value() const; void setValue( Value *value ); - bool containsPattern( const TQString& pattern, EntryField::FieldType fieldType = EntryField::ftUnknown, FilterType filterType = BibTeX::Element::ftExact, bool caseSensitive = FALSE ) const; + bool containsPattern( const TQString& pattern, EntryField::FieldType fieldType = EntryField::ftUnknown, FilterType filterType = BibTeX::Element::ftExact, bool caseSensitive = false ) const; Element* clone(); void copyFrom( Macro *other ); diff --git a/src/macrowidget.cpp b/src/macrowidget.cpp index daeb771..a227f41 100644 --- a/src/macrowidget.cpp +++ b/src/macrowidget.cpp @@ -36,11 +36,11 @@ namespace KBibTeX { TQDialog::DialogCode MacroWidget::execute( BibTeX::Macro *macro, bool isReadOnly, TQWidget *parent, const char *name ) { - KDialogBase * dlg = new KDialogBase( parent, name, TRUE, i18n( "Edit BibTeX Macro" ), KDialogBase::Ok | KDialogBase::Cancel ); + KDialogBase * dlg = new KDialogBase( parent, name, true, i18n( "Edit BibTeX Macro" ), KDialogBase::Ok | KDialogBase::Cancel ); MacroWidget* macroWidget = new MacroWidget( macro, isReadOnly, dlg, "MacroWidget" ); dlg->setMainWidget( macroWidget ); - connect( dlg, SIGNAL( okClicked() ), macroWidget, SLOT( apply() ) ); + connect( dlg, TQ_SIGNAL( okClicked() ), macroWidget, TQ_SLOT( apply() ) ); TQDialog::DialogCode result = ( TQDialog::DialogCode ) dlg->exec(); diff --git a/src/macrowidget.h b/src/macrowidget.h index d31478e..2fda075 100644 --- a/src/macrowidget.h +++ b/src/macrowidget.h @@ -31,7 +31,7 @@ namespace KBibTeX { class MacroWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: static TQDialog::DialogCode execute( BibTeX::Macro *macro, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); diff --git a/src/main.cpp b/src/main.cpp index 6d9617a..8216f2a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -23,7 +23,7 @@ #include <tqframe.h> #include <tqpixmap.h> #ifdef UNIQUEAPP -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #else // UNIQUEAPP #include <tdeapplication.h> #endif // UNIQUEAPP @@ -32,7 +32,7 @@ #include <tdecmdlineargs.h> #include <tdelocale.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include "kbibtexshell.h" @@ -49,14 +49,14 @@ static TDECmdLineOptions options[] = }; #ifdef UNIQUEAPP -class KBibTeXApplication: public KUniqueApplication +class KBibTeXApplication: public TDEUniqueApplication #else // UNIQUEAPP class KBibTeXApplication: public TDEApplication #endif // UNIQUEAPP { public: #ifdef UNIQUEAPP - KBibTeXApplication() : KUniqueApplication() + KBibTeXApplication() : TDEUniqueApplication() { // nothing } @@ -116,7 +116,7 @@ int main( int argc, char **argv ) TDECmdLineArgs::addCmdLineOptions( options ); #ifdef UNIQUEAPP - if ( !KUniqueApplication::start() ) + if ( !TDEUniqueApplication::start() ) { kdDebug() << "Reusing existing KBibTeX instance" << endl; return 0; diff --git a/src/mergeelements.cpp b/src/mergeelements.cpp index 3a7f3d3..8120212 100644 --- a/src/mergeelements.cpp +++ b/src/mergeelements.cpp @@ -128,7 +128,7 @@ namespace KBibTeX MergeElements::~MergeElements() { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup( "MergeElements" ); saveWindowSize( config ); } @@ -167,10 +167,10 @@ namespace KBibTeX vboxLayout->setStretchFactor( m_listViewAlternatives, 3 ); label->setBuddy( m_listViewAlternatives ); - connect( m_listViewClique, SIGNAL( doubleClicked( TQListViewItem * ) ), this, SLOT( slotPreviewElement( TQListViewItem * ) ) ); - connect( this, SIGNAL( user1Clicked() ), this, SLOT( slotNextClique() ) ); - connect( this, SIGNAL( user2Clicked() ), this, SLOT( slotPreviousClique() ) ); - connect( this, SIGNAL( okClicked() ), this, SLOT( saveCurrentMergeSet() ) ); + connect( m_listViewClique, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), this, TQ_SLOT( slotPreviewElement( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT( slotNextClique() ) ); + connect( this, TQ_SIGNAL( user2Clicked() ), this, TQ_SLOT( slotPreviousClique() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( saveCurrentMergeSet() ) ); } void MergeElements::setClique( int cliqueIndex ) @@ -188,7 +188,7 @@ namespace KBibTeX if ( entry != NULL ) { MergeElementsCliqueItem *item = new MergeElementsCliqueItem( entry, NULL, NULL, m_listViewClique ); - connect( item, SIGNAL( stateChanged( MergeElementsCliqueItem* ) ), this, SLOT( slotRefreshAlternatives() ) ); + connect( item, TQ_SIGNAL( stateChanged( MergeElementsCliqueItem* ) ), this, TQ_SLOT( slotRefreshAlternatives() ) ); } else { @@ -196,7 +196,7 @@ namespace KBibTeX if ( macro != NULL ) { MergeElementsCliqueItem *item = new MergeElementsCliqueItem( NULL, macro, NULL, m_listViewClique ); - connect( item, SIGNAL( stateChanged( MergeElementsCliqueItem* ) ), this, SLOT( slotRefreshAlternatives() ) ); + connect( item, TQ_SIGNAL( stateChanged( MergeElementsCliqueItem* ) ), this, TQ_SLOT( slotRefreshAlternatives() ) ); } else { @@ -204,7 +204,7 @@ namespace KBibTeX if ( preamble!=NULL ) { MergeElementsCliqueItem *item = new MergeElementsCliqueItem( NULL, NULL, preamble, m_listViewClique ); - connect( item, SIGNAL( stateChanged( MergeElementsCliqueItem* ) ), this, SLOT( slotRefreshAlternatives() ) ); + connect( item, TQ_SIGNAL( stateChanged( MergeElementsCliqueItem* ) ), this, TQ_SLOT( slotRefreshAlternatives() ) ); } } } @@ -761,11 +761,11 @@ namespace KBibTeX { MergeElementsCliqueItem *meci = dynamic_cast<MergeElementsCliqueItem*>( item ); if ( meci != NULL && meci->entry != NULL ) - KBibTeX::EntryWidget::execute( meci->entry, NULL, TRUE, FALSE, this ); + KBibTeX::EntryWidget::execute( meci->entry, NULL, true, false, this ); else if ( meci != NULL && meci->macro != NULL ) - KBibTeX::MacroWidget::execute( meci->macro, TRUE, this ); + KBibTeX::MacroWidget::execute( meci->macro, true, this ); else if ( meci!=NULL&& meci->preamble!=NULL ) - KBibTeX::PreambleWidget::execute( meci->preamble, TRUE, this ); + KBibTeX::PreambleWidget::execute( meci->preamble, true, this ); } /* This function was taken form TDEMainWindow of KDE 3.5 and modified to fit KBibTeX */ @@ -774,7 +774,7 @@ namespace KBibTeX int scnum = TQApplication::desktop()->screenNumber( parentWidget() ); TQRect desk = TQApplication::desktop()->screenGeometry( scnum ); int w, h; -#if defined Q_WS_X11 +#if defined TQ_WS_X11 // save maximalization as desktop size + 1 in that direction KWin::WindowInfo info = KWin::windowInfo( winId(), NET::WMState ); w = info.state() & NET::MaxHoriz ? desk.width() + 1 : width(); @@ -805,13 +805,13 @@ namespace KBibTeX void MergeElements::showEvent( TQShowEvent * ) { tqDebug( "showEvent" ); - TQTimer::singleShot( 10, this, SLOT( slotRestore() ) ); + TQTimer::singleShot( 10, this, TQ_SLOT( slotRestore() ) ); } void MergeElements::slotRestore() { tqDebug( "slotRestore" ); - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup( "MergeElements" ); restoreWindowSize( config ); } @@ -838,7 +838,7 @@ namespace KBibTeX } if ( !size.isEmpty() ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 int state = ( size.width() > desk.width() ? NET::MaxHoriz : 0 ) | ( size.height() > desk.height() ? NET::MaxVert : 0 ); if (( state & NET::Max ) == NET::Max ) diff --git a/src/mergeelements.h b/src/mergeelements.h index e58dc7b..11c0727 100644 --- a/src/mergeelements.h +++ b/src/mergeelements.h @@ -35,7 +35,7 @@ namespace KBibTeX { class MergeElementsCliqueItem : public TQObject, public TQCheckListItem { - Q_OBJECT + TQ_OBJECT public: MergeElementsCliqueItem( BibTeX::Entry* entry, BibTeX::Macro* macro, BibTeX::Preamble* preamble, TQListView *parent ); BibTeX::Entry* entry; @@ -121,7 +121,7 @@ namespace KBibTeX */ class MergeElements : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: MergeElements( TQWidget *parent ); ~MergeElements(); diff --git a/src/preamble.h b/src/preamble.h index 29d0288..4d6be12 100644 --- a/src/preamble.h +++ b/src/preamble.h @@ -39,7 +39,7 @@ namespace BibTeX Value *value() const; void setValue( Value *value ); - bool containsPattern( const TQString& pattern, EntryField::FieldType fieldType = EntryField::ftUnknown, FilterType filterType = BibTeX::Element::ftExact, bool caseSensitive = FALSE ) const; + bool containsPattern( const TQString& pattern, EntryField::FieldType fieldType = EntryField::ftUnknown, FilterType filterType = BibTeX::Element::ftExact, bool caseSensitive = false ) const; Element* clone(); void copyFrom( Preamble *other ); diff --git a/src/preamblewidget.cpp b/src/preamblewidget.cpp index abd6e70..2a85614 100644 --- a/src/preamblewidget.cpp +++ b/src/preamblewidget.cpp @@ -30,11 +30,11 @@ namespace KBibTeX TQDialog::DialogCode PreambleWidget::execute( BibTeX::Preamble *preamble, bool isReadOnly, TQWidget *parent, const char *name ) { - KDialogBase * dlg = new KDialogBase( parent, name, TRUE, i18n( "Edit BibTeX Preamble" ), KDialogBase::Ok | KDialogBase::Cancel ); + KDialogBase * dlg = new KDialogBase( parent, name, true, i18n( "Edit BibTeX Preamble" ), KDialogBase::Ok | KDialogBase::Cancel ); PreambleWidget* preambleWidget = new PreambleWidget( preamble, isReadOnly, dlg, "PreambleWidget" ); dlg->setMainWidget( preambleWidget ); - connect( dlg, SIGNAL( okClicked() ), preambleWidget, SLOT( apply() ) ); + connect( dlg, TQ_SIGNAL( okClicked() ), preambleWidget, TQ_SLOT( apply() ) ); TQDialog::DialogCode result = ( TQDialog::DialogCode ) dlg->exec(); diff --git a/src/preamblewidget.h b/src/preamblewidget.h index 6d5e985..4551c90 100644 --- a/src/preamblewidget.h +++ b/src/preamblewidget.h @@ -34,7 +34,7 @@ namespace KBibTeX */ class PreambleWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: static TQDialog::DialogCode execute( BibTeX::Preamble *preamble, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); diff --git a/src/searchbar.cpp b/src/searchbar.cpp index 2cf06b9..ede81cd 100644 --- a/src/searchbar.cpp +++ b/src/searchbar.cpp @@ -42,7 +42,7 @@ namespace KBibTeX : TQWidget( parent, name ) { m_timerInput = new TQTimer( this ); - connect( m_timerInput, SIGNAL( timeout() ), SLOT( slotTimeout() ) ); + connect( m_timerInput, TQ_SIGNAL( timeout() ), TQ_SLOT( slotTimeout() ) ); setupGUI(); } @@ -95,7 +95,7 @@ namespace KBibTeX m_pushButtonSearchOnlineDatabases->setIconSet( TQIconSet( BarIcon( "network" ) ) ); layout->addWidget( m_pushButtonSearchOnlineDatabases ); TQToolTip::add( m_pushButtonSearchOnlineDatabases, i18n( "Add a new BibTeX entry from an online database" ) ); - connect( m_pushButtonSearchOnlineDatabases, SIGNAL( clicked() ), this, SIGNAL( onlineSearch() ) ); + connect( m_pushButtonSearchOnlineDatabases, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( onlineSearch() ) ); layout->insertSpacing( 2, KDialog::spacingHint() ); @@ -108,13 +108,13 @@ namespace KBibTeX TQLabel *label = new TQLabel( i18n( "&Search:" ), this ); layout->addWidget( label ); - m_comboboxFilter = new KHistoryCombo( TRUE, this, "search_combobox" ); + m_comboboxFilter = new KHistoryCombo( true, this, "search_combobox" ); layout->addWidget( m_comboboxFilter ); label->setBuddy( m_comboboxFilter ); m_comboboxFilter->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred ); m_comboboxFilter->setMaxCount( 256 ); - m_comboboxFilterType = new KComboBox( FALSE, this ); + m_comboboxFilterType = new KComboBox( false, this ); m_comboboxFilterType->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ); layout->addWidget( m_comboboxFilterType ); @@ -125,7 +125,7 @@ namespace KBibTeX label = new TQLabel( i18n( "Restrict to:" ), this ); layout->addWidget( label ); - m_comboboxRestrictTo = new KComboBox( FALSE, this ); + m_comboboxRestrictTo = new KComboBox( false, this ); m_comboboxRestrictTo->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ); layout->addWidget( m_comboboxRestrictTo ); label->setBuddy( m_comboboxRestrictTo ); @@ -137,14 +137,14 @@ namespace KBibTeX m_comboboxRestrictTo->insertItem( Settings::fieldTypeToI18NString( fieldType ) ); } - connect( m_comboboxFilter->lineEdit(), SIGNAL( textChanged( const TQString & ) ), this, SLOT( slotKeyPressed() ) ); - connect( m_comboboxFilter, SIGNAL( activated( const TQString& ) ), m_comboboxFilter, SLOT( addToHistory( const TQString& ) ) ); - connect( m_pushButtonClearSearchText, SIGNAL( clicked() ), this, SLOT( slotClear() ) ); - connect( m_comboboxFilterType, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotAnnounceDoSearch() ) ); - connect( m_comboboxFilter, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotAnnounceDoSearch() ) ); - connect( m_comboboxFilter->lineEdit(), SIGNAL( returnPressed() ), this, SLOT( slotAnnounceDoSearch() ) ); - connect( m_comboboxFilterType, SIGNAL( activated( int ) ), this, SLOT( slotTimeout() ) ); - connect( m_comboboxRestrictTo, SIGNAL( activated( int ) ), this, SLOT( slotTimeout() ) ); + connect( m_comboboxFilter->lineEdit(), TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotKeyPressed() ) ); + connect( m_comboboxFilter, TQ_SIGNAL( activated( const TQString& ) ), m_comboboxFilter, TQ_SLOT( addToHistory( const TQString& ) ) ); + connect( m_pushButtonClearSearchText, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotClear() ) ); + connect( m_comboboxFilterType, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotAnnounceDoSearch() ) ); + connect( m_comboboxFilter, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotAnnounceDoSearch() ) ); + connect( m_comboboxFilter->lineEdit(), TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( slotAnnounceDoSearch() ) ); + connect( m_comboboxFilterType, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotTimeout() ) ); + connect( m_comboboxRestrictTo, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotTimeout() ) ); setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred ); } diff --git a/src/searchbar.h b/src/searchbar.h index c570114..30cb7aa 100644 --- a/src/searchbar.h +++ b/src/searchbar.h @@ -40,7 +40,7 @@ namespace KBibTeX */ class SearchBar : public TQWidget { - Q_OBJECT + TQ_OBJECT public: SearchBar( TQWidget *parent = 0, const char *name = "search_bar" ); ~SearchBar(); diff --git a/src/settings.cpp b/src/settings.cpp index 92dd34b..93523bc 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -27,7 +27,7 @@ #include <tqapplication.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <tdelocale.h> #include <kdebug.h> @@ -61,10 +61,10 @@ namespace KBibTeX for ( int i = 0; i < numCompletions; ++i ) { m_completion[ i ] = new TDECompletion(); - m_completion[ i ] ->setIgnoreCase( TRUE ); + m_completion[ i ] ->setIgnoreCase( true ); } completionMacro = new TDECompletion(); - completionMacro->setIgnoreCase( FALSE ); + completionMacro->setIgnoreCase( false ); currentBibTeXFile = NULL; } @@ -99,9 +99,9 @@ namespace KBibTeX fileIO_BibtexStringOpenDelimiter = config->readEntry( "BibtexStringOpenDelimiter", "\"" ).at( 0 ); fileIO_BibtexStringCloseDelimiter = config->readEntry( "BibtexStringCloseDelimiter", "\"" ).at( 0 ); fileIO_KeywordCasing = ( BibTeX::FileExporterBibTeX::KeywordCasing ) config->readNumEntry( "KeywordCasing", ( int ) BibTeX::FileExporterBibTeX::kcCamelCase ); - fileIO_EmbedFiles = config->readBoolEntry( "EmbedFiles", FALSE ); - fileIO_EnclosingCurlyBrackets = config->readBoolEntry( "EnclosingCurlyBrackets", FALSE ); - fileIO_useBibUtils = config->readBoolEntry( "UseBibUtils", TRUE ); + fileIO_EmbedFiles = config->readBoolEntry( "EmbedFiles", false ); + fileIO_EnclosingCurlyBrackets = config->readBoolEntry( "EnclosingCurlyBrackets", false ); + fileIO_useBibUtils = config->readBoolEntry( "UseBibUtils", true ); updateBib2Db5ClassPath( config->readEntry( "Bib2Db5BasePath", TQString::null ) ); fileIO_NumberOfBackups = config->readNumEntry( "NumberOfBackups", 0 ); @@ -114,14 +114,14 @@ namespace KBibTeX editing_MainListColumnsWidth = config->readIntListEntry( "MainListColumnsWidth" ); editing_MainListColumnsIndex = config->readIntListEntry( "MainListColumnsIndex" ); editing_FilterHistory = config->readListEntry( "FilterHistory" ); - editing_ShowComments = config->readBoolEntry( "ShowComments", TRUE ); - editing_ShowMacros = config->readBoolEntry( "ShowMacros", TRUE ); + editing_ShowComments = config->readBoolEntry( "ShowComments", true ); + editing_ShowMacros = config->readBoolEntry( "ShowMacros", true ); editing_HorSplitterSizes = config->readIntListEntry( "HorizontalSplitterSizes" ); editing_VertSplitterSizes = config->readIntListEntry( "VerticalSplitterSizes" ); TQFont defaultFont = TDEGlobalSettings::generalFont(); editing_SpecialFont = config->readFontEntry( "SpecialFont", &defaultFont ); - editing_UseSpecialFont = config->readBoolEntry( "UseSpecialFont", FALSE ); - editing_FirstNameFirst = config->readBoolEntry( "FirstNameFirst", FALSE ); + editing_UseSpecialFont = config->readBoolEntry( "UseSpecialFont", false ); + editing_FirstNameFirst = config->readBoolEntry( "FirstNameFirst", false ); editing_DocumentSearchPaths = config->readListEntry( "DocumentSearchPath" ); editing_DragAction = ( DragAction ) config->readNumEntry( "DragAction", ( int ) COPYREFERENCE ); @@ -155,7 +155,7 @@ namespace KBibTeX { TQString descr = config->readEntry( TQString( "SearchURLDescription%1" ).arg( i ), TQString::null ); TQString url = config->readEntry( TQString( "SearchURL%1" ).arg( i ), TQString::null ); - bool includeAuthor = config->readBoolEntry( TQString( "IncludeAuthor%1" ).arg( i ), FALSE ); + bool includeAuthor = config->readBoolEntry( TQString( "IncludeAuthor%1" ).arg( i ), false ); if ( descr != TQString::null && url != TQString::null ) { SearchURL * searchURL = new SearchURL; @@ -179,7 +179,7 @@ namespace KBibTeX webQuery_LastEngine = config->readNumEntry( "LastEngine", 0 ); webQuery_LastSearchTerm = config->readEntry( "LastSearchTerm", "" ); webQuery_LastNumberOfResults = config->readNumEntry( "LastNumberOfResults", 10 ); - webQuery_ImportAll = config->readBoolEntry( "ImportAll", FALSE ); + webQuery_ImportAll = config->readBoolEntry( "ImportAll", false ); config->setGroup( "IdSuggestions" ); idSuggestions_formatStrList = config->readListEntry( "FormatStrList" ); @@ -187,12 +187,12 @@ namespace KBibTeX { idSuggestions_formatStrList = TQStringList::split( ',', "A,A2|y,A3|y,A4|y|\":|T5,al|\":|T,al|y,al|Y,Al\"-|\"-|y,Al\"+|Y,al|y|T,al|Y|T3,al|Y|T3l,a|\":|Y|\":|T1,a|y,A|\":|Y" ); idSuggestions_default = -1; - idSuggestions_forceDefault = FALSE; + idSuggestions_forceDefault = false; } else { idSuggestions_default = config->readNumEntry( "Default", -1 ); - idSuggestions_forceDefault = config->readBoolEntry( "ForceDefault", FALSE ); + idSuggestions_forceDefault = config->readBoolEntry( "ForceDefault", false ); } idSuggestions_smallWords = config->readListEntry( "SmallWords" ); if ( idSuggestions_smallWords.count() == 0 ) @@ -373,7 +373,7 @@ namespace KBibTeX while ( result.isNull() && !input.atEnd() ) { TQString line = input.readLine(); - if ( line.startsWith( "\\serverpipe ", FALSE ) ) + if ( line.startsWith( "\\serverpipe ", false ) ) { TQStringList cols = TQStringList::split( TQRegExp( "\\s+\"|\"" ), line ); if ( cols.size() >= 2 ) @@ -465,8 +465,8 @@ namespace KBibTeX if ( personContainer != NULL ) for ( TQValueList<BibTeX::Person*>::Iterator itp = personContainer->persons.begin();itp != personContainer->persons.end(); ++itp ) { - m_completion[ index ] ->addItem(( *itp )->text( TRUE ) ); - m_completion[ index ] ->addItem(( *itp )->text( FALSE ) ); + m_completion[ index ] ->addItem(( *itp )->text( true ) ); + m_completion[ index ] ->addItem(( *itp )->text( false ) ); } else { @@ -531,91 +531,91 @@ namespace KBibTeX SearchURL *searchURL = new SearchURL; searchURL->description = "Google"; searchURL->url = "http://www.google.com/search?q=%1&ie=UTF-8&oe=UTF-8"; - searchURL->includeAuthor = TRUE; + searchURL->includeAuthor = true; searchURLs.append( searchURL ); searchURL = new SearchURL; searchURL->description = "Google Scholar"; searchURL->url = "http://scholar.google.com/scholar?q=%1&ie=UTF-8&oe=UTF-8"; - searchURL->includeAuthor = TRUE; + searchURL->includeAuthor = true; searchURLs.append( searchURL ); searchURL = new SearchURL; searchURL->description = "Google .bib Search"; searchURL->url = "http://www.google.com/search?q=%1%20filetype%3Abib&ie=UTF-8&oe=UTF-8"; - searchURL->includeAuthor = TRUE; + searchURL->includeAuthor = true; searchURLs.append( searchURL ); searchURL = new SearchURL; searchURL->description = "Google Document Search"; searchURL->url = "http://www.google.com/search?q=%1%20filetype%3Apdf%20OR%20filetype%3Aps&ie=UTF-8&oe=UTF-8"; - searchURL->includeAuthor = TRUE; + searchURL->includeAuthor = true; searchURLs.append( searchURL ); searchURL = new SearchURL; searchURL->description = "PubMed"; searchURL->url = "http://www.ncbi.nlm.nih.gov/entrez/query.fcgi?db=pubmed&cmd=search&pmfilter_Fulltext=on&pmfilter_Relevance=on&term=%1&search=Find+Articles"; - searchURL->includeAuthor = FALSE; + searchURL->includeAuthor = false; searchURLs.append( searchURL ); searchURL = new SearchURL; searchURL->description = "PubMed Central"; searchURL->url = "http://www.ncbi.nlm.nih.gov/entrez/query.fcgi?db=pubmed&cmd=search&term=%1"; - searchURL->includeAuthor = FALSE; + searchURL->includeAuthor = false; searchURLs.append( searchURL ); searchURL = new SearchURL; searchURL->description = "Amatex (US)"; searchURL->url = "http://www.2ndminute.org:8080/amatex/search.do?querry=%1&suchart=kwd&lang=DE"; - searchURL->includeAuthor = FALSE; + searchURL->includeAuthor = false; searchURLs.append( searchURL ); searchURL = new SearchURL; searchURL->description = "DBLP (Computer Science)"; searchURL->url = "http://www.informatik.uni-trier.de/ley/dbbin/dblpquery.cgi?title=%1"; - searchURL->includeAuthor = FALSE; + searchURL->includeAuthor = false; searchURLs.append( searchURL ); searchURL = new SearchURL; searchURL->description = "CiteSeer"; searchURL->url = "http://citeseer.ist.psu.edu/cis?q=%1&submit=Search+Documents"; - searchURL->includeAuthor = FALSE; + searchURL->includeAuthor = false; searchURLs.append( searchURL ); searchURL = new SearchURL; searchURL->description = "citebase"; searchURL->url = "http://www.citebase.org/search?type=metadata&author=&title=%1&publication=&yearfrom=&yearuntil=&order=DESC&rank=paperimpact&submitted=Search"; - searchURL->includeAuthor = FALSE; + searchURL->includeAuthor = false; searchURLs.append( searchURL ); searchURL = new SearchURL; searchURL->description = "BASE"; searchURL->url = "http://digital.ub.uni-bielefeld.de/index.php?q=%1&s=free"; - searchURL->includeAuthor = FALSE; + searchURL->includeAuthor = false; searchURLs.append( searchURL ); searchURL = new SearchURL; searchURL->description = "Forschungsportal.Net"; searchURL->url = "http://www.forschungsportal.net/fpj/q/?q=%1&pp=5&art=dok&html=1&pdf=1&ps=1&dvi=1"; - searchURL->includeAuthor = FALSE; + searchURL->includeAuthor = false; searchURLs.append( searchURL ); searchURL = new SearchURL; searchURL->description = "scirus"; searchURL->url = "http://www.scirus.com/srsapp/search?q=%1&ds=jnl&ds=nom&ds=web&g=s&t=all"; - searchURL->includeAuthor = FALSE; + searchURL->includeAuthor = false; searchURLs.append( searchURL ); searchURL = new SearchURL; searchURL->description = "ScientificCommons"; searchURL->url = "http://en.scientificcommons.org/#search_string=%1"; - searchURL->includeAuthor = FALSE; + searchURL->includeAuthor = false; searchURLs.append( searchURL ); searchURL = new SearchURL; searchURL->description = "SpringerLink"; searchURL->url = "http://www.springerlink.com/content/?k=%1"; - searchURL->includeAuthor = FALSE; + searchURL->includeAuthor = false; searchURLs.append( searchURL ); } @@ -746,7 +746,7 @@ namespace KBibTeX bool Settings::kpsewhich( const TQString& filename ) { - bool result = FALSE; + bool result = false; int counter = 0; TQWaitCondition waitCond; @@ -779,14 +779,14 @@ namespace KBibTeX if ( _filename.contains( "~/" ) && !userHome.isEmpty() ) _filename = _filename.replace( "~/", userHome.append( "/" ) ); KURL url( _filename ); - if ( url.isValid() && ( !url.isLocalFile() || TDEIO::NetAccess::exists( url, TRUE, window ) ) ) + if ( url.isValid() && ( !url.isLocalFile() || TDEIO::NetAccess::exists( url, true, window ) ) ) return url; if ( bibTeXFileName != TQString::null ) { - TQString path = KURL( bibTeXFileName ).directory( FALSE, FALSE ); + TQString path = KURL( bibTeXFileName ).directory( false, false ); url = KURL( path + "/" + _filename ); - if ( url.isValid() && TDEIO::NetAccess::exists( url, TRUE, window ) ) + if ( url.isValid() && TDEIO::NetAccess::exists( url, true, window ) ) return url; } @@ -794,7 +794,7 @@ namespace KBibTeX for ( TQStringList::Iterator it = settings->editing_DocumentSearchPaths.begin(); it != settings->editing_DocumentSearchPaths.end(); ++it ) { url = KURL( *it + "/" + _filename ); - if ( url.isValid() && TDEIO::NetAccess::exists( url, TRUE, window ) ) + if ( url.isValid() && TDEIO::NetAccess::exists( url, true, window ) ) return url; } @@ -811,7 +811,7 @@ namespace KBibTeX if ( linkFilename[0] == '/' ) return linkFilename; TQFileInfo fiO( originalFilename ); - TQFileInfo fiL( fiO.dirPath( TRUE ) + "/" + linkFilename ); + TQFileInfo fiL( fiO.dirPath( true ) + "/" + linkFilename ); return fiL.absFilePath(); } diff --git a/src/settingsdlg.cpp b/src/settingsdlg.cpp index 4df650a..acc722e 100644 --- a/src/settingsdlg.cpp +++ b/src/settingsdlg.cpp @@ -43,47 +43,47 @@ namespace KBibTeX TQVBoxLayout *layout = new TQVBoxLayout( page, 0, spacingHint() ); m_editing = new SettingsEditing( page ); layout->addWidget( m_editing ); - connect( m_editing, SIGNAL( configChanged() ), this, SLOT( slotConfigChanged() ) ); + connect( m_editing, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotConfigChanged() ) ); page = addPage( i18n( "&File Open&&Save" ) ); layout = new TQVBoxLayout( page, 0, spacingHint() ); m_fileIO = new SettingsFileIO( page ); layout->addWidget( m_fileIO ); - connect( m_fileIO, SIGNAL( configChanged() ), this, SLOT( slotConfigChanged() ) ); + connect( m_fileIO, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotConfigChanged() ) ); page = addPage( i18n( "&Search URLs" ) ); layout = new TQVBoxLayout( page, 0, spacingHint() ); m_searchURL = new SettingsSearchURL( page ); layout->addWidget( m_searchURL ); - connect( m_searchURL, SIGNAL( configChanged() ), this, SLOT( slotConfigChanged() ) ); + connect( m_searchURL, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotConfigChanged() ) ); page = addPage( i18n( "Global &Keywords" ), TQString::null, SmallIcon( "package" ) ); layout = new TQVBoxLayout( page, 0, spacingHint() ); m_keyword = new SettingsKeyword( page ); layout->addWidget( m_keyword ); - connect( m_keyword, SIGNAL( configChanged() ), this, SLOT( slotConfigChanged() ) ); + connect( m_keyword, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotConfigChanged() ) ); page = addPage( i18n( "Id Suggestions" ) ); layout = new TQVBoxLayout( page, 0, spacingHint() ); m_idSuggestions = new SettingsIdSuggestions( page ); layout->addWidget( m_idSuggestions ); - connect( m_idSuggestions, SIGNAL( configChanged() ), this, SLOT( slotConfigChanged() ) ); + connect( m_idSuggestions, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotConfigChanged() ) ); page = addPage( i18n( "User Defined Fields" ) ); layout = new TQVBoxLayout( page, 0, spacingHint() ); m_userDefinedInput = new SettingsUserDefinedInput( page ); layout->addWidget( m_userDefinedInput ); - connect( m_userDefinedInput, SIGNAL( configChanged() ), this, SLOT( slotConfigChanged() ) ); + connect( m_userDefinedInput, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotConfigChanged() ) ); #ifdef HAVE_YAZ page = addPage( i18n( "Z39.50" ) ); layout = new TQVBoxLayout( page, 0, spacingHint() ); m_z3950config = new SettingsZ3950( page ); layout->addWidget( m_z3950config ); - connect( m_z3950config, SIGNAL( configChanged() ), this, SLOT( slotConfigChanged() ) ); + connect( m_z3950config, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotConfigChanged() ) ); #endif // HAVE_YAZ - connect( this, SIGNAL( applyClicked() ), SLOT( slotApplySettings() ) ); + connect( this, TQ_SIGNAL( applyClicked() ), TQ_SLOT( slotApplySettings() ) ); } @@ -103,14 +103,14 @@ namespace KBibTeX #ifdef HAVE_YAZ m_z3950config->readData(); #endif // HAVE_YAZ - enableButton( Apply, FALSE ); + enableButton( Apply, false ); return KDialogBase::exec(); } void SettingsDlg::slotConfigChanged() { - enableButton( Apply, TRUE ); + enableButton( Apply, true ); } void SettingsDlg::slotApplySettings() @@ -124,7 +124,7 @@ namespace KBibTeX #ifdef HAVE_YAZ m_z3950config->applyData(); #endif // HAVE_YAZ - enableButton( Apply, FALSE ); + enableButton( Apply, false ); } void SettingsDlg::accept() diff --git a/src/settingsdlg.h b/src/settingsdlg.h index 5097934..8315a7e 100644 --- a/src/settingsdlg.h +++ b/src/settingsdlg.h @@ -40,7 +40,7 @@ namespace KBibTeX class SettingsDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: SettingsDlg( TQWidget *parent = 0, const char *name = "SETTINGsdlg" ); diff --git a/src/settingsediting.cpp b/src/settingsediting.cpp index 4431789..493c8bd 100644 --- a/src/settingsediting.cpp +++ b/src/settingsediting.cpp @@ -63,7 +63,7 @@ namespace KBibTeX TQToolTip::add( m_urlRequesterNewPath->button(), i18n( "Select a path to add" ) ); m_pushButtonAddDir = new KPushButton( i18n( "Add" ), this ); m_pushButtonAddDir->setIconSet( TQIconSet( SmallIcon( "add" ) ) ); - m_pushButtonAddDir->setEnabled( FALSE ); + m_pushButtonAddDir->setEnabled( false ); TQToolTip::add( m_pushButtonAddDir, i18n( "Add chosen path to list" ) ); layout->addWidget( m_pushButtonAddDir, 1, 2 ); @@ -77,18 +77,18 @@ namespace KBibTeX layout->addMultiCellWidget( m_listViewPathList, 3, 4, 0, 1 ); m_pushButtonDelDir = new KPushButton( i18n( "Delete" ), this ); layout->addWidget( m_pushButtonDelDir, 3, 2 ); - m_pushButtonDelDir->setEnabled( FALSE ); + m_pushButtonDelDir->setEnabled( false ); m_pushButtonDelDir->setIconSet( TQIconSet( SmallIcon( "edit-delete" ) ) ); TQToolTip::add( m_pushButtonDelDir, i18n( "Remove selected path from list" ) ); layout->setRowStretch( 4, 1 ); layout->setColStretch( 0, 1 ); - connect( m_urlRequesterNewPath, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChanged( const TQString& ) ) ); - connect( m_urlRequesterNewPath, SIGNAL( urlSelected( const TQString& ) ), this, SLOT( slotTextChanged( const TQString& ) ) ); - connect( m_pushButtonAddDir, SIGNAL( clicked() ), this, SLOT( slotAddDir() ) ); - connect( m_listViewPathList, SIGNAL( selectionChanged() ), this, SLOT( slotSelectionChanged() ) ); - connect( m_pushButtonDelDir, SIGNAL( clicked() ), this, SLOT( slotDelDir() ) ); + connect( m_urlRequesterNewPath, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotTextChanged( const TQString& ) ) ); + connect( m_urlRequesterNewPath, TQ_SIGNAL( urlSelected( const TQString& ) ), this, TQ_SLOT( slotTextChanged( const TQString& ) ) ); + connect( m_pushButtonAddDir, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddDir() ) ); + connect( m_listViewPathList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotSelectionChanged() ) ); + connect( m_pushButtonDelDir, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDelDir() ) ); for ( TQStringList::Iterator it = pathList.begin(); it != pathList.end(); ++it ) new TQListViewItem( m_listViewPathList, *it ); @@ -99,8 +99,8 @@ namespace KBibTeX KDialogBase *dlg = new KDialogBase( parent, "SettingsEditingPathsDialog", true, i18n( "Edit Document Search Paths" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, false ); SettingsEditingPaths *sep = new SettingsEditingPaths( pathList, dlg, "SettingsEditingPaths" ); dlg->setMainWidget( sep ); - connect( dlg, SIGNAL( apply() ), sep, SLOT( slotApply() ) ); - connect( dlg, SIGNAL( okClicked() ), sep, SLOT( slotApply() ) ); + connect( dlg, TQ_SIGNAL( apply() ), sep, TQ_SLOT( slotApply() ) ); + connect( dlg, TQ_SIGNAL( okClicked() ), sep, TQ_SLOT( slotApply() ) ); bool result = dlg->exec() == TQDialog::Accepted; delete dlg; @@ -133,7 +133,7 @@ namespace KBibTeX { TQListViewItem *item = new TDEListViewItem( m_listViewPathList, path ); m_listViewPathList->ensureItemVisible( item ); - m_listViewPathList->setSelected( item, TRUE ); + m_listViewPathList->setSelected( item, true ); slotSelectionChanged(); } else @@ -160,7 +160,7 @@ namespace KBibTeX group = new TQGroupBox( 2, TQt::Horizontal, i18n( "Main List" ), this ); layout->addWidget( group ); TQLabel *label = new TQLabel( i18n( "&Sorting:" ), group ); - m_comboBoxSortingColumn = new TQComboBox( FALSE, group ); + m_comboBoxSortingColumn = new TQComboBox( false, group ); m_comboBoxSortingColumn->insertItem( i18n( "Element Type" ) ); m_comboBoxSortingColumn->insertItem( i18n( "Entry Id" ) ); for ( int i = 0; i <= ( int ) BibTeX::EntryField::ftYear - ( int ) BibTeX::EntryField::ftAbstract; i++ ) @@ -172,19 +172,19 @@ namespace KBibTeX label->setBuddy( m_comboBoxSortingColumn ); label = new TQLabel( i18n( "So&rting order:" ), group ); - m_comboBoxSortingOrder = new TQComboBox( FALSE, group ); + m_comboBoxSortingOrder = new TQComboBox( false, group ); m_comboBoxSortingOrder->insertItem( i18n( "Ascending" ) ); m_comboBoxSortingOrder->insertItem( i18n( "Descending" ) ); label->setBuddy( m_comboBoxSortingOrder ); label = new TQLabel( i18n( "&Double click action:" ), group ); - m_comboBoxDoubleClickAction = new TQComboBox( FALSE, group ); + m_comboBoxDoubleClickAction = new TQComboBox( false, group ); m_comboBoxDoubleClickAction->insertItem( i18n( "Edit element" ) ); m_comboBoxDoubleClickAction->insertItem( i18n( "Open document" ) ); label->setBuddy( m_comboBoxDoubleClickAction ); label = new TQLabel( i18n( "On dragging with mouse:" ), group ); - m_comboBoxDragAction = new TQComboBox( FALSE, group ); + m_comboBoxDragAction = new TQComboBox( false, group ); m_comboBoxDragAction->insertItem( i18n( "Copy reference (\\cite{...})" ) ); m_comboBoxDragAction->insertItem( i18n( "Copy BibTeX text (@article{...})" ) ); label->setBuddy( m_comboBoxDragAction ); @@ -229,16 +229,16 @@ namespace KBibTeX layout->addStretch(); - connect( m_checkBoxSearchBarClearField, SIGNAL( toggled( bool ) ), this, SLOT( slotConfigChanged() ) ); - connect( m_checkBoxEnableAllFields, SIGNAL( toggled( bool ) ), this, SLOT( slotConfigChanged() ) ); - connect( m_comboBoxDoubleClickAction, SIGNAL( activated( int ) ), this, SLOT( slotConfigChanged() ) ); - connect( m_comboBoxDragAction, SIGNAL( activated( int ) ), this, SLOT( slotConfigChanged() ) ); - connect( m_comboBoxSortingColumn, SIGNAL( activated( int ) ), this, SLOT( slotConfigChanged() ) ); - connect( m_comboBoxSortingOrder, SIGNAL( activated( int ) ), this, SLOT( slotConfigChanged() ) ); - connect( m_pushButtonSpecialFont, SIGNAL( clicked() ), this, SLOT( slotSelectSpecialFont() ) ); - connect( m_checkBoxUseSpecialFont, SIGNAL( toggled( bool ) ), m_pushButtonSpecialFont, SLOT( setEnabled( bool ) ) ); - connect( m_checkBoxUseSpecialFont, SIGNAL( toggled( bool ) ), this, SLOT( slotConfigChanged() ) ); - connect( btnSelectDocumentSearchPath, SIGNAL( clicked() ), this, SLOT( slotSelectDocumentSearchPath() ) ); + connect( m_checkBoxSearchBarClearField, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotConfigChanged() ) ); + connect( m_checkBoxEnableAllFields, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotConfigChanged() ) ); + connect( m_comboBoxDoubleClickAction, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotConfigChanged() ) ); + connect( m_comboBoxDragAction, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotConfigChanged() ) ); + connect( m_comboBoxSortingColumn, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotConfigChanged() ) ); + connect( m_comboBoxSortingOrder, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotConfigChanged() ) ); + connect( m_pushButtonSpecialFont, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSelectSpecialFont() ) ); + connect( m_checkBoxUseSpecialFont, TQ_SIGNAL( toggled( bool ) ), m_pushButtonSpecialFont, TQ_SLOT( setEnabled( bool ) ) ); + connect( m_checkBoxUseSpecialFont, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotConfigChanged() ) ); + connect( btnSelectDocumentSearchPath, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSelectDocumentSearchPath() ) ); } diff --git a/src/settingsediting.h b/src/settingsediting.h index f6915f1..fef66dc 100644 --- a/src/settingsediting.h +++ b/src/settingsediting.h @@ -35,7 +35,7 @@ namespace KBibTeX { class SettingsEditingPaths: public TQWidget { - Q_OBJECT + TQ_OBJECT protected: SettingsEditingPaths( TQStringList& pathList, TQWidget*parent = 0, const char *name = 0 ); @@ -59,7 +59,7 @@ namespace KBibTeX class SettingsEditing : public TQWidget { - Q_OBJECT + TQ_OBJECT public: SettingsEditing( TQWidget *parent = 0, const char *name = 0 ); ~SettingsEditing(); diff --git a/src/settingsfileio.cpp b/src/settingsfileio.cpp index c148435..4fe7e80 100644 --- a/src/settingsfileio.cpp +++ b/src/settingsfileio.cpp @@ -199,7 +199,7 @@ namespace KBibTeX if ( m_comboBoxExportSystemHTML->count() == 0 ) { m_comboBoxExportSystemHTML->insertItem( i18n( "No exporter available" ) ); - m_comboBoxExportSystemHTML->setEnabled( FALSE ); + m_comboBoxExportSystemHTML->setEnabled( false ); } m_checkBoxEmbedFiles->setChecked( settings->fileIO_EmbedFiles ); @@ -264,7 +264,7 @@ namespace KBibTeX m_comboBoxLanguage = new TQComboBox( groupBox ); label->setBuddy( m_comboBoxLanguage ); label = new TQLabel( i18n( "&Biblography style:" ), groupBox ); - m_comboBoxBibliographyStyle = new TQComboBox( TRUE, groupBox ); + m_comboBoxBibliographyStyle = new TQComboBox( true, groupBox ); label->setBuddy( m_comboBoxBibliographyStyle ); groupBox = new TQGroupBox( 1, Horizontal, i18n( "PDF Export" ), this ); @@ -288,12 +288,12 @@ namespace KBibTeX containerLayout->setStretchFactor( buttonBib2Db5, 1 ); buttonBib2Db5->setIconSet( TQIconSet( SmallIcon( "folder_open" ) ) ); label->setBuddy( buttonBib2Db5 ); - connect( buttonBib2Db5, SIGNAL( clicked() ), this, SLOT( slotBib2db5BasePath() ) ); + connect( buttonBib2Db5, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotBib2db5BasePath() ) ); groupBox = new TQGroupBox( 2, Horizontal, i18n( "Export Systems" ), this ); layout->addWidget( groupBox ); label = new TQLabel( i18n( "HTML:" ), groupBox ); - m_comboBoxExportSystemHTML = new TQComboBox( FALSE, groupBox ); + m_comboBoxExportSystemHTML = new TQComboBox( false, groupBox ); label->setBuddy( m_comboBoxExportSystemHTML ); groupBox = new TQGroupBox( 1, Horizontal, i18n( "BibUtils" ), this ); @@ -329,12 +329,12 @@ namespace KBibTeX bibList.sort(); m_comboBoxBibliographyStyle->insertStringList( bibList ); - connect( m_comboBoxEncoding, SIGNAL( activated( int ) ), this, SLOT( slotConfigChanged() ) ); - connect( m_comboBoxStringDelimiters, SIGNAL( activated( int ) ), this, SLOT( slotConfigChanged() ) ); - connect( m_comboBoxKeywordCasing, SIGNAL( activated( int ) ), this, SLOT( slotConfigChanged() ) ); - connect( m_comboBoxLanguage, SIGNAL( activated( int ) ), this, SLOT( slotConfigChanged() ) ); - connect( m_comboBoxBibliographyStyle, SIGNAL( activated( int ) ), this, SLOT( slotConfigChanged() ) ); - connect( m_comboBoxExportSystemHTML, SIGNAL( activated( int ) ), this, SLOT( slotConfigChanged() ) ); + connect( m_comboBoxEncoding, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotConfigChanged() ) ); + connect( m_comboBoxStringDelimiters, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotConfigChanged() ) ); + connect( m_comboBoxKeywordCasing, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotConfigChanged() ) ); + connect( m_comboBoxLanguage, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotConfigChanged() ) ); + connect( m_comboBoxBibliographyStyle, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotConfigChanged() ) ); + connect( m_comboBoxExportSystemHTML, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotConfigChanged() ) ); } } diff --git a/src/settingsfileio.h b/src/settingsfileio.h index 5572ae4..30d1917 100644 --- a/src/settingsfileio.h +++ b/src/settingsfileio.h @@ -35,7 +35,7 @@ namespace KBibTeX { class SettingsFileIO : public TQWidget { - Q_OBJECT + TQ_OBJECT public: SettingsFileIO( TQWidget *parent = 0, const char *name = 0 ); ~SettingsFileIO(); diff --git a/src/settingsidsuggestions.cpp b/src/settingsidsuggestions.cpp index c1c68cc..12f491c 100644 --- a/src/settingsidsuggestions.cpp +++ b/src/settingsidsuggestions.cpp @@ -46,13 +46,13 @@ namespace KBibTeX IdSuggestionsListViewItem::IdSuggestionsListViewItem( TDEListView *list, const TQString& plainText, BibTeX::Entry *example ): TDEListViewItem( list ), m_original( plainText ), m_example( example ) { TDEListViewItem::setText( 0, parse( plainText ) ); - TDEListViewItem::setMultiLinesEnabled( TRUE ); + TDEListViewItem::setMultiLinesEnabled( true ); } IdSuggestionsListViewItem::IdSuggestionsListViewItem( TDEListView *list, TDEListViewItem *prev, const TQString& plainText, BibTeX::Entry *example ): TDEListViewItem( list, prev ), m_original( plainText ), m_example( example ) { TDEListViewItem::setText( 0, parse( plainText ) ); - TDEListViewItem::setMultiLinesEnabled( TRUE ); + TDEListViewItem::setMultiLinesEnabled( true ); } void IdSuggestionsListViewItem::setText( int col, const TQString& text ) @@ -170,8 +170,8 @@ namespace KBibTeX { IdSuggestionsListViewItem * item = new IdSuggestionsListViewItem( m_listIdSuggestions, "a|Y|T", m_example ); item->setPixmap( 0, SmallIcon( "filter" ) ); - m_listIdSuggestions->setSelected( item, TRUE ); - TQTimer::singleShot( 100, this, SLOT( slotEditIdSuggestion() ) ); + m_listIdSuggestions->setSelected( item, true ); + TQTimer::singleShot( 100, this, TQ_SLOT( slotEditIdSuggestion() ) ); } void SettingsIdSuggestions::slotEditIdSuggestion() @@ -333,39 +333,39 @@ namespace KBibTeX gridLayout->setColStretch( 0, 1 ); m_listIdSuggestions = new TDEListView( this ); - m_listIdSuggestions->setSorting( -1, FALSE ); + m_listIdSuggestions->setSorting( -1, false ); m_listIdSuggestions->addColumn( i18n( "Id Suggestions" ) ); - m_listIdSuggestions->header()->setClickEnabled( FALSE ); + m_listIdSuggestions->header()->setClickEnabled( false ); m_listIdSuggestions->setFullWidth( true ); gridLayout->addMultiCellWidget( m_listIdSuggestions, 0, 6, 0, 0 ); - connect( m_listIdSuggestions, SIGNAL( selectionChanged() ), this, SLOT( updateGUI() ) ); - connect( m_listIdSuggestions, SIGNAL( currentChanged( TQListViewItem * ) ), this, SLOT( updateGUI() ) ); - connect( m_listIdSuggestions, SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), this, SLOT( slotEditIdSuggestion() ) ); + connect( m_listIdSuggestions, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( updateGUI() ) ); + connect( m_listIdSuggestions, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQ_SLOT( updateGUI() ) ); + connect( m_listIdSuggestions, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), this, TQ_SLOT( slotEditIdSuggestion() ) ); m_buttonNewIdSuggestion = new KPushButton( i18n( "id suggestion", "New" ), this ); m_buttonNewIdSuggestion->setIconSet( TQIconSet( SmallIcon( "add" ) ) ); gridLayout->addWidget( m_buttonNewIdSuggestion, 0, 1 ); - connect( m_buttonNewIdSuggestion, SIGNAL( clicked() ), this, SLOT( slotNewIdSuggestion() ) ); + connect( m_buttonNewIdSuggestion, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotNewIdSuggestion() ) ); m_buttonEditIdSuggestion = new KPushButton( i18n( "id suggestion", "Edit" ), this ); m_buttonEditIdSuggestion->setIconSet( TQIconSet( SmallIcon( "edit" ) ) ); gridLayout->addWidget( m_buttonEditIdSuggestion, 1, 1 ); - connect( m_buttonEditIdSuggestion, SIGNAL( clicked() ), this, SLOT( slotEditIdSuggestion() ) ); + connect( m_buttonEditIdSuggestion, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEditIdSuggestion() ) ); m_buttonDeleteIdSuggestion = new KPushButton( i18n( "id suggestion", "Delete" ), this ); m_buttonDeleteIdSuggestion->setIconSet( TQIconSet( SmallIcon( "edit-delete" ) ) ); gridLayout->addWidget( m_buttonDeleteIdSuggestion, 2, 1 ); - connect( m_buttonDeleteIdSuggestion, SIGNAL( clicked() ), this, SLOT( slotDeleteIdSuggestion() ) ); + connect( m_buttonDeleteIdSuggestion, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDeleteIdSuggestion() ) ); m_buttonMoveUpIdSuggestion = new KPushButton( i18n( "id suggestion", "Up" ), this ); m_buttonMoveUpIdSuggestion->setIconSet( TQIconSet( SmallIcon( "go-up" ) ) ); gridLayout->addWidget( m_buttonMoveUpIdSuggestion, 3, 1 ); - connect( m_buttonMoveUpIdSuggestion, SIGNAL( clicked() ), this, SLOT( slotMoveUpIdSuggestion() ) ); + connect( m_buttonMoveUpIdSuggestion, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveUpIdSuggestion() ) ); m_buttonMoveDownIdSuggestion = new KPushButton( i18n( "id suggestion", "Down" ), this ); m_buttonMoveDownIdSuggestion->setIconSet( TQIconSet( SmallIcon( "go-down" ) ) ); gridLayout->addWidget( m_buttonMoveDownIdSuggestion, 4, 1 ); - connect( m_buttonMoveDownIdSuggestion, SIGNAL( clicked() ), this, SLOT( slotMoveDownIdSuggestion() ) ); + connect( m_buttonMoveDownIdSuggestion, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveDownIdSuggestion() ) ); m_buttonToggleDefault = new KPushButton( i18n( "Toogle default" ), this ); m_buttonToggleDefault->setIconSet( TQIconSet( SmallIcon( "favorites" ) ) ); gridLayout->addWidget( m_buttonToggleDefault, 5, 1 ); - connect( m_buttonToggleDefault, SIGNAL( clicked() ), this, SLOT( slotToggleDefault() ) ); + connect( m_buttonToggleDefault, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotToggleDefault() ) ); m_checkBoxForceDefault = new TQCheckBox( i18n( "Use default id suggestion when editing new entries" ), this ); gridLayout->addMultiCellWidget( m_checkBoxForceDefault, 7, 7, 0, 1 ); @@ -375,25 +375,25 @@ namespace KBibTeX m_lineEditSmallWords = new KLineEdit( this ); label->setBuddy( m_lineEditSmallWords ); gridLayout->addWidget( m_lineEditSmallWords, 10, 0 ); - connect( m_lineEditSmallWords, SIGNAL( textChanged( const TQString & ) ), this, SLOT( slotEditSmallWordsChanged( const TQString & ) ) ); + connect( m_lineEditSmallWords, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotEditSmallWordsChanged( const TQString & ) ) ); m_buttonAddSmallWord = new KPushButton( i18n( "Add" ), this ); m_buttonAddSmallWord->setEnabled( false ); m_buttonAddSmallWord->setIconSet( TQIconSet( SmallIcon( "add" ) ) ); gridLayout->addWidget( m_buttonAddSmallWord, 10, 1 ); - connect( m_buttonAddSmallWord, SIGNAL( clicked() ), this, SLOT( slotAddSmallWord() ) ); + connect( m_buttonAddSmallWord, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddSmallWord() ) ); m_listSmallWords = new TDEListView( this ); m_listSmallWords->addColumn( i18n( "Small Words" ) ); m_listSmallWords->header()->setClickEnabled( true ); m_listSmallWords->setFullWidth( true ); - connect( m_listSmallWords, SIGNAL( selectionChanged() ), this, SLOT( slotListSmallWordsChanged() ) ); - connect( m_listSmallWords, SIGNAL( currentChanged( TQListViewItem * ) ), this, SLOT( slotListSmallWordsChanged() ) ); + connect( m_listSmallWords, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotListSmallWordsChanged() ) ); + connect( m_listSmallWords, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQ_SLOT( slotListSmallWordsChanged() ) ); gridLayout->addMultiCellWidget( m_listSmallWords, 11, 12, 0, 0 ); m_buttonDeleteSmallWord = new KPushButton( i18n( "Delete" ), this ); m_buttonDeleteSmallWord->setEnabled( false ); m_buttonDeleteSmallWord->setIconSet( TQIconSet( SmallIcon( "edit-delete" ) ) ); gridLayout->addWidget( m_buttonDeleteSmallWord, 11, 1 ); - connect( m_buttonDeleteSmallWord, SIGNAL( clicked() ), this, SLOT( slotDeleteSmallWord() ) ); + connect( m_buttonDeleteSmallWord, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDeleteSmallWord() ) ); } } diff --git a/src/settingsidsuggestions.h b/src/settingsidsuggestions.h index fc04655..119b333 100644 --- a/src/settingsidsuggestions.h +++ b/src/settingsidsuggestions.h @@ -55,7 +55,7 @@ namespace KBibTeX */ class SettingsIdSuggestions : public TQWidget { - Q_OBJECT + TQ_OBJECT public: SettingsIdSuggestions( TQWidget *parent = 0, const char *name = 0 ); ~SettingsIdSuggestions(); diff --git a/src/settingskeyword.cpp b/src/settingskeyword.cpp index de309dd..49a9b8d 100644 --- a/src/settingskeyword.cpp +++ b/src/settingskeyword.cpp @@ -82,9 +82,9 @@ namespace KBibTeX { TDEListViewItem * item = new TDEListViewItem( m_listKeywords, i18n( "New Keyword" ) ); item->setPixmap( 0, SmallIcon( "package" ) ); - m_listKeywords->setSelected( item, TRUE ); + m_listKeywords->setSelected( item, true ); m_listKeywords->ensureItemVisible( item ); - TQTimer::singleShot( 100, this, SLOT( slotEditKeyword() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( slotEditKeyword() ) ); } void SettingsKeyword::slotEditKeyword() @@ -130,7 +130,7 @@ namespace KBibTeX KMessageBox::information( this, i18n( "1 keyword has been imported.", "%n keywords have been imported.", numImported ), i18n( "Keywords imported" ) ); - m_buttonImportKeywords->setEnabled( FALSE ); + m_buttonImportKeywords->setEnabled( false ); } void SettingsKeyword::slotItemRenamed( TQListViewItem *item ) @@ -159,7 +159,7 @@ namespace KBibTeX m_listKeywords = new TDEListView( this ); m_listKeywords->addColumn( i18n( "Keywords" ) ); - m_listKeywords->header()->setClickEnabled( FALSE ); + m_listKeywords->header()->setClickEnabled( false ); m_listKeywords->setFullWidth( true ); gridLayout->addMultiCellWidget( m_listKeywords, 0, 4, 0, 0 ); @@ -177,15 +177,15 @@ namespace KBibTeX m_buttonImportKeywords->setIconSet( TQIconSet( SmallIcon( "openfile" ) ) ); TQToolTip::add( m_buttonImportKeywords, "Import all keywords from the current BibTeX file" ); gridLayout->addWidget( m_buttonImportKeywords, 4, 1 ); - connect( m_buttonImportKeywords, SIGNAL( clicked() ), this, SLOT( slotImportKeywords() ) ); - - connect( m_buttonNewKeyword, SIGNAL( clicked() ), this, SLOT( slotNewKeyword() ) ); - connect( m_buttonEditKeyword, SIGNAL( clicked() ), this, SLOT( slotEditKeyword() ) ); - connect( m_buttonDeleteKeyword, SIGNAL( clicked() ), this, SLOT( slotDeleteKeyword() ) ); - connect( m_listKeywords, SIGNAL( selectionChanged() ), this, SLOT( updateGUI() ) ); - connect( m_listKeywords, SIGNAL( currentChanged( TQListViewItem * ) ), this, SLOT( updateGUI() ) ); - connect( m_listKeywords, SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), this, SLOT( slotEditKeyword() ) ); - connect( m_listKeywords, SIGNAL( itemRenamed( TQListViewItem* ) ), this, SLOT( slotItemRenamed( TQListViewItem* ) ) ); + connect( m_buttonImportKeywords, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotImportKeywords() ) ); + + connect( m_buttonNewKeyword, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotNewKeyword() ) ); + connect( m_buttonEditKeyword, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEditKeyword() ) ); + connect( m_buttonDeleteKeyword, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDeleteKeyword() ) ); + connect( m_listKeywords, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( updateGUI() ) ); + connect( m_listKeywords, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQ_SLOT( updateGUI() ) ); + connect( m_listKeywords, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), this, TQ_SLOT( slotEditKeyword() ) ); + connect( m_listKeywords, TQ_SIGNAL( itemRenamed( TQListViewItem* ) ), this, TQ_SLOT( slotItemRenamed( TQListViewItem* ) ) ); updateGUI(); } diff --git a/src/settingskeyword.h b/src/settingskeyword.h index ea26c71..bbbdab5 100644 --- a/src/settingskeyword.h +++ b/src/settingskeyword.h @@ -33,7 +33,7 @@ namespace KBibTeX */ class SettingsKeyword : public TQWidget { - Q_OBJECT + TQ_OBJECT public: SettingsKeyword( TQWidget *parent = 0, const char *name = 0 ); ~SettingsKeyword(); diff --git a/src/settingssearchurl.cpp b/src/settingssearchurl.cpp index 03c8983..99831bf 100644 --- a/src/settingssearchurl.cpp +++ b/src/settingssearchurl.cpp @@ -129,11 +129,11 @@ namespace KBibTeX m_listviewSearchURLs = new TDEListView( this ); layout->addMultiCellWidget( m_listviewSearchURLs, 0, 4, 0, 0 ); - m_listviewSearchURLs->setAllColumnsShowFocus( TRUE ); + m_listviewSearchURLs->setAllColumnsShowFocus( true ); m_listviewSearchURLs->addColumn( i18n( "Description" ) ); m_listviewSearchURLs->addColumn( i18n( "Author" ) ); m_listviewSearchURLs->addColumn( i18n( "URL" ) ); - m_listviewSearchURLs->header()->setClickEnabled( FALSE ); + m_listviewSearchURLs->header()->setClickEnabled( false ); m_listviewSearchURLs->setFullWidth( true ); m_listviewSearchURLs->setMinimumWidth( 384 ); @@ -153,21 +153,21 @@ namespace KBibTeX m_pushbuttonReset->setIconSet( TQIconSet( SmallIcon( "reload" ) ) ); layout->addWidget( m_pushbuttonReset, 4, 1 ); - connect( m_pushbuttonNew, SIGNAL( clicked() ), this, SLOT( slotNew() ) ); - connect( m_pushbuttonEdit, SIGNAL( clicked() ), this, SLOT( slotEdit() ) ); - connect( m_listviewSearchURLs, SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), this, SLOT( slotEdit() ) ); - connect( m_pushbuttonDelete, SIGNAL( clicked() ), this, SLOT( slotDelete() ) ); - connect( m_pushbuttonReset, SIGNAL( clicked() ), this, SLOT( slotReset() ) ); - connect( m_listviewSearchURLs, SIGNAL( selectionChanged( TQListViewItem * ) ), this, SLOT( updateGUI() ) ); - connect( m_listviewSearchURLs, SIGNAL( currentChanged( TQListViewItem * ) ), this, SLOT( updateGUI() ) ); - connect( m_listviewSearchURLs, SIGNAL( onItem( TQListViewItem * ) ), this, SLOT( updateGUI() ) ); + connect( m_pushbuttonNew, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotNew() ) ); + connect( m_pushbuttonEdit, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEdit() ) ); + connect( m_listviewSearchURLs, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), this, TQ_SLOT( slotEdit() ) ); + connect( m_pushbuttonDelete, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDelete() ) ); + connect( m_pushbuttonReset, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotReset() ) ); + connect( m_listviewSearchURLs, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), this, TQ_SLOT( updateGUI() ) ); + connect( m_listviewSearchURLs, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQ_SLOT( updateGUI() ) ); + connect( m_listviewSearchURLs, TQ_SIGNAL( onItem( TQListViewItem * ) ), this, TQ_SLOT( updateGUI() ) ); updateGUI(); } void SettingsSearchURL::urlDialog( TQListViewItem * item ) { - KDialogBase * dlg = new KDialogBase( this, "urldialog", TRUE, item == NULL ? i18n( "New URL" ) : i18n( "Edit URL" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, TRUE ); + KDialogBase * dlg = new KDialogBase( this, "urldialog", true, item == NULL ? i18n( "New URL" ) : i18n( "Edit URL" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ); TQWidget *container = new TQWidget( dlg, "container" ); TQGridLayout *layout = new TQGridLayout( container, 3, 2, 0, KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n( "Description:" ), container ); @@ -184,7 +184,7 @@ namespace KBibTeX TQToolTip::add( url, i18n( "Within the URL, '%1' will be replaced by the search term." ) ); label = new TQLabel( i18n( "Include Author:" ), container ); layout->addWidget( label, 2, 0 ); - TQComboBox *cbIncludeAuthor = new TQComboBox( FALSE, container ); + TQComboBox *cbIncludeAuthor = new TQComboBox( false, container ); layout->addWidget( cbIncludeAuthor, 2, 1 ); label->setBuddy( cbIncludeAuthor ); cbIncludeAuthor->insertItem( i18n( "Yes" ) ); diff --git a/src/settingssearchurl.h b/src/settingssearchurl.h index e3bdddf..ede770c 100644 --- a/src/settingssearchurl.h +++ b/src/settingssearchurl.h @@ -31,7 +31,7 @@ namespace KBibTeX { class SettingsSearchURL : public TQWidget { - Q_OBJECT + TQ_OBJECT public: SettingsSearchURL( TQWidget *parent = 0, const char *name = 0 ); ~SettingsSearchURL(); diff --git a/src/settingsuserdefinedinput.cpp b/src/settingsuserdefinedinput.cpp index 91cf92c..1c77f10 100644 --- a/src/settingsuserdefinedinput.cpp +++ b/src/settingsuserdefinedinput.cpp @@ -164,17 +164,17 @@ namespace KBibTeX gridLayout->setColStretch( 0, 1 ); m_listFields = new TDEListView( this ); - m_listFields->setSorting( -1, FALSE ); + m_listFields->setSorting( -1, false ); m_listFields->addColumn( i18n( "Name" ) ); - m_listFields->header()->setClickEnabled( FALSE ); + m_listFields->header()->setClickEnabled( false ); m_listFields->addColumn( i18n( "Label" ) ); - m_listFields->header()->setClickEnabled( FALSE ); + m_listFields->header()->setClickEnabled( false ); m_listFields->addColumn( i18n( "Type" ) ); - m_listFields->header()->setClickEnabled( FALSE ); - m_listFields->header()->setClickEnabled( FALSE ); + m_listFields->header()->setClickEnabled( false ); + m_listFields->header()->setClickEnabled( false ); m_listFields->setFullWidth( true ); m_listFields->setMinimumWidth( 128 ); - m_listFields->setAllColumnsShowFocus( TRUE ); + m_listFields->setAllColumnsShowFocus( true ); gridLayout->addMultiCellWidget( m_listFields, 0, 5, 0, 0 ); m_buttonNewField = new KPushButton( i18n( "user-defined input", "New" ), this ); @@ -189,25 +189,25 @@ namespace KBibTeX m_buttonMoveUpField = new KPushButton( i18n( "user-defined input", "Up" ), this ); m_buttonMoveUpField->setIconSet( TQIconSet( SmallIcon( "go-up" ) ) ); gridLayout->addWidget( m_buttonMoveUpField, 3, 1 ); - connect( m_buttonMoveUpField, SIGNAL( clicked() ), this, SLOT( slotMoveUpField() ) ); + connect( m_buttonMoveUpField, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveUpField() ) ); m_buttonMoveDownField = new KPushButton( i18n( "user-defined input", "Down" ), this ); m_buttonMoveDownField->setIconSet( TQIconSet( SmallIcon( "go-down" ) ) ); gridLayout->addWidget( m_buttonMoveDownField, 4, 1 ); - connect( m_buttonMoveDownField, SIGNAL( clicked() ), this, SLOT( slotMoveDownField() ) ); + connect( m_buttonMoveDownField, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveDownField() ) ); - connect( m_buttonNewField, SIGNAL( clicked() ), this, SLOT( slotNewField() ) ); - connect( m_buttonEditField, SIGNAL( clicked() ), this, SLOT( slotEditField() ) ); - connect( m_buttonDeleteField, SIGNAL( clicked() ), this, SLOT( slotDeleteField() ) ); - connect( m_listFields, SIGNAL( selectionChanged() ), this, SLOT( updateGUI() ) ); - connect( m_listFields, SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), this, SLOT( slotEditField() ) ); - connect( m_listFields, SIGNAL( currentChanged( TQListViewItem * ) ), this, SLOT( updateGUI() ) ); + connect( m_buttonNewField, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotNewField() ) ); + connect( m_buttonEditField, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEditField() ) ); + connect( m_buttonDeleteField, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDeleteField() ) ); + connect( m_listFields, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( updateGUI() ) ); + connect( m_listFields, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), this, TQ_SLOT( slotEditField() ) ); + connect( m_listFields, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQ_SLOT( updateGUI() ) ); updateGUI(); } void SettingsUserDefinedInput::fieldDialog( TQListViewItem * item ) { - fieldDlg = new KDialogBase( this, "fieldDialog", TRUE, item == NULL ? i18n( "New Field" ) : i18n( "Edit Field" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, TRUE ); + fieldDlg = new KDialogBase( this, "fieldDialog", true, item == NULL ? i18n( "New Field" ) : i18n( "Edit Field" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ); TQWidget *container = new TQWidget( fieldDlg, "container" ); TQGridLayout *layout = new TQGridLayout( container, 3, 2, 0, KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n( "Name:" ), container ); @@ -223,7 +223,7 @@ namespace KBibTeX m_lineEditLabel->setMinimumWidth( 384 ); label = new TQLabel( i18n( "Input Type:" ), container ); layout->addWidget( label, 2, 0 ); - KComboBox *comboBoxInputType = new KComboBox( FALSE, container ); + KComboBox *comboBoxInputType = new KComboBox( false, container ); layout->addWidget( comboBoxInputType, 2, 1 ); label->setBuddy( comboBoxInputType ); comboBoxInputType->insertItem( i18n( "Single line" ) ); @@ -241,8 +241,8 @@ namespace KBibTeX else fieldDlg->enableButton( KDialogBase::Ok, false ); - connect( m_lineEditName, SIGNAL( textChanged( const TQString & ) ), this, SLOT( updateDialogGUI() ) ); - connect( m_lineEditLabel, SIGNAL( textChanged( const TQString & ) ), this, SLOT( updateDialogGUI() ) ); + connect( m_lineEditName, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( updateDialogGUI() ) ); + connect( m_lineEditLabel, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( updateDialogGUI() ) ); if ( fieldDlg->exec() == TQDialog::Accepted ) { if ( item == NULL ) diff --git a/src/settingsuserdefinedinput.h b/src/settingsuserdefinedinput.h index 10e7239..05f5e4f 100644 --- a/src/settingsuserdefinedinput.h +++ b/src/settingsuserdefinedinput.h @@ -34,7 +34,7 @@ namespace KBibTeX */ class SettingsUserDefinedInput : public TQWidget { - Q_OBJECT + TQ_OBJECT public: SettingsUserDefinedInput( TQWidget *parent = 0, const char *name = 0 ); ~SettingsUserDefinedInput(); diff --git a/src/settingsz3950.cpp b/src/settingsz3950.cpp index e1f6baa..4f693a8 100644 --- a/src/settingsz3950.cpp +++ b/src/settingsz3950.cpp @@ -149,8 +149,8 @@ namespace KBibTeX KDialogBase *dlg = new KDialogBase( parent, "SettingsZ3950Edit", true, i18n( "Edit Z39.50 Server" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, false ); SettingsZ3950Edit *edit = new SettingsZ3950Edit( id, server, dlg, "SettingsZ3950Edit" ); dlg->setMainWidget( edit ); - connect( dlg, SIGNAL( apply() ), edit, SLOT( slotApply() ) ); - connect( dlg, SIGNAL( okClicked() ), edit, SLOT( slotApply() ) ); + connect( dlg, TQ_SIGNAL( apply() ), edit, TQ_SLOT( slotApply() ) ); + connect( dlg, TQ_SIGNAL( okClicked() ), edit, TQ_SLOT( slotApply() ) ); return dlg->exec(); } @@ -217,8 +217,8 @@ namespace KBibTeX server.port = 2100; ServerListViewItem * item = new ServerListViewItem( m_listServers, "", server, true ); item->setPixmap( 0, SmallIcon( "server" ) ); - m_listServers->setSelected( item, TRUE ); - TQTimer::singleShot( 100, this, SLOT( slotEditServer() ) ); + m_listServers->setSelected( item, true ); + TQTimer::singleShot( 100, this, TQ_SLOT( slotEditServer() ) ); } void SettingsZ3950::slotEditServer() @@ -320,42 +320,42 @@ namespace KBibTeX gridLayout->setColStretch( 0, 1 ); m_listServers = new TDEListView( this ); - m_listServers->setSorting( -1, FALSE ); + m_listServers->setSorting( -1, false ); m_listServers->addColumn( i18n( "z3950 server", "Name" ) ); m_listServers->addColumn( i18n( "z3950 server", "Database" ) ); - m_listServers->header()->setClickEnabled( FALSE ); + m_listServers->header()->setClickEnabled( false ); m_listServers->setFullWidth( true ); m_listServers->setAllColumnsShowFocus( true ); gridLayout->addMultiCellWidget( m_listServers, 0, 7, 0, 0 ); - connect( m_listServers, SIGNAL( selectionChanged() ), this, SLOT( updateGUI() ) ); - connect( m_listServers, SIGNAL( currentChanged( TQListViewItem * ) ), this, SLOT( updateGUI() ) ); - connect( m_listServers, SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), this, SLOT( slotEditServer() ) ); + connect( m_listServers, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( updateGUI() ) ); + connect( m_listServers, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQ_SLOT( updateGUI() ) ); + connect( m_listServers, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint &, int ) ), this, TQ_SLOT( slotEditServer() ) ); m_buttonNewServer = new KPushButton( i18n( "z3950 server", "New" ), this ); m_buttonNewServer->setIconSet( TQIconSet( SmallIcon( "add" ) ) ); gridLayout->addWidget( m_buttonNewServer, 0, 1 ); - connect( m_buttonNewServer, SIGNAL( clicked() ), this, SLOT( slotNewServer() ) ); + connect( m_buttonNewServer, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotNewServer() ) ); m_buttonEditServer = new KPushButton( i18n( "z3950 server", "Edit" ), this ); m_buttonEditServer->setIconSet( TQIconSet( SmallIcon( "edit" ) ) ); gridLayout->addWidget( m_buttonEditServer, 1, 1 ); - connect( m_buttonEditServer, SIGNAL( clicked() ), this, SLOT( slotEditServer() ) ); + connect( m_buttonEditServer, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEditServer() ) ); m_buttonDeleteServer = new KPushButton( i18n( "z3950 server", "Delete" ), this ); m_buttonDeleteServer->setIconSet( TQIconSet( SmallIcon( "edit-delete" ) ) ); gridLayout->addWidget( m_buttonDeleteServer, 2, 1 ); - connect( m_buttonDeleteServer, SIGNAL( clicked() ), this, SLOT( slotDeleteServer() ) ); + connect( m_buttonDeleteServer, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDeleteServer() ) ); m_buttonMoveUpServer = new KPushButton( i18n( "z3950 server", "Up" ), this ); m_buttonMoveUpServer->setIconSet( TQIconSet( SmallIcon( "go-up" ) ) ); gridLayout->addWidget( m_buttonMoveUpServer, 3, 1 ); - connect( m_buttonMoveUpServer, SIGNAL( clicked() ), this, SLOT( slotMoveUpServer() ) ); + connect( m_buttonMoveUpServer, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveUpServer() ) ); m_buttonMoveDownServer = new KPushButton( i18n( "z3950 server", "Down" ), this ); m_buttonMoveDownServer->setIconSet( TQIconSet( SmallIcon( "go-down" ) ) ); gridLayout->addWidget( m_buttonMoveDownServer, 4, 1 ); - connect( m_buttonMoveDownServer, SIGNAL( clicked() ), this, SLOT( slotMoveDownServer() ) ); + connect( m_buttonMoveDownServer, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveDownServer() ) ); m_buttonResetToDefault = new KPushButton( i18n( "z3950 server", "Reset" ), this ); m_buttonResetToDefault->setIconSet( TQIconSet( SmallIcon( "reload" ) ) ); gridLayout->addWidget( m_buttonResetToDefault, 6, 1 ); - connect( m_buttonResetToDefault, SIGNAL( clicked() ), this, SLOT( slotResetToDefault() ) ); + connect( m_buttonResetToDefault, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotResetToDefault() ) ); } } diff --git a/src/settingsz3950.h b/src/settingsz3950.h index 5bfa2cc..b80a0f6 100644 --- a/src/settingsz3950.h +++ b/src/settingsz3950.h @@ -57,7 +57,7 @@ namespace KBibTeX */ class SettingsZ3950Edit : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ~SettingsZ3950Edit(); @@ -89,7 +89,7 @@ namespace KBibTeX */ class SettingsZ3950 : public TQWidget { - Q_OBJECT + TQ_OBJECT public: SettingsZ3950( TQWidget *parent = 0, const char *name = 0 ); ~SettingsZ3950(); diff --git a/src/sidebar.cpp b/src/sidebar.cpp index cf45678..f183596 100644 --- a/src/sidebar.cpp +++ b/src/sidebar.cpp @@ -71,7 +71,7 @@ namespace KBibTeX m_bibtexFile = bibtexFile; TQApplication::setOverrideCursor( TQt::waitCursor ); - setEnabled( FALSE ); + setEnabled( false ); BibTeX::EntryField::FieldType fieldType = m_buttonToggleShowAll->isOn() ? ( BibTeX::EntryField::FieldType )( m_listTypeList->currentItem() + ( int ) BibTeX::EntryField::ftAbstract ) : importantFields[ m_listTypeList->currentItem()]; @@ -87,7 +87,7 @@ namespace KBibTeX } } - setEnabled( TRUE ); + setEnabled( true ); TQApplication::restoreOverrideCursor(); } @@ -109,10 +109,10 @@ namespace KBibTeX layout->addWidget( m_buttonToggleShowAll, 0, 0 ); TQIconSet showAllPixmap = TDEGlobal::iconLoader() ->loadIconSet( "taskbar", TDEIcon::Small ); m_buttonToggleShowAll->setIconSet( showAllPixmap ); - m_buttonToggleShowAll->setToggleButton( TRUE ); + m_buttonToggleShowAll->setToggleButton( true ); TQToolTip::add( m_buttonToggleShowAll, i18n( "Toggle between showing all fields or only important fields" ) ); - m_listTypeList = new TQComboBox( FALSE, this ); + m_listTypeList = new TQComboBox( false, this ); layout->addWidget( m_listTypeList, 0, 1 ); TQToolTip::add( m_listTypeList, i18n( "Filter this sidebar for a given field" ) ); @@ -120,28 +120,28 @@ namespace KBibTeX layout->addWidget( m_buttonToggleMultiSelect, 0, 2 ); showAllPixmap = TDEGlobal::iconLoader() ->loadIconSet( "planner", TDEIcon::Small ); m_buttonToggleMultiSelect->setIconSet( showAllPixmap ); - m_buttonToggleMultiSelect->setToggleButton( TRUE ); + m_buttonToggleMultiSelect->setToggleButton( true ); TQToolTip::add( m_buttonToggleMultiSelect, i18n( "Toggle between selecting only one item or multiple items (AND-connected in search)" ) ); m_listAvailableItems = new TDEListView( this ); m_listAvailableItems->addColumn( i18n( "#" ) ); m_listAvailableItems->addColumn( i18n( "Items" ) ); - m_listAvailableItems->setAllColumnsShowFocus( TRUE ); + m_listAvailableItems->setAllColumnsShowFocus( true ); m_listAvailableItems->setFullWidth( true ); m_listAvailableItems->setSorting( 1 ); layout->addMultiCellWidget( m_listAvailableItems, 1, 1, 0, 2 ); m_popupMenu = new TDEPopupMenu( m_listAvailableItems ); - m_popupMenu->insertItem( i18n( "Rename all occurrences" ), this, SLOT( startRenaming() ) ); + m_popupMenu->insertItem( i18n( "Rename all occurrences" ), this, TQ_SLOT( startRenaming() ) ); - connect( m_listAvailableItems, SIGNAL( selectionChanged() ), this, SLOT( prepareSearch() ) ); - connect( m_listTypeList, SIGNAL( activated( int ) ), this, SLOT( refreshLists() ) ); - connect( m_buttonToggleShowAll, SIGNAL( toggled( bool ) ), this, SLOT( toggleShowAll( bool ) ) ); - connect( m_buttonToggleMultiSelect, SIGNAL( toggled( bool ) ), this, SLOT( toggleMultiSelect( bool ) ) ); - connect( m_listAvailableItems, SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ), this, SLOT( showContextMenu( TQListViewItem*, const TQPoint& ) ) ); - connect( m_listAvailableItems, SIGNAL( itemRenamed( TQListViewItem*, int, const TQString& ) ), this, SLOT( endRenaming( TQListViewItem*, int, const TQString& ) ) ); + connect( m_listAvailableItems, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( prepareSearch() ) ); + connect( m_listTypeList, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( refreshLists() ) ); + connect( m_buttonToggleShowAll, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( toggleShowAll( bool ) ) ); + connect( m_buttonToggleMultiSelect, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( toggleMultiSelect( bool ) ) ); + connect( m_listAvailableItems, TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ), this, TQ_SLOT( showContextMenu( TQListViewItem*, const TQPoint& ) ) ); + connect( m_listAvailableItems, TQ_SIGNAL( itemRenamed( TQListViewItem*, int, const TQString& ) ), this, TQ_SLOT( endRenaming( TQListViewItem*, int, const TQString& ) ) ); - toggleShowAll( FALSE ); + toggleShowAll( false ); } void SideBar::setReadOnly( bool isReadOnly ) @@ -210,14 +210,14 @@ namespace KBibTeX if ( item != NULL ) { m_oldText = item->text( 1 ); - item->setRenameEnabled( 1, TRUE ); + item->setRenameEnabled( 1, true ); item->startRename( 1 ); } } void SideBar::endRenaming( TQListViewItem * item, int , const TQString & text ) { - item->setRenameEnabled( 1, FALSE ); + item->setRenameEnabled( 1, false ); BibTeX::EntryField::FieldType fieldType = m_buttonToggleShowAll->isOn() ? ( BibTeX::EntryField::FieldType )( m_listTypeList->currentItem() + ( int ) BibTeX::EntryField::ftAbstract ) : importantFields[ m_listTypeList->currentItem()]; m_bibtexFile->replaceValue( m_oldText, text, fieldType ); @@ -237,7 +237,7 @@ namespace KBibTeX { if ( column == 0 ) { - bool ok = FALSE; + bool ok = false; int ownValue = text( 0 ).toInt( &ok ); if ( ok ) { diff --git a/src/sidebar.h b/src/sidebar.h index c945aef..ee0f4e0 100644 --- a/src/sidebar.h +++ b/src/sidebar.h @@ -36,7 +36,7 @@ namespace KBibTeX { class SideBar : public TQWidget { - Q_OBJECT + TQ_OBJECT public: SideBar( bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); ~SideBar(); diff --git a/src/value.cpp b/src/value.cpp index 8499f4a..a69a431 100644 --- a/src/value.cpp +++ b/src/value.cpp @@ -117,7 +117,7 @@ namespace BibTeX void KeywordContainer::append( const TQString& text ) { - bool contains = FALSE; + bool contains = false; for ( TQValueList<Keyword*>::ConstIterator it = keywords.begin(); !contains && it != keywords.end(); ++it ) contains = TQString::compare(( *it )->text(), text ) == 0; @@ -128,7 +128,7 @@ namespace BibTeX void KeywordContainer::remove( const TQString& text ) { - bool contains = FALSE; + bool contains = false; for ( TQValueList<Keyword*>::Iterator it = keywords.begin(); !contains && it != keywords.end(); ++it ) if ( TQString::compare(( *it )->text(), text ) == 0 ) { @@ -148,7 +148,7 @@ namespace BibTeX splitRegExp = TQRegExp( "\\s*,\\s*" ); keywords.clear(); - TQStringList keywordList = TQStringList::split( splitRegExp, text, FALSE ); + TQStringList keywordList = TQStringList::split( splitRegExp, text, false ); for ( TQStringList::ConstIterator it = keywordList.begin(); it != keywordList.end(); ++it ) keywords.append( new Keyword( *it ) ); } @@ -252,11 +252,11 @@ namespace BibTeX } else { - bool inLastName = TRUE; + bool inLastName = true; for ( unsigned int i = 0; i < segments.count();++i ) { if ( segments[i] == "," ) - inLastName = FALSE; + inLastName = false; else if ( inLastName ) { if ( !m_lastName.isEmpty() ) m_lastName.append( " " ); @@ -298,7 +298,7 @@ namespace BibTeX bool Person::splitName( const TQString& text, TQStringList& segments ) { int bracketCounter = 0; - bool result = FALSE; + bool result = false; TQString buffer = ""; for ( unsigned int pos = 0; pos < text.length(); ++pos ) @@ -324,7 +324,7 @@ namespace BibTeX buffer = ""; } segments.append( "," ); - result = TRUE; + result = true; } else buffer.append( text[pos] ); @@ -364,14 +364,14 @@ namespace BibTeX TQString PersonContainer::text() const { TQString result; - bool first = TRUE; + bool first = true; for ( TQValueList<Person*>::ConstIterator it = persons.begin(); it != persons.end(); ++it ) { if ( !first ) result.append( " and " ); else - first = FALSE; + first = false; result.append(( *it )->text() ); } diff --git a/src/value.h b/src/value.h index a46ff0d..b47ed82 100644 --- a/src/value.h +++ b/src/value.h @@ -85,8 +85,8 @@ namespace BibTeX class Person: public ValueTextInterface { public: - Person( const TQString& text, bool firstNameFirst = FALSE ); - Person( const TQString& firstName, const TQString& lastName, bool firstNameFirst = FALSE ); + Person( const TQString& text, bool firstNameFirst = false ); + Person( const TQString& firstName, const TQString& lastName, bool firstNameFirst = false ); Person *clone(); void setText( const TQString& text ); @@ -107,8 +107,8 @@ namespace BibTeX class PersonContainer: public ValueItem { public: - PersonContainer( bool firstNameFirst = FALSE ); - PersonContainer( const TQString& text, bool firstNameFirst = FALSE ); + PersonContainer( bool firstNameFirst = false ); + PersonContainer( const TQString& text, bool firstNameFirst = false ); ValueItem *clone(); void setText( const TQString& text ); diff --git a/src/valuewidget.cpp b/src/valuewidget.cpp index d997cdf..d27fcb0 100644 --- a/src/valuewidget.cpp +++ b/src/valuewidget.cpp @@ -36,11 +36,11 @@ namespace KBibTeX TQDialog::DialogCode ValueWidget::execute( const TQString& title, BibTeX::EntryField::FieldType fieldType, BibTeX::Value *value, bool isReadOnly, TQWidget *parent, const char *name ) { - KDialogBase * dlg = new KDialogBase( parent, name, TRUE, TQString( i18n( "Edit field '%1'" ) ).arg( title ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, TRUE ); + KDialogBase * dlg = new KDialogBase( parent, name, true, TQString( i18n( "Edit field '%1'" ) ).arg( title ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ); ValueWidget* valueWidget = new ValueWidget( fieldType, value, isReadOnly, dlg, "kbibtexvaluewidget" ); dlg->setMainWidget( valueWidget ); - connect( dlg, SIGNAL( okClicked() ), valueWidget, SLOT( apply() ) ); + connect( dlg, TQ_SIGNAL( okClicked() ), valueWidget, TQ_SLOT( apply() ) ); TQDialog::DialogCode result = ( TQDialog::DialogCode )dlg->exec(); if ( isReadOnly ) result = TQDialog::Rejected; @@ -137,7 +137,7 @@ namespace KBibTeX TQCheckListItem * item = new TQCheckListItem( m_listViewValue, m_listViewValue->lastItem(), TQString( i18n( "May only contain ASCII characters, in case of doubt keep English form", "NewValue%1" ) ).arg( m_newValueCounter++ ), TQCheckListItem::CheckBox ); item->setState( TQCheckListItem::Off ); item->setRenameEnabled( 0, !m_isReadOnly ); - m_listViewValue->setSelected( item, TRUE ); + m_listViewValue->setSelected( item, true ); slotEdit(); } @@ -209,45 +209,45 @@ namespace KBibTeX layout->addMultiCellWidget( m_listViewValue, 1, 7, 0, 0 ); m_listViewValue->setDefaultRenameAction( m_isReadOnly ? TQListView::Reject : TQListView::Accept ); m_listViewValue->addColumn( i18n( "Text" ) ); - m_listViewValue->setSorting( -1, TRUE ); - m_listViewValue->setAllColumnsShowFocus( TRUE ); - m_listViewValue->header() ->setClickEnabled( FALSE ); - m_listViewValue->header() ->setStretchEnabled( TRUE, 0 ); + m_listViewValue->setSorting( -1, true ); + m_listViewValue->setAllColumnsShowFocus( true ); + m_listViewValue->header() ->setClickEnabled( false ); + m_listViewValue->header() ->setStretchEnabled( true, 0 ); m_listViewValue->setEnabled( !m_isReadOnly ); - connect( m_listViewValue, SIGNAL( selectionChanged() ), this, SLOT( updateGUI() ) ); - connect( m_listViewValue, SIGNAL( clicked( TQListViewItem * ) ), this, SLOT( updateGUI() ) ); - connect( m_listViewValue, SIGNAL( currentChanged( TQListViewItem * ) ), this, SLOT( updateGUI() ) ); + connect( m_listViewValue, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( updateGUI() ) ); + connect( m_listViewValue, TQ_SIGNAL( clicked( TQListViewItem * ) ), this, TQ_SLOT( updateGUI() ) ); + connect( m_listViewValue, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQ_SLOT( updateGUI() ) ); m_pushButtonAdd = new TQPushButton( i18n( "Add" ), this ); layout->addWidget( m_pushButtonAdd, 1, 1 ); m_pushButtonAdd->setIconSet( TQIconSet( SmallIcon( "add" ) ) ); m_pushButtonAdd->setEnabled( !m_isReadOnly ); - connect( m_pushButtonAdd, SIGNAL( clicked() ), this, SLOT( slotAdd() ) ); + connect( m_pushButtonAdd, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAdd() ) ); m_pushButtonEdit = new TQPushButton( i18n( "Edit" ), this ); layout->addWidget( m_pushButtonEdit, 2, 1 ); m_pushButtonEdit->setIconSet( TQIconSet( SmallIcon( "edit" ) ) ); - connect( m_pushButtonEdit, SIGNAL( clicked() ), this, SLOT( slotEdit() ) ); + connect( m_pushButtonEdit, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEdit() ) ); m_pushButtonToggle = new TQPushButton( i18n( "Toggle" ), this ); layout->addWidget( m_pushButtonToggle, 3, 1 ); m_pushButtonToggle->setIconSet( TQIconSet( SmallIcon( "flag" ) ) ); - connect( m_pushButtonToggle, SIGNAL( clicked() ), this, SLOT( slotToggle() ) ); + connect( m_pushButtonToggle, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotToggle() ) ); m_pushButtonDelete = new TQPushButton( i18n( "Delete" ), this ); layout->addWidget( m_pushButtonDelete, 4, 1 ); m_pushButtonDelete->setIconSet( TQIconSet( SmallIcon( "edit-delete" ) ) ); - connect( m_pushButtonDelete, SIGNAL( clicked() ), this, SLOT( slotDelete() ) ); + connect( m_pushButtonDelete, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDelete() ) ); m_pushButtonUp = new TQPushButton( i18n( "Up" ), this ); layout->addWidget( m_pushButtonUp, 5, 1 ); m_pushButtonUp->setIconSet( TQIconSet( SmallIcon( "go-up" ) ) ); - connect( m_pushButtonUp, SIGNAL( clicked() ), this, SLOT( slotUp() ) ); + connect( m_pushButtonUp, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotUp() ) ); m_pushButtonDown = new TQPushButton( i18n( "Down" ), this ); layout->addWidget( m_pushButtonDown, 6, 1 ); m_pushButtonDown->setIconSet( TQIconSet( SmallIcon( "go-down" ) ) ); - connect( m_pushButtonDown, SIGNAL( clicked() ), this, SLOT( slotDown() ) ); + connect( m_pushButtonDown, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDown() ) ); } } diff --git a/src/valuewidget.h b/src/valuewidget.h index d3661fe..9d9f9e0 100644 --- a/src/valuewidget.h +++ b/src/valuewidget.h @@ -37,7 +37,7 @@ namespace KBibTeX */ class ValueWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: static TQDialog::DialogCode execute( const TQString& title, BibTeX::EntryField::FieldType fieldType, BibTeX::Value *value, bool isReadOnly, TQWidget *parent = 0, const char *name = 0 ); diff --git a/src/webquery.cpp b/src/webquery.cpp index 3bb4dc9..ca371a2 100644 --- a/src/webquery.cpp +++ b/src/webquery.cpp @@ -97,8 +97,8 @@ namespace KBibTeX hLayout->addWidget( lineEditQuery ); label->setBuddy( lineEditQuery ); hLayout->addSpacing( KDialog::spacingHint() * 2 ); - connect( clearSearchText, SIGNAL( clicked() ), lineEditQuery, SLOT( clear() ) ); - connect( lineEditQuery, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChanged( const TQString& ) ) ); + connect( clearSearchText, TQ_SIGNAL( clicked() ), lineEditQuery, TQ_SLOT( clear() ) ); + connect( lineEditQuery, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotTextChanged( const TQString& ) ) ); hLayout->setStretchFactor( lineEditQuery, 4 ); TDECompletion *completionQuery = lineEditQuery->completionObject(); @@ -111,8 +111,8 @@ namespace KBibTeX vLayout->addStretch( 0 ); - connect( lineEditQuery, SIGNAL( returnPressed() ), this, SIGNAL( startSearch() ) ); - connect( lineEditQuery, SIGNAL( returnPressed( const TQString& ) ), completionQuery, SLOT( addItem( const TQString& ) ) ); + connect( lineEditQuery, TQ_SIGNAL( returnPressed() ), this, TQ_SIGNAL( startSearch() ) ); + connect( lineEditQuery, TQ_SIGNAL( returnPressed( const TQString& ) ), completionQuery, TQ_SLOT( addItem( const TQString& ) ) ); } void WebQueryWidget::slotTextChanged( const TQString& text ) @@ -124,7 +124,7 @@ namespace KBibTeX { bool doEnable = !text.stripWhiteSpace().replace( '$', "" ).isEmpty(); if ( delayed && doEnable ) - TQTimer::singleShot( 100, this, SLOT( slotEnableSearchTrue() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( slotEnableSearchTrue() ) ); else if ( !delayed ) emit enableSearch( doEnable ); } @@ -155,7 +155,7 @@ namespace KBibTeX m_progressDialog->setAutoClose( true ); m_progressDialog->setMinimumDuration( 10 ); m_progressDialog->setEnabled( true ); - connect( m_progressDialog, SIGNAL( cancelClicked() ), this, SLOT( slotCancelQuery() ) ); + connect( m_progressDialog, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( slotCancelQuery() ) ); } void WebQuery::cancelQuery() @@ -216,10 +216,10 @@ namespace KBibTeX m_incomingData = ""; m_currentJobTotalSize = -1; m_currentJob = TDEIO::get( url, false, false ); - connect( m_currentJob, SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), this, SLOT( slotSetJobTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); - connect( m_currentJob, SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), this, SLOT( slotSetJobProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); - connect( m_currentJob, SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), this, SLOT( slotJobData( TDEIO::Job*, const TQByteArray & ) ) ); - connect( m_currentJob, SIGNAL( result( TDEIO::Job* ) ), this, SLOT( slotJobFinished( TDEIO::Job* ) ) ); + connect( m_currentJob, TQ_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), this, TQ_SLOT( slotSetJobTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( m_currentJob, TQ_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), this, TQ_SLOT( slotSetJobProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( m_currentJob, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), this, TQ_SLOT( slotJobData( TDEIO::Job*, const TQByteArray & ) ) ); + connect( m_currentJob, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotJobFinished( TDEIO::Job* ) ) ); tqApp->eventLoop()->enterLoop(); @@ -232,8 +232,8 @@ namespace KBibTeX if ( data == TQString::null ) return NULL; - BibTeX::FileImporterBibTeX importer( FALSE ); - importer.setIgnoreComments( TRUE ); + BibTeX::FileImporterBibTeX importer( false ); + importer.setIgnoreComments( true ); TQBuffer buffer; buffer.open( IO_WriteOnly ); @@ -296,14 +296,14 @@ namespace KBibTeX WebQueryWizard::~WebQueryWizard() { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup( "WebQueryWizard" ); saveWindowSize( config ); } void WebQueryWizard::showEvent( TQShowEvent * ) { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup( "WebQueryWizard" ); restoreWindowSize( config ); } @@ -314,7 +314,7 @@ namespace KBibTeX WebQueryWizard *wiz = new WebQueryWizard( dlg, "WebQueryWizard" ); dlg->setButtonOK( KGuiItem( i18n( "&Import" ), "import", i18n( "Import selected items" ) ) ); dlg->setMainWidget( wiz ); - connect( wiz, SIGNAL( changeButtonOK( bool ) ), dlg, SLOT( enableButtonOK( bool ) ) ); + connect( wiz, TQ_SIGNAL( changeButtonOK( bool ) ), dlg, TQ_SLOT( enableButtonOK( bool ) ) ); dlg->enableButtonOK( false ); results.clear(); @@ -345,7 +345,7 @@ namespace KBibTeX if ( rlvi != NULL ) { BibTeX::Entry *entry = rlvi->entry(); - KBibTeX::EntryWidget::execute( entry, NULL, TRUE, FALSE ); + KBibTeX::EntryWidget::execute( entry, NULL, true, false ); } } @@ -379,12 +379,12 @@ namespace KBibTeX int index = m_comboBoxEngines->currentItem(); - setEnabled( FALSE ); - m_dlg->enableButtonCancel( FALSE ); + setEnabled( false ); + m_dlg->enableButtonCancel( false ); TQApplication::setOverrideCursor( TQt::waitCursor ); m_listViewResults->clear(); - connect( m_webQueries[index], SIGNAL( foundEntry( BibTeX::Entry*, bool ) ), this, SLOT( addHit( BibTeX::Entry*, bool ) ) ); - connect( m_webQueries[index], SIGNAL( endSearch( WebQuery::Status ) ), this, SLOT( endSearch( WebQuery::Status ) ) ); + connect( m_webQueries[index], TQ_SIGNAL( foundEntry( BibTeX::Entry*, bool ) ), this, TQ_SLOT( addHit( BibTeX::Entry*, bool ) ) ); + connect( m_webQueries[index], TQ_SIGNAL( endSearch( WebQuery::Status ) ), this, TQ_SLOT( endSearch( WebQuery::Status ) ) ); m_webQueries[index]->query(); } @@ -392,10 +392,10 @@ namespace KBibTeX void WebQueryWizard::endSearch( WebQuery::Status status ) { int index = m_comboBoxEngines->currentItem(); - disconnect( m_webQueries[index], SIGNAL( foundEntry( BibTeX::Entry*, bool ) ), this, SLOT( addHit( BibTeX::Entry*, bool ) ) ); - disconnect( m_webQueries[index], SIGNAL( endSearch( WebQuery::Status ) ), this, SLOT( endSearch( WebQuery::Status ) ) ); - setEnabled( TRUE ); - m_dlg->enableButtonCancel( TRUE ); + disconnect( m_webQueries[index], TQ_SIGNAL( foundEntry( BibTeX::Entry*, bool ) ), this, TQ_SLOT( addHit( BibTeX::Entry*, bool ) ) ); + disconnect( m_webQueries[index], TQ_SIGNAL( endSearch( WebQuery::Status ) ), this, TQ_SLOT( endSearch( WebQuery::Status ) ) ); + setEnabled( true ); + m_dlg->enableButtonCancel( true ); importEnableChanging(); TQApplication::restoreOverrideCursor(); if ( status == WebQuery::statusInsufficientPermissions ) @@ -430,10 +430,10 @@ namespace KBibTeX TQLabel *label = new TQLabel( i18n( "&Engine:" ), this ); layout->addWidget( label, 0, 0 ); - m_comboBoxEngines = new KComboBox( FALSE, this ); + m_comboBoxEngines = new KComboBox( false, this ); label->setBuddy( m_comboBoxEngines ); layout->addWidget( m_comboBoxEngines, 0, 1 ); - connect( m_comboBoxEngines, SIGNAL( activated( int ) ), this, SLOT( otherEngineSelected( int ) ) ); + connect( m_comboBoxEngines, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( otherEngineSelected( int ) ) ); m_widgetStackQueries = new TQWidgetStack( this ); layout->addMultiCellWidget( m_widgetStackQueries, 1, 2, 0, 2 ); @@ -442,7 +442,7 @@ namespace KBibTeX m_pushButtonSearch = new KPushButton( i18n( "&Search" ), this ); layout->addWidget( m_pushButtonSearch, 0, 3 ); m_pushButtonSearch->setIconSet( TQIconSet( SmallIcon( "edit-find" ) ) ); - m_pushButtonSearch->setEnabled( FALSE ); + m_pushButtonSearch->setEnabled( false ); m_listViewResults = new TDEListView( this ); m_listViewResults->addColumn( i18n( "Year" ), 64 ); @@ -453,12 +453,12 @@ namespace KBibTeX else m_listViewResults->setFont( TDEGlobalSettings::generalFont() ); m_listViewResults->header() ->setFont( TDEGlobalSettings::generalFont() ); - m_listViewResults->setAllColumnsShowFocus( TRUE ); + m_listViewResults->setAllColumnsShowFocus( true ); m_listViewResults->setFullWidth( true ); m_listViewResults->setSelectionMode( TQListView::Extended ); layout->addMultiCellWidget( m_listViewResults, 3, 3, 0, 3 ); - connect( m_listViewResults, SIGNAL( executed( TQListViewItem* ) ), this, SLOT( previewEntry( TQListViewItem* ) ) ); - connect( m_listViewResults, SIGNAL( returnPressed( TQListViewItem* ) ), this, SLOT( previewEntry( TQListViewItem* ) ) ); + connect( m_listViewResults, TQ_SIGNAL( executed( TQListViewItem* ) ), this, TQ_SLOT( previewEntry( TQListViewItem* ) ) ); + connect( m_listViewResults, TQ_SIGNAL( returnPressed( TQListViewItem* ) ), this, TQ_SLOT( previewEntry( TQListViewItem* ) ) ); TQHBoxLayout *horizontalLayout = new TQHBoxLayout(); layout->addMultiCellLayout( horizontalLayout, 4, 4, 0, 3 ); @@ -469,11 +469,11 @@ namespace KBibTeX m_checkBoxImportAll->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); horizontalLayout->addWidget( m_checkBoxImportAll ); - connect( m_disclaimerLabel, SIGNAL( leftClickedURL( const TQString& ) ), this, SLOT( openURL( const TQString& ) ) ); - connect( m_listViewResults, SIGNAL( selectionChanged( ) ), this, SLOT( importEnableChanging( ) ) ); - connect( m_listViewResults, SIGNAL( clicked( TQListViewItem* ) ), this, SLOT( importEnableChanging( ) ) ); - connect( m_checkBoxImportAll, SIGNAL( toggled( bool ) ), this, SLOT( importEnableChanging( ) ) ); - connect( m_pushButtonSearch, SIGNAL( clicked() ), this, SLOT( startSearch() ) ); + connect( m_disclaimerLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ), this, TQ_SLOT( openURL( const TQString& ) ) ); + connect( m_listViewResults, TQ_SIGNAL( selectionChanged( ) ), this, TQ_SLOT( importEnableChanging( ) ) ); + connect( m_listViewResults, TQ_SIGNAL( clicked( TQListViewItem* ) ), this, TQ_SLOT( importEnableChanging( ) ) ); + connect( m_checkBoxImportAll, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( importEnableChanging( ) ) ); + connect( m_pushButtonSearch, TQ_SIGNAL( clicked() ), this, TQ_SLOT( startSearch() ) ); } void WebQueryWizard::setupQueries() @@ -515,8 +515,8 @@ namespace KBibTeX { m_comboBoxEngines->insertItem(( *it )->title() ); m_widgetStackQueries->addWidget(( *it )->widget() ); - connect(( *it )->widget(), SIGNAL( enableSearch( bool ) ), this, SLOT( enableSearch( bool ) ) ); - connect(( *it )->widget(), SIGNAL( startSearch() ), this, SLOT( startSearch() ) ); + connect(( *it )->widget(), TQ_SIGNAL( enableSearch( bool ) ), this, TQ_SLOT( enableSearch( bool ) ) ); + connect(( *it )->widget(), TQ_SIGNAL( startSearch() ), this, TQ_SLOT( startSearch() ) ); } } @@ -526,7 +526,7 @@ namespace KBibTeX int scnum = TQApplication::desktop()->screenNumber( parentWidget() ); TQRect desk = TQApplication::desktop()->screenGeometry( scnum ); int w, h; -#if defined Q_WS_X11 +#if defined TQ_WS_X11 // save maximalization as desktop size + 1 in that direction KWin::WindowInfo info = KWin::windowInfo( m_dlg->winId(), NET::WMState ); w = info.state() & NET::MaxHoriz ? desk.width() + 1 : m_dlg->width(); @@ -576,7 +576,7 @@ namespace KBibTeX } if ( !size.isEmpty() ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 int state = ( size.width() > desk.width() ? NET::MaxHoriz : 0 ) | ( size.height() > desk.height() ? NET::MaxVert : 0 ); if (( state & NET::Max ) == NET::Max ) diff --git a/src/webquery.h b/src/webquery.h index 372d05c..c4af9c4 100644 --- a/src/webquery.h +++ b/src/webquery.h @@ -46,7 +46,7 @@ namespace KBibTeX */ class WebQueryWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: WebQueryWidget( TQWidget *parent, const char *name = 0 ); virtual bool searchPossible(); @@ -74,7 +74,7 @@ namespace KBibTeX */ class WebQuery : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum Status { statusSuccess, statusError, statusAborted, statusInvalidQuery, statusInsufficientPermissions }; @@ -124,7 +124,7 @@ namespace KBibTeX class WebQueryWizard: public TQWidget { - Q_OBJECT + TQ_OBJECT public: ~WebQueryWizard(); diff --git a/src/webqueryamatex.h b/src/webqueryamatex.h index 8d37c29..293ff1b 100644 --- a/src/webqueryamatex.h +++ b/src/webqueryamatex.h @@ -29,7 +29,7 @@ namespace KBibTeX */ class WebQueryAmatexWidget : public WebQueryWidget { - Q_OBJECT + TQ_OBJECT public: WebQueryAmatexWidget( TQWidget *parent, const char *name = 0 ); }; @@ -39,7 +39,7 @@ namespace KBibTeX */ class WebQueryAmatex : public WebQuery { - Q_OBJECT + TQ_OBJECT public: WebQueryAmatex( TQWidget* parent ); virtual ~WebQueryAmatex(); diff --git a/src/webqueryarxiv.cpp b/src/webqueryarxiv.cpp index 89a35e0..48b526e 100644 --- a/src/webqueryarxiv.cpp +++ b/src/webqueryarxiv.cpp @@ -106,8 +106,8 @@ namespace KBibTeX m_reJour( "^([a-zA-Z. ]+)" ), m_reYear( "\\b((18|19|20)\\d{2})\\b" ), m_rePages( "\\b([1-9]\\d{0,2})\\s*[-]+\\s*([1-9]\\d{0,2})\\b" ) { - m_importer = new BibTeX::FileImporterBibTeX( FALSE ); - m_importer->setIgnoreComments( TRUE ); + m_importer = new BibTeX::FileImporterBibTeX( false ); + m_importer->setIgnoreComments( true ); m_widget = new WebQueryArXivWidget( parent ); } @@ -141,7 +141,7 @@ namespace KBibTeX { m_urls.clear(); // FIXME: The following code crashes KBibTeX: - // if ( m_currentJob != NULL ) m_currentJob->kill( FALSE ); + // if ( m_currentJob != NULL ) m_currentJob->kill( false ); } void WebQueryArXiv::query() @@ -169,9 +169,9 @@ namespace KBibTeX KURL url = KURL( TQString( "http://www.arxiv.org/find/all/1/all:+%2/0/1/0/all/0/1?per_page=%1" ).arg( m_numberOfResults ).arg( query.replace( "%", "%25" ).replace( "+", "%2B" ).replace( " ", "%20" ).replace( "#", "%23" ).replace( "&", "%26" ).replace( "?", "%3F" ) ) ); m_currentJobMutex.lock(); - TDEIO::Job *job = TDEIO::storedGet( url, FALSE, FALSE ); - connect( job, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( unlockJob( TDEIO::Job * ) ) ); - connect( job, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( arXivResult( TDEIO::Job * ) ) ); + TDEIO::Job *job = TDEIO::storedGet( url, false, false ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( unlockJob( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( arXivResult( TDEIO::Job * ) ) ); } void WebQueryArXiv::unlockJob( TDEIO::Job * ) @@ -226,9 +226,9 @@ namespace KBibTeX { m_aborted = false; m_currentJobMutex.lock(); - TDEIO::Job *job = TDEIO::storedGet( abstractURL, FALSE, FALSE ); - connect( job, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( unlockJob( TDEIO::Job * ) ) ); - connect( job, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( arXivAbstractResult( TDEIO::Job * ) ) ); + TDEIO::Job *job = TDEIO::storedGet( abstractURL, false, false ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( unlockJob( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( arXivAbstractResult( TDEIO::Job * ) ) ); } void WebQueryArXiv::arXivAbstractResult( TDEIO::Job *job ) @@ -311,7 +311,7 @@ namespace KBibTeX while (( p2 = result.find( "last revised", p + 1 ) ) >= 0 ) p = p2; p2 = result.find( TQRegExp( "\\d\\d\\d\\d" ), p ); - bool ok = FALSE; + bool ok = false; int year = result.mid( p2, 4 ).toInt( &ok ); if ( !ok ) year = 0; if ( year > 1000 ) @@ -533,7 +533,7 @@ namespace KBibTeX } } - if ( result.find( TQRegExp( "Ph\\.?D\\.? Thesis", FALSE ), 0 ) >= 0 ) + if ( result.find( TQRegExp( "Ph\\.?D\\.? Thesis", false ), 0 ) >= 0 ) entry->setEntryType( BibTeX::Entry::etPhDThesis ); field = new BibTeX::EntryField( BibTeX::EntryField::ftURL ); @@ -553,9 +553,9 @@ namespace KBibTeX KURL url = m_urls.first(); m_urls.remove( url ); m_currentJobMutex.lock(); - TDEIO::Job *job = TDEIO::storedGet( url, FALSE, FALSE ); - connect( job, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( unlockJob( TDEIO::Job * ) ) ); - connect( job, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( arXivAbstractResult( TDEIO::Job * ) ) ); + TDEIO::Job *job = TDEIO::storedGet( url, false, false ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( unlockJob( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( arXivAbstractResult( TDEIO::Job * ) ) ); } else setEndSearch( WebQuery::statusSuccess ); diff --git a/src/webqueryarxiv.h b/src/webqueryarxiv.h index 13d2a87..c536c49 100644 --- a/src/webqueryarxiv.h +++ b/src/webqueryarxiv.h @@ -38,7 +38,7 @@ namespace KBibTeX */ class WebQueryArXivWidget : public WebQueryWidget { - Q_OBJECT + TQ_OBJECT public: WebQueryArXivWidget( TQWidget *parent, const char *name = 0 ); }; @@ -48,7 +48,7 @@ namespace KBibTeX */ class WebQueryArXiv : public WebQuery { - Q_OBJECT + TQ_OBJECT public: WebQueryArXiv( TQWidget* parent ); virtual ~WebQueryArXiv(); diff --git a/src/webquerybibsonomy.h b/src/webquerybibsonomy.h index cbea036..0415661 100644 --- a/src/webquerybibsonomy.h +++ b/src/webquerybibsonomy.h @@ -29,7 +29,7 @@ namespace KBibTeX */ class WebQueryBibSonomyWidget : public WebQueryWidget { - Q_OBJECT + TQ_OBJECT public: WebQueryBibSonomyWidget( TQWidget *parent, const char *name = 0 ); }; @@ -40,7 +40,7 @@ namespace KBibTeX class WebQueryBibSonomy : public WebQuery { - Q_OBJECT + TQ_OBJECT public: WebQueryBibSonomy( TQWidget* parent ); virtual ~WebQueryBibSonomy(); diff --git a/src/webquerycitebase.h b/src/webquerycitebase.h index e8dec2f..8d3e961 100644 --- a/src/webquerycitebase.h +++ b/src/webquerycitebase.h @@ -29,7 +29,7 @@ namespace KBibTeX */ class WebQueryCitebaseWidget : public WebQueryWidget { - Q_OBJECT + TQ_OBJECT public: WebQueryCitebaseWidget( TQWidget *parent, const char *name = 0 ); }; @@ -39,7 +39,7 @@ namespace KBibTeX */ class WebQueryCitebase : public WebQuery { - Q_OBJECT + TQ_OBJECT public: WebQueryCitebase( TQWidget* parent ); virtual ~WebQueryCitebase(); diff --git a/src/webqueryciteseerx.cpp b/src/webqueryciteseerx.cpp index 88d5af6..f023c5d 100644 --- a/src/webqueryciteseerx.cpp +++ b/src/webqueryciteseerx.cpp @@ -307,9 +307,9 @@ namespace KBibTeX else if ( !m_aborted ) { m_currentParser = m_queryQueue.front().parser; - TDEIO::Job *job = TDEIO::storedGet( m_queryQueue.front().url, FALSE, FALSE ); + TDEIO::Job *job = TDEIO::storedGet( m_queryQueue.front().url, false, false ); m_queryQueue.pop_front(); - connect( job, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( getData( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( getData( TDEIO::Job * ) ) ); } } diff --git a/src/webqueryciteseerx.h b/src/webqueryciteseerx.h index fad8d60..78a88f4 100644 --- a/src/webqueryciteseerx.h +++ b/src/webqueryciteseerx.h @@ -40,7 +40,7 @@ namespace KBibTeX class WebQueryCiteSeerXWidget : public WebQueryWidget { - Q_OBJECT + TQ_OBJECT public: WebQueryCiteSeerXWidget( TQWidget *parent, const char *name = 0 ); @@ -58,7 +58,7 @@ namespace KBibTeX class WebQueryCiteSeerX : public WebQuery { - Q_OBJECT + TQ_OBJECT public: @@ -132,7 +132,7 @@ namespace KBibTeX /// List with waiting queries std::deque<DataRequest> m_queryQueue; - /// Pointer to QT-dialog. + /// Pointer to TQt dialog. WebQueryCiteSeerXWidget *m_widget; }; diff --git a/src/webquerycsb.cpp b/src/webquerycsb.cpp index 9e31e62..a37b159 100644 --- a/src/webquerycsb.cpp +++ b/src/webquerycsb.cpp @@ -92,11 +92,11 @@ namespace KBibTeX comboBoxField = new KComboBox( false, this ); hLayout->addWidget( comboBoxField ); label->setBuddy( comboBoxField ); - connect( clearSearchText, SIGNAL( clicked() ), lineEditQuery, SLOT( clear() ) ); - connect( lineEditQuery, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChanged( const TQString& ) ) ); + connect( clearSearchText, TQ_SIGNAL( clicked() ), lineEditQuery, TQ_SLOT( clear() ) ); + connect( lineEditQuery, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotTextChanged( const TQString& ) ) ); hLayout->setStretchFactor( lineEditQuery, 5 ); - connect( lineEditQuery, SIGNAL( returnPressed() ), this, SIGNAL( startSearch() ) ); - connect( lineEditQuery, SIGNAL( returnPressed( const TQString& ) ), completionQuery, SLOT( addItem( const TQString& ) ) ); + connect( lineEditQuery, TQ_SIGNAL( returnPressed() ), this, TQ_SIGNAL( startSearch() ) ); + connect( lineEditQuery, TQ_SIGNAL( returnPressed( const TQString& ) ), completionQuery, TQ_SLOT( addItem( const TQString& ) ) ); hLayout = new TQHBoxLayout( ); vLayout->addLayout( hLayout ); @@ -112,7 +112,7 @@ namespace KBibTeX hLayout->setStretchFactor( checkBoxYear, 1 ); checkBoxYear->setChecked( true ); hLayout->addWidget( checkBoxYear ); - connect( checkBoxYear, SIGNAL( toggled( bool ) ), this, SLOT( slotYearCheckToggled() ) ); + connect( checkBoxYear, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotYearCheckToggled() ) ); comboBoxYear = new KComboBox( false, this ); hLayout->setStretchFactor( comboBoxYear, 3 ); hLayout->addWidget( comboBoxYear ); @@ -155,8 +155,8 @@ namespace KBibTeX WebQueryCSB::WebQueryCSB( TQWidget* parent ): WebQuery( parent ) { - m_importer = new BibTeX::FileImporterBibTeX( FALSE ); - m_importer->setIgnoreComments( TRUE ); + m_importer = new BibTeX::FileImporterBibTeX( false ); + m_importer->setIgnoreComments( true ); m_widget = new WebQueryCSBWidget( parent ); } @@ -241,8 +241,8 @@ namespace KBibTeX TQRegExp removeXML( "<[^>]+>" ); rawText.replace( removeXML, "" ); - BibTeX::FileImporterBibTeX importer( FALSE ); - importer.setIgnoreComments( TRUE ); + BibTeX::FileImporterBibTeX importer( false ); + importer.setIgnoreComments( true ); TQBuffer buffer; buffer.open( IO_WriteOnly ); diff --git a/src/webquerycsb.h b/src/webquerycsb.h index 326c82e..0fe3d16 100644 --- a/src/webquerycsb.h +++ b/src/webquerycsb.h @@ -38,7 +38,7 @@ namespace KBibTeX */ class WebQueryCSBWidget : public WebQueryWidget { - Q_OBJECT + TQ_OBJECT public: WebQueryCSBWidget( TQWidget *parent, const char *name = 0 ); @@ -62,7 +62,7 @@ namespace KBibTeX */ class WebQueryCSB : public WebQuery { - Q_OBJECT + TQ_OBJECT public: WebQueryCSB( TQWidget* parent ); virtual ~WebQueryCSB(); diff --git a/src/webquerydblp.cpp b/src/webquerydblp.cpp index ec7001f..2ef8287 100644 --- a/src/webquerydblp.cpp +++ b/src/webquerydblp.cpp @@ -71,8 +71,8 @@ namespace KBibTeX hLayout->addWidget( lineEditQuery ); label->setBuddy( lineEditQuery ); hLayout->addSpacing( KDialog::spacingHint() * 2 ); - connect( clearSearchText, SIGNAL( clicked() ), lineEditQuery, SLOT( clear() ) ); - connect( lineEditQuery, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChanged( const TQString& ) ) ); + connect( clearSearchText, TQ_SIGNAL( clicked() ), lineEditQuery, TQ_SLOT( clear() ) ); + connect( lineEditQuery, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotTextChanged( const TQString& ) ) ); hLayout->setStretchFactor( lineEditQuery, 4 ); TDECompletion *completionQuery = lineEditQuery->completionObject(); @@ -91,8 +91,8 @@ namespace KBibTeX vLayout->addStretch( 0 ); - connect( lineEditQuery, SIGNAL( returnPressed() ), this, SIGNAL( startSearch() ) ); - connect( lineEditQuery, SIGNAL( returnPressed( const TQString& ) ), completionQuery, SLOT( addItem( const TQString& ) ) ); + connect( lineEditQuery, TQ_SIGNAL( returnPressed() ), this, TQ_SIGNAL( startSearch() ) ); + connect( lineEditQuery, TQ_SIGNAL( returnPressed( const TQString& ) ), completionQuery, TQ_SLOT( addItem( const TQString& ) ) ); } WebQueryDBLP::WebQueryDBLP( TQWidget* parent ): WebQuery( parent ) diff --git a/src/webquerydblp.h b/src/webquerydblp.h index b395e42..fa5ddeb 100644 --- a/src/webquerydblp.h +++ b/src/webquerydblp.h @@ -31,7 +31,7 @@ namespace KBibTeX */ class WebQueryDBLPWidget : public WebQueryWidget { - Q_OBJECT + TQ_OBJECT public: WebQueryDBLPWidget( TQWidget *parent, const char *name = 0 ); TQCheckBox *checkBoxKeepEntriesSeparate; @@ -45,7 +45,7 @@ namespace KBibTeX */ class WebQueryDBLP : public WebQuery { - Q_OBJECT + TQ_OBJECT public: WebQueryDBLP( TQWidget* parent ); virtual ~WebQueryDBLP(); diff --git a/src/webquerygooglescholar.cpp b/src/webquerygooglescholar.cpp index be55192..be47b64 100644 --- a/src/webquerygooglescholar.cpp +++ b/src/webquerygooglescholar.cpp @@ -53,8 +53,8 @@ namespace KBibTeX WebQueryGoogleScholar::WebQueryGoogleScholar( TQWidget* parent ) : WebQuery( parent ), m_transferJob( NULL ), m_transferJobBuffer( NULL ) { - m_importer = new BibTeX::FileImporterBibTeX( FALSE ); - m_importer->setIgnoreComments( TRUE ); + m_importer = new BibTeX::FileImporterBibTeX( false ); + m_importer->setIgnoreComments( true ); m_widget = new WebQueryGoogleScholarWidget( parent ); } @@ -113,8 +113,8 @@ namespace KBibTeX m_transferJobBuffer = new TQBuffer(); m_transferJobBuffer->open( IO_WriteOnly ); TDEIO::TransferJob* m_transferJob = TDEIO::get( KURL( "http://scholar.google.com/scholar_ncr" ), false, false ); - connect( m_transferJob, SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( m_transferJob, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( slotFinishedStartpage( TDEIO::Job * ) ) ); + connect( m_transferJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( m_transferJob, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotFinishedStartpage( TDEIO::Job * ) ) ); } void WebQueryGoogleScholar::cancelQuery() @@ -154,8 +154,8 @@ namespace KBibTeX m_transferJobBuffer = new TQBuffer(); m_transferJobBuffer->open( IO_WriteOnly ); TDEIO::TransferJob* m_transferJob = TDEIO::get( KURL( "http://scholar.google.com/scholar_preferences?hl=en" ), false, false ); - connect( m_transferJob, SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( m_transferJob, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( slotFinishedLoadingSettings( TDEIO::Job * ) ) ); + connect( m_transferJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( m_transferJob, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotFinishedLoadingSettings( TDEIO::Job * ) ) ); } @@ -198,8 +198,8 @@ namespace KBibTeX m_transferJobBuffer = new TQBuffer(); m_transferJobBuffer->open( IO_WriteOnly ); TDEIO::TransferJob* m_transferJob = TDEIO::get( nextUrl, false, false ); - connect( m_transferJob, SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( m_transferJob, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( slotFinishedSavingSettings( TDEIO::Job * ) ) ); + connect( m_transferJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( m_transferJob, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotFinishedSavingSettings( TDEIO::Job * ) ) ); } void WebQueryGoogleScholar::slotFinishedSavingSettings( TDEIO::Job *job ) @@ -239,8 +239,8 @@ namespace KBibTeX m_transferJobBuffer = new TQBuffer(); m_transferJobBuffer->open( IO_WriteOnly ); TDEIO::TransferJob* m_transferJob = TDEIO::get( nextUrl, false, false ); - connect( m_transferJob, SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( m_transferJob, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( slotFinishedReceivingResultOverview( TDEIO::Job * ) ) ); + connect( m_transferJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( m_transferJob, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotFinishedReceivingResultOverview( TDEIO::Job * ) ) ); } void WebQueryGoogleScholar::slotFinishedReceivingResultOverview( TDEIO::Job *job ) diff --git a/src/webquerygooglescholar.h b/src/webquerygooglescholar.h index c6bb6c3..721999c 100644 --- a/src/webquerygooglescholar.h +++ b/src/webquerygooglescholar.h @@ -35,7 +35,7 @@ namespace KBibTeX */ class WebQueryGoogleScholarWidget : public WebQueryWidget { - Q_OBJECT + TQ_OBJECT public: WebQueryGoogleScholarWidget( TQWidget *parent, const char *name = 0 ); }; @@ -45,7 +45,7 @@ namespace KBibTeX */ class WebQueryGoogleScholar : public WebQuery { - Q_OBJECT + TQ_OBJECT public: WebQueryGoogleScholar( TQWidget* parent ); virtual ~WebQueryGoogleScholar(); diff --git a/src/webqueryieeexplore.cpp b/src/webqueryieeexplore.cpp index a4fad0d..c444f47 100644 --- a/src/webqueryieeexplore.cpp +++ b/src/webqueryieeexplore.cpp @@ -175,8 +175,8 @@ namespace KBibTeX TDEIO::TransferJob *job = TDEIO::http_post( m_risURL, data.utf8(), false ); job->addMetaData( "content-type", "Content-Type: application/x-www-form-urlencoded" ); - connect( job, SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( job, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } void WebQueryIEEExplore::slotData( TDEIO::Job *, const TQByteArray &data ) diff --git a/src/webqueryieeexplore.h b/src/webqueryieeexplore.h index 4c63e9c..41af1c6 100644 --- a/src/webqueryieeexplore.h +++ b/src/webqueryieeexplore.h @@ -32,7 +32,7 @@ namespace KBibTeX */ class WebQueryIEEExploreWidget : public WebQueryWidget { - Q_OBJECT + TQ_OBJECT public: WebQueryIEEExploreWidget( TQWidget *parent, const char *name = 0 ); }; @@ -43,7 +43,7 @@ namespace KBibTeX class WebQueryIEEExplore : public WebQuery { - Q_OBJECT + TQ_OBJECT public: WebQueryIEEExplore( TQWidget* parent ); virtual ~WebQueryIEEExplore(); diff --git a/src/webquerymathscinet.cpp b/src/webquerymathscinet.cpp index 1d4a89c..3a204f7 100644 --- a/src/webquerymathscinet.cpp +++ b/src/webquerymathscinet.cpp @@ -64,8 +64,8 @@ namespace KBibTeX hLayout->addWidget( lineEditQuery ); label->setBuddy( lineEditQuery ); hLayout->addSpacing( KDialog::spacingHint() * 2 ); - connect( clearSearchText, SIGNAL( clicked() ), lineEditQuery, SLOT( clear() ) ); - connect( lineEditQuery, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChanged( const TQString& ) ) ); + connect( clearSearchText, TQ_SIGNAL( clicked() ), lineEditQuery, TQ_SLOT( clear() ) ); + connect( lineEditQuery, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotTextChanged( const TQString& ) ) ); hLayout->setStretchFactor( lineEditQuery, 4 ); TDECompletion *completionQuery = lineEditQuery->completionObject(); @@ -83,8 +83,8 @@ namespace KBibTeX vLayout->addStretch( 0 ); - connect( lineEditQuery, SIGNAL( returnPressed() ), this, SIGNAL( startSearch() ) ); - connect( lineEditQuery, SIGNAL( returnPressed( const TQString& ) ), completionQuery, SLOT( addItem( const TQString& ) ) ); + connect( lineEditQuery, TQ_SIGNAL( returnPressed() ), this, TQ_SIGNAL( startSearch() ) ); + connect( lineEditQuery, TQ_SIGNAL( returnPressed( const TQString& ) ), completionQuery, TQ_SLOT( addItem( const TQString& ) ) ); } WebQueryMathSciNet::WebQueryMathSciNet( TQWidget* parent ): WebQuery( parent ) diff --git a/src/webquerymathscinet.h b/src/webquerymathscinet.h index 1ff3508..418c3e3 100644 --- a/src/webquerymathscinet.h +++ b/src/webquerymathscinet.h @@ -29,7 +29,7 @@ namespace KBibTeX */ class WebQueryMathSciNetWidget : public WebQueryWidget { - Q_OBJECT + TQ_OBJECT public: WebQueryMathSciNetWidget( TQWidget *parent, const char *name = 0 ); @@ -42,7 +42,7 @@ namespace KBibTeX */ class WebQueryMathSciNet : public WebQuery { - Q_OBJECT + TQ_OBJECT public: WebQueryMathSciNet( TQWidget* parent ); virtual ~WebQueryMathSciNet(); diff --git a/src/webquerypubmed.cpp b/src/webquerypubmed.cpp index 902a0a1..fb6954b 100644 --- a/src/webquerypubmed.cpp +++ b/src/webquerypubmed.cpp @@ -148,7 +148,7 @@ namespace KBibTeX doc.setContent( &buffer ); TQDomElement docElem = doc.documentElement(); WebQueryPubMedResultParser resultParser; - connect( &resultParser, SIGNAL( foundEntry( BibTeX::Entry*, bool ) ), this, SIGNAL( foundEntry( BibTeX::Entry*, bool ) ) ); + connect( &resultParser, TQ_SIGNAL( foundEntry( BibTeX::Entry*, bool ) ), this, TQ_SIGNAL( foundEntry( BibTeX::Entry*, bool ) ) ); resultParser.parse( docElem ); buffer.close(); setEndSearch( WebQuery::statusSuccess ); @@ -189,7 +189,7 @@ namespace KBibTeX bool WebQueryPubMedStructureParserQuery::startElement( const TQString & /*namespaceURI*/, const TQString & /*localName*/, const TQString & /*qName*/, const TQXmlAttributes & /*atts*/ ) { concatString = TQString(); - return TRUE; + return true; } bool WebQueryPubMedStructureParserQuery::endElement( const TQString & /*namespaceURI*/, const TQString & /*localName*/, const TQString & qName ) @@ -202,13 +202,13 @@ namespace KBibTeX m_intList->append( id ); } - return TRUE; + return true; } bool WebQueryPubMedStructureParserQuery::characters( const TQString & ch ) { concatString.append( ch ); - return TRUE; + return true; } WebQueryPubMedResultParser::WebQueryPubMedResultParser( ) : TQObject() diff --git a/src/webquerypubmed.h b/src/webquerypubmed.h index 610e831..f7322a9 100644 --- a/src/webquerypubmed.h +++ b/src/webquerypubmed.h @@ -37,7 +37,7 @@ namespace KBibTeX */ class WebQueryPubMedWidget : public WebQueryWidget { - Q_OBJECT + TQ_OBJECT public: WebQueryPubMedWidget( TQWidget *parent, const char *name = 0 ); }; @@ -59,7 +59,7 @@ namespace KBibTeX class WebQueryPubMedResultParser: public TQObject { - Q_OBJECT + TQ_OBJECT public: WebQueryPubMedResultParser(); ~WebQueryPubMedResultParser(); @@ -81,7 +81,7 @@ namespace KBibTeX class WebQueryPubMed : public WebQuery { - Q_OBJECT + TQ_OBJECT public: WebQueryPubMed( TQWidget *parent ); virtual ~WebQueryPubMed(); diff --git a/src/webquerysciencedirect.cpp b/src/webquerysciencedirect.cpp index 783955d..79d23d2 100644 --- a/src/webquerysciencedirect.cpp +++ b/src/webquerysciencedirect.cpp @@ -87,11 +87,11 @@ namespace KBibTeX TDECompletion *completionQuery = lineEditQuery->completionObject(); hLayout->addWidget( lineEditQuery ); label->setBuddy( lineEditQuery ); - connect( clearSearchText, SIGNAL( clicked() ), lineEditQuery, SLOT( clear() ) ); - connect( lineEditQuery, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChangedSD( ) ) ); + connect( clearSearchText, TQ_SIGNAL( clicked() ), lineEditQuery, TQ_SLOT( clear() ) ); + connect( lineEditQuery, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotTextChangedSD( ) ) ); hLayout->setStretchFactor( lineEditQuery, 7 ); - connect( lineEditQuery, SIGNAL( returnPressed() ), this, SIGNAL( startSearch() ) ); - connect( lineEditQuery, SIGNAL( returnPressed( const TQString& ) ), completionQuery, SLOT( addItem( const TQString& ) ) ); + connect( lineEditQuery, TQ_SIGNAL( returnPressed() ), this, TQ_SIGNAL( startSearch() ) ); + connect( lineEditQuery, TQ_SIGNAL( returnPressed( const TQString& ) ), completionQuery, TQ_SLOT( addItem( const TQString& ) ) ); hLayout = new TQHBoxLayout( ); @@ -106,11 +106,11 @@ namespace KBibTeX completionQuery = lineEditAuthor->completionObject(); hLayout->addWidget( lineEditAuthor ); label->setBuddy( lineEditAuthor ); - connect( clearAuthor, SIGNAL( clicked() ), lineEditAuthor, SLOT( clear() ) ); - connect( lineEditAuthor, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChangedSD( ) ) ); + connect( clearAuthor, TQ_SIGNAL( clicked() ), lineEditAuthor, TQ_SLOT( clear() ) ); + connect( lineEditAuthor, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotTextChangedSD( ) ) ); hLayout->setStretchFactor( lineEditAuthor, 7 ); - connect( lineEditAuthor, SIGNAL( returnPressed() ), this, SIGNAL( startSearch() ) ); - connect( lineEditAuthor, SIGNAL( returnPressed( const TQString& ) ), completionQuery, SLOT( addItem( const TQString& ) ) ); + connect( lineEditAuthor, TQ_SIGNAL( returnPressed() ), this, TQ_SIGNAL( startSearch() ) ); + connect( lineEditAuthor, TQ_SIGNAL( returnPressed( const TQString& ) ), completionQuery, TQ_SLOT( addItem( const TQString& ) ) ); hLayout->addSpacing( KDialog::spacingHint() * 2 ); @@ -123,11 +123,11 @@ namespace KBibTeX completionQuery = lineEditJournal->completionObject(); hLayout->addWidget( lineEditJournal ); label->setBuddy( lineEditJournal ); - connect( clearJournal, SIGNAL( clicked() ), lineEditJournal, SLOT( clear() ) ); - connect( lineEditJournal, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChangedSD( ) ) ); + connect( clearJournal, TQ_SIGNAL( clicked() ), lineEditJournal, TQ_SLOT( clear() ) ); + connect( lineEditJournal, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotTextChangedSD( ) ) ); hLayout->setStretchFactor( lineEditJournal, 4 ); - connect( lineEditJournal, SIGNAL( returnPressed() ), this, SIGNAL( startSearch() ) ); - connect( lineEditJournal, SIGNAL( returnPressed( const TQString& ) ), completionQuery, SLOT( addItem( const TQString& ) ) ); + connect( lineEditJournal, TQ_SIGNAL( returnPressed() ), this, TQ_SIGNAL( startSearch() ) ); + connect( lineEditJournal, TQ_SIGNAL( returnPressed( const TQString& ) ), completionQuery, TQ_SLOT( addItem( const TQString& ) ) ); hLayout = new TQHBoxLayout( ); vLayout->addLayout( hLayout ); @@ -138,7 +138,7 @@ namespace KBibTeX hLayout->addWidget( lineEditVolume ); hLayout->setStretchFactor( lineEditVolume, 1 ); label->setBuddy( lineEditVolume ); - connect( lineEditVolume, SIGNAL( returnPressed() ), this, SIGNAL( startSearch() ) ); + connect( lineEditVolume, TQ_SIGNAL( returnPressed() ), this, TQ_SIGNAL( startSearch() ) ); hLayout->addSpacing( KDialog::spacingHint() * 2 ); @@ -148,7 +148,7 @@ namespace KBibTeX hLayout->addWidget( lineEditIssue ); label->setBuddy( lineEditIssue ); hLayout->setStretchFactor( lineEditIssue, 1 ); - connect( lineEditIssue, SIGNAL( returnPressed() ), this, SIGNAL( startSearch() ) ); + connect( lineEditIssue, TQ_SIGNAL( returnPressed() ), this, TQ_SIGNAL( startSearch() ) ); hLayout->addSpacing( KDialog::spacingHint() * 2 ); @@ -158,7 +158,7 @@ namespace KBibTeX hLayout->addWidget( lineEditPage ); hLayout->setStretchFactor( lineEditPage, 1 ); label->setBuddy( lineEditPage ); - connect( lineEditPage, SIGNAL( returnPressed() ), this, SIGNAL( startSearch() ) ); + connect( lineEditPage, TQ_SIGNAL( returnPressed() ), this, TQ_SIGNAL( startSearch() ) ); hLayout->addSpacing( KDialog::spacingHint() * 2 ); @@ -180,8 +180,8 @@ namespace KBibTeX WebQueryScienceDirect::WebQueryScienceDirect( TQWidget* parent ): WebQuery( parent ) { - m_importer = new BibTeX::FileImporterBibTeX( FALSE ); - m_importer->setIgnoreComments( TRUE ); + m_importer = new BibTeX::FileImporterBibTeX( false ); + m_importer->setIgnoreComments( true ); m_widget = new WebQueryScienceDirectWidget( parent ); } @@ -365,8 +365,8 @@ namespace KBibTeX KURL url = KURL( "http://www.sciencedirect.com/science" ); TDEIO::TransferJob *job = TDEIO::http_post( url, data.utf8(), false ); job->addMetaData( "content-type", "Content-Type: application/x-www-form-urlencoded" ); - connect( job, SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( job, SIGNAL( result( TDEIO::Job * ) ), this, SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); return true; } diff --git a/src/webquerysciencedirect.h b/src/webquerysciencedirect.h index 915a193..347ad51 100644 --- a/src/webquerysciencedirect.h +++ b/src/webquerysciencedirect.h @@ -30,7 +30,7 @@ namespace KBibTeX */ class WebQueryScienceDirectWidget : public WebQueryWidget { - Q_OBJECT + TQ_OBJECT public: WebQueryScienceDirectWidget( TQWidget *parent, const char *name = 0 ); @@ -53,7 +53,7 @@ namespace KBibTeX */ class WebQueryScienceDirect : public WebQuery { - Q_OBJECT + TQ_OBJECT public: WebQueryScienceDirect( TQWidget* parent ); virtual ~WebQueryScienceDirect(); diff --git a/src/webqueryspireshep.cpp b/src/webqueryspireshep.cpp index 000df22..01c1c22 100644 --- a/src/webqueryspireshep.cpp +++ b/src/webqueryspireshep.cpp @@ -101,16 +101,16 @@ namespace KBibTeX lineEditQuery = new KLineEdit( this ); hLayout->addWidget( lineEditQuery ); label->setBuddy( lineEditQuery ); - connect( clearSearchText, SIGNAL( clicked() ), lineEditQuery, SLOT( clear() ) ); - connect( lineEditQuery, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChanged( const TQString& ) ) ); + connect( clearSearchText, TQ_SIGNAL( clicked() ), lineEditQuery, TQ_SLOT( clear() ) ); + connect( lineEditQuery, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotTextChanged( const TQString& ) ) ); hLayout->setStretchFactor( lineEditQuery, 4 ); TDECompletion *completionQuery = lineEditQuery->completionObject(); m_checkBoxFetchAbstracts = new TQCheckBox( i18n( "Include abstracts from arxiv.org if available" ), this ); vLayout->addWidget( m_checkBoxFetchAbstracts ); - connect( lineEditQuery, SIGNAL( returnPressed() ), this, SIGNAL( startSearch() ) ); - connect( lineEditQuery, SIGNAL( returnPressed( const TQString& ) ), completionQuery, SLOT( addItem( const TQString& ) ) ); + connect( lineEditQuery, TQ_SIGNAL( returnPressed() ), this, TQ_SIGNAL( startSearch() ) ); + connect( lineEditQuery, TQ_SIGNAL( returnPressed( const TQString& ) ), completionQuery, TQ_SLOT( addItem( const TQString& ) ) ); vLayout->addStretch( 1 ); } diff --git a/src/webqueryspireshep.h b/src/webqueryspireshep.h index bf0eed6..d257cf1 100644 --- a/src/webqueryspireshep.h +++ b/src/webqueryspireshep.h @@ -29,7 +29,7 @@ namespace KBibTeX */ class WebQuerySpiresHepWidget : public WebQueryWidget { - Q_OBJECT + TQ_OBJECT public: WebQuerySpiresHepWidget( TQWidget *parent, const char *name = 0 ); @@ -46,7 +46,7 @@ namespace KBibTeX */ class WebQuerySpiresHep : public WebQuery { - Q_OBJECT + TQ_OBJECT public: WebQuerySpiresHep( TQWidget* parent ); virtual ~WebQuerySpiresHep(); diff --git a/src/webqueryz3950.cpp b/src/webqueryz3950.cpp index a405ee3..ed2d7cb 100644 --- a/src/webqueryz3950.cpp +++ b/src/webqueryz3950.cpp @@ -39,7 +39,7 @@ #include <tqlabel.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <klineedit.h> #include <kcombobox.h> #include <tdemessagebox.h> @@ -118,11 +118,11 @@ namespace KBibTeX lineEditQuery = new KLineEdit( this ); layout->addWidget( lineEditQuery, 0, 3 ); label->setBuddy( lineEditQuery ); - connect( clearSearchText, SIGNAL( clicked() ), lineEditQuery, SLOT( clear() ) ); - connect( lineEditQuery, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotTextChanged( const TQString& ) ) ); + connect( clearSearchText, TQ_SIGNAL( clicked() ), lineEditQuery, TQ_SLOT( clear() ) ); + connect( lineEditQuery, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotTextChanged( const TQString& ) ) ); TDECompletion *completionQuery = lineEditQuery->completionObject(); - connect( lineEditQuery, SIGNAL( returnPressed() ), this, SIGNAL( startSearch() ) ); - connect( lineEditQuery, SIGNAL( returnPressed( const TQString& ) ), completionQuery, SLOT( addItem( const TQString& ) ) ); + connect( lineEditQuery, TQ_SIGNAL( returnPressed() ), this, TQ_SIGNAL( startSearch() ) ); + connect( lineEditQuery, TQ_SIGNAL( returnPressed( const TQString& ) ), completionQuery, TQ_SLOT( addItem( const TQString& ) ) ); label = new TQLabel( i18n( "Search in:" ), this ); layout->addWidget( label, 0, 4 ); comboBoxInAttribute = new KComboBox( false, this ); @@ -140,10 +140,10 @@ namespace KBibTeX lineEditQuery2 = new KLineEdit( this ); layout->addWidget( lineEditQuery2, 1, 3 ); label->setBuddy( lineEditQuery2 ); - connect( clearSearchText, SIGNAL( clicked() ), lineEditQuery2, SLOT( clear() ) ); + connect( clearSearchText, TQ_SIGNAL( clicked() ), lineEditQuery2, TQ_SLOT( clear() ) ); completionQuery = lineEditQuery->completionObject(); - connect( lineEditQuery2, SIGNAL( returnPressed() ), this, SIGNAL( startSearch() ) ); - connect( lineEditQuery2, SIGNAL( returnPressed( const TQString& ) ), completionQuery, SLOT( addItem( const TQString& ) ) ); + connect( lineEditQuery2, TQ_SIGNAL( returnPressed() ), this, TQ_SIGNAL( startSearch() ) ); + connect( lineEditQuery2, TQ_SIGNAL( returnPressed( const TQString& ) ), completionQuery, TQ_SLOT( addItem( const TQString& ) ) ); label = new TQLabel( i18n( "Search in:" ), this ); layout->addWidget( label, 1, 4 ); comboBoxInAttribute2 = new KComboBox( false, this ); diff --git a/src/webqueryz3950.h b/src/webqueryz3950.h index 5fb9089..b124a8e 100644 --- a/src/webqueryz3950.h +++ b/src/webqueryz3950.h @@ -55,7 +55,7 @@ namespace KBibTeX */ class WebQueryZ3950Widget : public WebQueryWidget { - Q_OBJECT + TQ_OBJECT public: WebQueryZ3950Widget( TQWidget *parent, const char *name = 0 ); @@ -78,7 +78,7 @@ namespace KBibTeX */ class WebQueryZ3950 : public WebQuery { - Q_OBJECT + TQ_OBJECT public: WebQueryZ3950( TQWidget* parent ); virtual ~WebQueryZ3950(); diff --git a/src/webqueryzmath.h b/src/webqueryzmath.h index df01cf0..aa3c7f8 100644 --- a/src/webqueryzmath.h +++ b/src/webqueryzmath.h @@ -29,7 +29,7 @@ namespace KBibTeX */ class WebQueryZMATHWidget : public WebQueryWidget { - Q_OBJECT + TQ_OBJECT public: WebQueryZMATHWidget( TQWidget *parent, const char *name = 0 ); }; @@ -39,7 +39,7 @@ namespace KBibTeX */ class WebQueryZMATH : public WebQuery { - Q_OBJECT + TQ_OBJECT public: WebQueryZMATH( TQWidget* parent ); virtual ~WebQueryZMATH(); diff --git a/translations/desktop_files/de.po b/translations/desktop_files/de.po new file mode 100644 index 0000000..4be6660 --- /dev/null +++ b/translations/desktop_files/de.po @@ -0,0 +1,38 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-04-05 15:39+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: kbibtex.desktop:2 +#, fuzzy +msgid "KBibTeX" +msgstr "Einbettungsfähige Komponente von KBibTeX" + +#. GenericName +#: kbibtex.desktop:3 +msgid "Bibliography Manager" +msgstr "" + +#. Comment +#: kbibtex.desktop:8 +msgid "A BibTeX editor for TDE" +msgstr "Ein BibTeX-Editor für TDE" + +#. Name +#: kbibtex_part.desktop:3 +msgid "KBibTeXPart" +msgstr "Einbettungsfähige Komponente von KBibTeX" diff --git a/translations/desktop_files/et.po b/translations/desktop_files/et.po new file mode 100644 index 0000000..ced16ec --- /dev/null +++ b/translations/desktop_files/et.po @@ -0,0 +1,38 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-04-05 15:39+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"Language: et\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: kbibtex.desktop:2 +#, fuzzy +msgid "KBibTeX" +msgstr "KBibTeX komponent" + +#. GenericName +#: kbibtex.desktop:3 +msgid "Bibliography Manager" +msgstr "" + +#. Comment +#: kbibtex.desktop:8 +msgid "A BibTeX editor for TDE" +msgstr "" + +#. Name +#: kbibtex_part.desktop:3 +msgid "KBibTeXPart" +msgstr "KBibTeX komponent" diff --git a/translations/desktop_files/hi.po b/translations/desktop_files/hi.po new file mode 100644 index 0000000..0b9f065 --- /dev/null +++ b/translations/desktop_files/hi.po @@ -0,0 +1,38 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-04-05 15:39+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"Language: hi\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: kbibtex.desktop:2 +#, fuzzy +msgid "KBibTeX" +msgstr "KBibTeXपार्ट" + +#. GenericName +#: kbibtex.desktop:3 +msgid "Bibliography Manager" +msgstr "" + +#. Comment +#: kbibtex.desktop:8 +msgid "A BibTeX editor for TDE" +msgstr "" + +#. Name +#: kbibtex_part.desktop:3 +msgid "KBibTeXPart" +msgstr "KBibTeXपार्ट" diff --git a/translations/desktop_files/it.po b/translations/desktop_files/it.po new file mode 100644 index 0000000..2722d8a --- /dev/null +++ b/translations/desktop_files/it.po @@ -0,0 +1,38 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Michele Calgaro <michele.calgaro@yahoo.it>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-04-05 15:39+0200\n" +"PO-Revision-Date: 2024-11-03 10:11+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/applications/kbibtex-desktop-files/it/>\n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" + +#. Name +#: kbibtex.desktop:2 +msgid "KBibTeX" +msgstr "KBibTeX" + +#. GenericName +#: kbibtex.desktop:3 +msgid "Bibliography Manager" +msgstr "Gestore di bibliografia" + +#. Comment +#: kbibtex.desktop:8 +msgid "A BibTeX editor for TDE" +msgstr "Un editor BibTeX per TDE" + +#. Name +#: kbibtex_part.desktop:3 +msgid "KBibTeXPart" +msgstr "KBibTeXPart" diff --git a/translations/desktop_files/ka.po b/translations/desktop_files/ka.po new file mode 100644 index 0000000..926fe80 --- /dev/null +++ b/translations/desktop_files/ka.po @@ -0,0 +1,38 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-04-05 15:39+0200\n" +"PO-Revision-Date: 2024-11-05 09:11+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/applications/kbibtex-desktop-files/ka/>\n" +"Language: ka\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" + +#. Name +#: kbibtex.desktop:2 +msgid "KBibTeX" +msgstr "KBibTeX" + +#. GenericName +#: kbibtex.desktop:3 +msgid "Bibliography Manager" +msgstr "ბიბლიოგრაფიის მმართველი" + +#. Comment +#: kbibtex.desktop:8 +msgid "A BibTeX editor for TDE" +msgstr "BibTex-ის რედაქტორი RDE-სთვის" + +#. Name +#: kbibtex_part.desktop:3 +msgid "KBibTeXPart" +msgstr "KBibTeXPart" diff --git a/translations/desktop_files/kbibtex-desktops.pot b/translations/desktop_files/kbibtex-desktops.pot new file mode 100644 index 0000000..47ed0f2 --- /dev/null +++ b/translations/desktop_files/kbibtex-desktops.pot @@ -0,0 +1,37 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-04-05 15:39+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: kbibtex.desktop:2 +msgid "KBibTeX" +msgstr "" + +#. GenericName +#: kbibtex.desktop:3 +msgid "Bibliography Manager" +msgstr "" + +#. Comment +#: kbibtex.desktop:8 +msgid "A BibTeX editor for TDE" +msgstr "" + +#. Name +#: kbibtex_part.desktop:3 +msgid "KBibTeXPart" +msgstr "" diff --git a/translations/desktop_files/pl.po b/translations/desktop_files/pl.po new file mode 100644 index 0000000..0c2f442 --- /dev/null +++ b/translations/desktop_files/pl.po @@ -0,0 +1,39 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Marek W <coronzon88@gmail.com>, 2021. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-04-05 15:39+0200\n" +"PO-Revision-Date: 2021-10-18 20:30+0000\n" +"Last-Translator: Marek W <coronzon88@gmail.com>\n" +"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/" +"projects/applications/kbibtex-desktop-files/pl/>\n" +"Language: pl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.8.1\n" + +#. Name +#: kbibtex.desktop:2 +msgid "KBibTeX" +msgstr "KBibTeX" + +#. GenericName +#: kbibtex.desktop:3 +msgid "Bibliography Manager" +msgstr "Menedżer bibliografii" + +#. Comment +#: kbibtex.desktop:8 +msgid "A BibTeX editor for TDE" +msgstr "Edytor BibTeX dla TDE" + +#. Name +#: kbibtex_part.desktop:3 +msgid "KBibTeXPart" +msgstr "Moduł KBibTeX" diff --git a/translations/desktop_files/pt_BR.po b/translations/desktop_files/pt_BR.po new file mode 100644 index 0000000..87f47e6 --- /dev/null +++ b/translations/desktop_files/pt_BR.po @@ -0,0 +1,38 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>, 2021. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-04-05 15:39+0200\n" +"PO-Revision-Date: 2021-12-17 21:59+0000\n" +"Last-Translator: Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>\n" +"Language-Team: Portuguese (Brazil) <https://mirror.git.trinitydesktop.org/" +"weblate/projects/applications/kbibtex-desktop-files/pt_BR/>\n" +"Language: pt_BR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 4.9.1\n" + +#. Name +#: kbibtex.desktop:2 +msgid "KBibTeX" +msgstr "KBibTeX" + +#. GenericName +#: kbibtex.desktop:3 +msgid "Bibliography Manager" +msgstr "Gerenciador de bibliografia" + +#. Comment +#: kbibtex.desktop:8 +msgid "A BibTeX editor for TDE" +msgstr "Um editor BibTeX para o TDE" + +#. Name +#: kbibtex_part.desktop:3 +msgid "KBibTeXPart" +msgstr "Parte do KBibTeX" diff --git a/translations/desktop_files/ru.po b/translations/desktop_files/ru.po new file mode 100644 index 0000000..c03b6f0 --- /dev/null +++ b/translations/desktop_files/ru.po @@ -0,0 +1,39 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Andrei Stepanov <adem4ik@gmail.com>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-04-05 15:39+0200\n" +"PO-Revision-Date: 2024-04-25 17:50+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/applications/kbibtex-desktop-files/ru/>\n" +"Language: ru\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" + +#. Name +#: kbibtex.desktop:2 +msgid "KBibTeX" +msgstr "KBibTeX" + +#. GenericName +#: kbibtex.desktop:3 +msgid "Bibliography Manager" +msgstr "Менеджер библиографии" + +#. Comment +#: kbibtex.desktop:8 +msgid "A BibTeX editor for TDE" +msgstr "Редактор BibTeX для TDE" + +#. Name +#: kbibtex_part.desktop:3 +msgid "KBibTeXPart" +msgstr "KBibTeXPart" diff --git a/translations/desktop_files/sv.po b/translations/desktop_files/sv.po new file mode 100644 index 0000000..51ec9c7 --- /dev/null +++ b/translations/desktop_files/sv.po @@ -0,0 +1,38 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-04-05 15:39+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"Language: sv\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: kbibtex.desktop:2 +#, fuzzy +msgid "KBibTeX" +msgstr "KBibTeX-del" + +#. GenericName +#: kbibtex.desktop:3 +msgid "Bibliography Manager" +msgstr "" + +#. Comment +#: kbibtex.desktop:8 +msgid "A BibTeX editor for TDE" +msgstr "" + +#. Name +#: kbibtex_part.desktop:3 +msgid "KBibTeXPart" +msgstr "KBibTeX-del" diff --git a/translations/desktop_files/ta.po b/translations/desktop_files/ta.po new file mode 100644 index 0000000..46c279e --- /dev/null +++ b/translations/desktop_files/ta.po @@ -0,0 +1,38 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-04-05 15:39+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"Language: ta\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: kbibtex.desktop:2 +#, fuzzy +msgid "KBibTeX" +msgstr "KBibTeXபாகம்" + +#. GenericName +#: kbibtex.desktop:3 +msgid "Bibliography Manager" +msgstr "" + +#. Comment +#: kbibtex.desktop:8 +msgid "A BibTeX editor for TDE" +msgstr "" + +#. Name +#: kbibtex_part.desktop:3 +msgid "KBibTeXPart" +msgstr "KBibTeXபாகம்" diff --git a/po/de.po b/translations/messages/de.po index eb1b828..4e1334c 100644 --- a/po/de.po +++ b/translations/messages/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-13 19:07+0100\n" +"POT-Creation-Date: 2021-07-07 18:28+0000\n" "PO-Revision-Date: 2019-12-22 22:59+0000\n" "Last-Translator: Chris <xchrisx@uber.space>\n" "Language-Team: German <https://mirror.git.trinitydesktop.org/weblate/" @@ -20,13 +20,13 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 3.9.1\n" -#: _translatorinfo:1 +#. Instead of a literal translation, add your name to the end of the list (separated by a comma). msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Thomas Fischer, Chris (TDE)" -#: _translatorinfo:2 +#. Instead of a literal translation, add your email to the end of the list (separated by a comma). msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -2302,7 +2302,8 @@ msgstr "Z39.50-Server bearbeiten" #: settingsz3950.cpp:297 msgid "All Z39.50 server configurations will be reset to defaults." -msgstr "Alle Z39.50-Servereinrichtungen werden auf Standardwerte zurückgesetzt." +msgstr "" +"Alle Z39.50-Servereinrichtungen werden auf Standardwerte zurückgesetzt." #: settingsz3950.cpp:297 msgid "Reset to Default" @@ -2611,8 +2612,8 @@ msgid "" msgstr "" "<qt>Benutzen Sie die gleiche Syntax wie für <a href=\"http://www.math.tamu." "edu/~comech/tools/bibget/\">BIBGET</a>. Für Leerzeichen innerhalb eines " -"Sucheelementes, benutzen Sie \"<tt>+</tt>\".<br/>Beispiel: <tt>a=Gilkey t=" -"Beständigkeit Buch 1984</tt></qt>" +"Sucheelementes, benutzen Sie \"<tt>+</tt>\".<br/>Beispiel: <tt>a=Gilkey " +"t=Beständigkeit Buch 1984</tt></qt>" #: webquerymathscinet.cpp:102 msgid "MathSciNet" diff --git a/po/fr.po b/translations/messages/fr.po index 5cfc15c..2072b7e 100644 --- a/po/fr.po +++ b/translations/messages/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-13 19:07+0100\n" +"POT-Creation-Date: 2021-07-07 18:28+0000\n" "PO-Revision-Date: 2009-01-04 22:15+0100\n" "Last-Translator: Julien Richard-Foy <julien.rf@no-log.org>\n" "Language-Team: fr <kde-francophone@kde.org>\n" @@ -17,13 +17,13 @@ msgstr "" "X-Generator: Lokalize 0.2\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: _translatorinfo:1 +#. Instead of a literal translation, add your name to the end of the list (separated by a comma). msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Julien Richard-Foy" -#: _translatorinfo:2 +#. Instead of a literal translation, add your email to the end of the list (separated by a comma). msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -236,7 +236,7 @@ msgid "" "_n: This BibTeX file contains 1 element.\n" "This BibTeX file contains %n elements." msgstr "" -"_n: Ce fichier BibTeX contient 1 élément.\n" +"Ce fichier BibTeX contient 1 élément.\n" "Ce fichier BibTeX contient %n éléments." #: documentwidget.cpp:610 @@ -949,7 +949,7 @@ msgid "" "_n: , but only first letter of each last name\n" ", but only first %n letters of each last name" msgstr "" -"_n: , mais seulement la première lettre du nom de famille\n" +", mais seulement la première lettre du nom de famille\n" ", mais seulement les %n premières lettres du nom de famille" #: idsuggestions.cpp:340 idsuggestions.cpp:352 @@ -978,7 +978,7 @@ msgid "" "_n: , but only first letter of each word\n" ", but only first %n letters of each word" msgstr "" -"_n: , mais seulement la première lettre de chaque mot\n" +", mais seulement la première lettre de chaque mot\n" ", mais seulement les %n premières lettres de chaque mot" #: idsuggestions.cpp:355 diff --git a/po/it.po b/translations/messages/it.po index 6c2747f..295c1e8 100644 --- a/po/it.po +++ b/translations/messages/it.po @@ -3,12 +3,14 @@ # # Berto <bertolini@tlc.unipr.it>, 2008, 2009. # Angelo Compagnucci <angelo.compagnucci@gmail.com>, 2008. +# Michele Calgaro <michele.calgaro@yahoo.it>, 2021. +# stefano <ifx@lazytux.it>, 2025. msgid "" msgstr "" "Project-Id-Version: it\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-13 19:07+0100\n" -"PO-Revision-Date: 2019-05-31 19:15+0000\n" +"POT-Creation-Date: 2021-07-07 18:28+0000\n" +"PO-Revision-Date: 2025-03-03 20:44+0000\n" "Last-Translator: stefano <ifx@lazytux.it>\n" "Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" "projects/applications/kbibtex/it/>\n" @@ -17,15 +19,15 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.6.1\n" +"X-Generator: Weblate 4.17\n" -#: _translatorinfo:1 +#. Instead of a literal translation, add your name to the end of the list (separated by a comma). msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Marco Bertolini, Angelo Compagnucci" -#: _translatorinfo:2 +#. Instead of a literal translation, add your email to the end of the list (separated by a comma). msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -144,8 +146,8 @@ msgid "" "Replace the link with a new file or overwrite the existing file the link " "points to?" msgstr "" -"Il nome file selezionato \"%1\" è un collegamento simbolico che punta a \"%" -"2\".\n" +"Il nome file selezionato \"%1\" è un collegamento simbolico che punta a " +"\"%2\".\n" "Sostituisci il link con un nuovo file o sovrascrivi il file esistente a cui " "punta il link?" @@ -238,8 +240,8 @@ msgid "" "_n: This BibTeX file contains 1 element.\n" "This BibTeX file contains %n elements." msgstr "" -"Questo file BibTeX contiene 1 elemento.\n" -"Questo file BibTeX contiene %n elementi." +"Questo file BibTeX contiene 1 elemento.\n" +"Questo file BibTeX contiene %n elementi." #: documentwidget.cpp:610 msgid "File Statistics" @@ -421,7 +423,7 @@ msgstr "Pubblicazione" #: entrywidget.cpp:388 kbibtex_part.cpp:500 settings.cpp:720 msgid "Misc" -msgstr "Misc" +msgstr "vario" #: entrywidget.cpp:389 settings.cpp:659 settingskeyword.cpp:161 msgid "Keywords" @@ -736,7 +738,7 @@ msgstr "A&pri" #: entrywidgetpublication.cpp:308 msgid "The fields 'Chapter' or 'Pages' are required, but both are missing" -msgstr "I campi 'Capitolo' o 'Pagine' sono obbligatori, ma mancano entrambi" +msgstr "I campi 'Capitolo' o 'Pagine' sono obbligatori, ma mancano entrambi" #: entrywidgetpublication.cpp:325 msgid "The field 'Journal' refers to a not existing entry" @@ -745,7 +747,7 @@ msgstr "Il campo 'Rivista' si riferisce ad un elemento inesistente" #: entrywidgetpublication.cpp:392 #, c-format msgid "http://en.wikipedia.org/w/index.php?title=Special:Booksources&isbn=%1" -msgstr "http://it.wikipedia.org/wiki/Wikipedia:Fonti_librarie" +msgstr "http://en.wikipedia.org/w/index.php?title=Special:Booksources&isbn=%1" #: entrywidgetpublication.cpp:405 entrywidgetpublication.cpp:407 #: settings.cpp:655 @@ -1073,7 +1075,7 @@ msgstr "Chiudi Documento" #: kbibtex_part.cpp:251 kbibtex_part.cpp:369 kbibtexshell.cpp:316 msgid "BibTeX (*.bib)" -msgstr "BibTeX (*.bib)" +msgstr "BibTeX (*.bib)" #: kbibtex_part.cpp:251 kbibtex_part.cpp:273 kbibtex_part.cpp:369 #: kbibtexshell.cpp:316 @@ -1121,7 +1123,7 @@ msgstr "hypertext markup langage (*.html)" #: kbibtex_part.cpp:273 msgid "Rich Text Format (*.rtf)" -msgstr "Formato Rich Text (*.rtf)" +msgstr "Formato Rich Text (*.rtf)" #: kbibtex_part.cpp:333 msgid "Exporting" @@ -1330,7 +1332,7 @@ msgstr "Aggiungi un libro al file BibTeX" #: kbibtex_part.cpp:493 settings.cpp:704 msgid "Booklet" -msgstr "Booklet" +msgstr "Opuscolo" #: kbibtex_part.cpp:493 msgid "Add a booklet to the BibTeX file" @@ -1399,7 +1401,7 @@ msgstr "Aggiungi una tesi di dottorato al file BibTeX" #: kbibtex_part.cpp:502 settings.cpp:724 msgid "Proceedings" -msgstr "Proceedings" +msgstr "Procedimenti" #: kbibtex_part.cpp:502 msgid "Add some proceedings to the BibTeX file" @@ -1407,7 +1409,7 @@ msgstr "Aggiungi dei proceedings al file BibTeX" #: kbibtex_part.cpp:503 settings.cpp:726 msgid "TechReport" -msgstr "TechReport" +msgstr "Rapporto tecnico" #: kbibtex_part.cpp:503 msgid "Add a technical report to the BibTeX file" @@ -1415,7 +1417,7 @@ msgstr "Aggiungi un report tecnico al file BibTeX" #: kbibtex_part.cpp:504 settings.cpp:728 msgid "Unpublished" -msgstr "Unpublished" +msgstr "Inedito" #: kbibtex_part.cpp:504 msgid "Add an unpublished document to the BibTeX file" @@ -1696,7 +1698,7 @@ msgstr "Sconosciuto" #: settings.cpp:706 msgid "Collection" -msgstr "Collection" +msgstr "Collezione" #: settings.cpp:708 msgid "Electronic" @@ -2096,7 +2098,7 @@ msgid "" "_n: 1 keyword has been imported.\n" "%n keywords have been imported." msgstr "" -"_n: 1 parola chiave è stata importata.\n" +"1 parola chiave è stata importata.\n" "%n parole chiave sono state importate." #: settingskeyword.cpp:131 @@ -2493,10 +2495,8 @@ msgstr "Informazioni su CiteSeerX" #: webquerycsb.cpp:90 msgid "" -"" "_: Here, \"Field\" refers to a parameter for the CSB search (author, title, " "any)\n" -"" "&Field:" msgstr "&Campo:" @@ -2600,8 +2600,8 @@ msgid "" msgstr "" "<qt> Utilizza lo stesso synatx di <a href=\"http://www.math.tamu.edu/~comech/" "tools/bibget/\"> BIBGET </a>. Per gli spazi all'interno di un elemento di " -"ricerca, utilizzare \"<tt> + </tt>\". <br/>Esempio:<tt> a=gilkey t=" -"invariance book 1984</tt></qt>" +"ricerca, utilizzare \"<tt> + </tt>\". <br/>Esempio:<tt> a=gilkey " +"t=invariance book 1984</tt></qt>" #: webquerymathscinet.cpp:102 msgid "MathSciNet" diff --git a/po/kbibtex.pot b/translations/messages/kbibtex.pot index 0bb082c..6908180 100644 --- a/po/kbibtex.pot +++ b/translations/messages/kbibtex.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2019-01-13 19:07+0100\n" +"POT-Creation-Date: 2021-07-07 18:28+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -13,13 +13,15 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: _translatorinfo:1 +#. Instead of a literal translation, add your name to the end of the list (separated by a comma). +#, ignore-inconsistent msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "" -#: _translatorinfo:2 +#. Instead of a literal translation, add your email to the end of the list (separated by a comma). +#, ignore-inconsistent msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -1383,8 +1385,8 @@ msgstr "" msgid "Accept input from other programs" msgstr "" -#: kbibtex_part.cpp:537 kbibtex_part.rc:27 -#: kbibtex_part.rc:75 kbibtex_part.rc:131 +#: kbibtex_part.cpp:537 kbibtex_part.rc:27 kbibtex_part.rc:75 +#: kbibtex_part.rc:131 #, no-c-format msgid "&New" msgstr "" @@ -2465,10 +2467,9 @@ msgstr "" #: webquerymathscinet.cpp:81 msgid "" -"<qt>Use the same synatx as for <a " -"href=\"http://www.math.tamu.edu/~comech/tools/bibget/\">BIBGET</a>. For " -"spaces within a search element, use \"<tt>+</tt>\".<br/>Example: " -"<tt>a=gilkey t=invariance book 1984</tt></qt>" +"<qt>Use the same synatx as for <a href=\"http://www.math.tamu.edu/~comech/" +"tools/bibget/\">BIBGET</a>. For spaces within a search element, use \"<tt>+</" +"tt>\".<br/>Example: <tt>a=gilkey t=invariance book 1984</tt></qt>" msgstr "" #: webquerymathscinet.cpp:102 diff --git a/po/pl.po b/translations/messages/pl.po index 985bfee..fb1fc7a 100644 --- a/po/pl.po +++ b/translations/messages/pl.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: pl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-13 19:07+0100\n" +"POT-Creation-Date: 2021-07-07 18:28+0000\n" "PO-Revision-Date: 2010-07-02 12:24+0200\n" "Last-Translator: Michał Smoczyk <msmoczyk@wp.pl>\n" "Language-Team: Polish <pl@li.org>\n" @@ -17,13 +17,13 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n" "%100<10 || n%100>=20) ? 1 : 2);\n" -#: _translatorinfo:1 +#. Instead of a literal translation, add your name to the end of the list (separated by a comma). msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Michał Smoczyk" -#: _translatorinfo:2 +#. Instead of a literal translation, add your email to the end of the list (separated by a comma). msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" diff --git a/po/ru.po b/translations/messages/ru.po index c6a7085..b0c584a 100644 --- a/po/ru.po +++ b/translations/messages/ru.po @@ -2,34 +2,35 @@ # Header entry was created by KBabel! # # Alexey Beshenov <al@beshenov.ru>, 2008. +# Andrei Stepanov <adem4ik@gmail.com>, 2023, 2025. msgid "" msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-13 19:07+0100\n" -"PO-Revision-Date: 2020-01-03 18:07+0000\n" -"Last-Translator: Serg Bormant <bormant@mail.ru>\n" +"POT-Creation-Date: 2021-07-07 18:28+0000\n" +"PO-Revision-Date: 2025-07-20 05:46+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" "projects/applications/kbibtex/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=" -"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 3.10\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.18.2\n" -#: _translatorinfo:1 +#. Instead of a literal translation, add your name to the end of the list (separated by a comma). msgid "" "_: NAME OF TRANSLATORS\n" "Your names" -msgstr "Алексей Бешенов" +msgstr "Алексей Бешенов,Андрей Степанов" -#: _translatorinfo:2 +#. Instead of a literal translation, add your email to the end of the list (separated by a comma). msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" -msgstr "al@beshenov.ru" +msgstr "al@beshenov.ru,adem4ik@gmail.com" #: commentwidget.cpp:55 msgid "Co&mment:" @@ -44,14 +45,12 @@ msgid "Edit BibTeX Comment" msgstr "Редактировать комментарий BibTeX" #: documentlistview.cpp:120 -#, fuzzy msgid "List View" -msgstr "С&писок" +msgstr "Список" #: documentlistview.cpp:120 -#, fuzzy msgid "Updating main view ..." -msgstr "Обновление основного вида" +msgstr "Обновление основного вида…" #: documentlistview.cpp:253 msgid "Show Columns" @@ -82,9 +81,8 @@ msgid "Preamble" msgstr "Преамбула" #: documentsourceview.cpp:214 -#, fuzzy msgid "Source View" -msgstr "Ис&ходный код" +msgstr "Исходный вид" #: documentsourceview.cpp:214 msgid "Converting BibTeX document to plain text ..." @@ -120,11 +118,11 @@ msgstr "<qt>Загрузка файла <b>%1</b></qt>" #: documentwidget.cpp:221 msgid "Do you want to search for duplicates in the merged document?" -msgstr "" +msgstr "Хотите выполнить поиск дубликатов в объединённом документе?" #: documentwidget.cpp:221 msgid "Find duplicates?" -msgstr "" +msgstr "Найти дубликаты?" #: documentwidget.cpp:221 findduplicates.cpp:58 mergeelements.cpp:484 #: mergeelements.cpp:492 settingsediting.cpp:216 @@ -545,7 +543,7 @@ msgstr "" #: entrywidgetexternal.cpp:223 entrywidgetexternal.cpp:225 #: entrywidgetexternal.cpp:235 settings.cpp:685 settingssearchurl.cpp:135 msgid "URL" -msgstr "URL" +msgstr "Ссылка" #: entrywidgetexternal.cpp:235 entrywidgetexternal.cpp:268 #, c-format @@ -2159,7 +2157,7 @@ msgstr "Новый URL" #: settingssearchurl.cpp:170 msgid "Edit URL" -msgstr "Редактировать URL" +msgstr "Править ссылку" #: settingssearchurl.cpp:173 msgid "Description:" @@ -2206,7 +2204,7 @@ msgstr "Новое" msgid "" "_: user-defined input\n" "Edit" -msgstr "Редактировать" +msgstr "Изменить" #: settingsuserdefinedinput.cpp:186 msgid "" @@ -2233,7 +2231,7 @@ msgstr "Новое поле" #: settingsuserdefinedinput.cpp:210 msgid "Edit Field" -msgstr "Редактировать поле" +msgstr "Править поле" #: settingsuserdefinedinput.cpp:213 settingsz3950.cpp:71 msgid "Name:" @@ -2311,11 +2309,10 @@ msgid "" msgstr "Удалить" #: settingsz3950.cpp:338 -#, fuzzy msgid "" "_: z3950 server\n" "Edit" -msgstr "Редактировать" +msgstr "Изменить" #: settingsz3950.cpp:342 #, fuzzy @@ -2325,11 +2322,10 @@ msgid "" msgstr "Удалить" #: settingsz3950.cpp:346 -#, fuzzy msgid "" "_: z3950 server\n" "Up" -msgstr "Редактировать" +msgstr "Вверх" #: settingsz3950.cpp:350 #, fuzzy @@ -2373,7 +2369,7 @@ msgstr "Переименовать все вхождения" #: valuewidget.cpp:39 msgid "Edit field '%1'" -msgstr "Редактировать поле «%1»" +msgstr "Изменить поле «%1»" #: valuewidget.cpp:137 #, c-format |