summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeL10n.txt6
-rw-r--r--CMakeLists.txt11
-rw-r--r--Doxyfile275
-rw-r--r--kchmviewer.tdevelop272
-rw-r--r--kchmviewer.tdevelop.pcsbin601321 -> 0 bytes
-rw-r--r--src/kchmbookmarkwindow.cpp24
-rw-r--r--src/kchmbookmarkwindow.h2
-rw-r--r--src/kchmcontentswindow.cpp6
-rw-r--r--src/kchmcontentswindow.h2
-rw-r--r--src/kchmdialogchooseurlfromlist.cpp8
-rw-r--r--src/kchmdialogchooseurlfromlist.h2
-rw-r--r--src/kchmindexwindow.cpp16
-rw-r--r--src/kchmindexwindow.h2
-rw-r--r--src/kchmmainwindow.cpp52
-rw-r--r--src/kchmmainwindow.h2
-rw-r--r--src/kchmnavtoolbar.cpp6
-rw-r--r--src/kchmnavtoolbar.h2
-rw-r--r--src/kchmsearchengine.cpp4
-rw-r--r--src/kchmsearchengine.h2
-rw-r--r--src/kchmsearchengine_impl.cpp8
-rw-r--r--src/kchmsearchengine_impl.h2
-rw-r--r--src/kchmsearchtoolbar.cpp42
-rw-r--r--src/kchmsearchtoolbar.h2
-rw-r--r--src/kchmsearchwindow.cpp18
-rw-r--r--src/kchmsearchwindow.h4
-rw-r--r--src/kchmsetupdialog.ui6
-rw-r--r--src/kchmsetupdialog_impl.h2
-rw-r--r--src/kchmviewwindow.cpp12
-rw-r--r--src/kchmviewwindow_qtextbrowser.cpp2
-rw-r--r--src/kchmviewwindow_qtextbrowser.h6
-rw-r--r--src/kchmviewwindowmgr.cpp12
-rw-r--r--src/kchmviewwindowmgr.h2
-rw-r--r--src/main.cpp2
-rw-r--r--src/tde/kchmdcopiface.h2
-rw-r--r--src/tde/kchmviewwindow_tdehtmlpart.cpp8
-rw-r--r--src/tde/kchmviewwindow_tdehtmlpart.h2
-rw-r--r--translations/desktop_files/ru.po20
-rw-r--r--translations/messages/cs.po8
-rw-r--r--translations/messages/fr.po38
-rw-r--r--translations/messages/hu.po38
-rw-r--r--translations/messages/kchmviewer.pot2
-rw-r--r--translations/messages/nl.po38
-rw-r--r--translations/messages/ru.po27
-rw-r--r--translations/messages/tr.po36
-rw-r--r--translations/messages/zh_CN.po34
45 files changed, 186 insertions, 881 deletions
diff --git a/CMakeL10n.txt b/CMakeL10n.txt
index a91bd2a..0176702 100644
--- a/CMakeL10n.txt
+++ b/CMakeL10n.txt
@@ -9,7 +9,11 @@
#
#################################################
-cmake_minimum_required( VERSION 3.1 )
+
+##### set project version ########################
+
+include( TDEVersion )
+cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
##### include our cmake modules #################
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7866fd..cc1d1c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,11 @@
############################################
-cmake_minimum_required( VERSION 3.1 )
+##### set project version ########################
+
+include( TDEVersion )
+cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
+tde_set_project_version( )
#### general package setup
@@ -31,11 +35,6 @@ include( CheckCXXSourceCompiles )
include( TDEMacros )
-##### set version number ########################
-
-tde_set_project_version( )
-
-
##### setup install paths
include( TDESetupPaths )
diff --git a/Doxyfile b/Doxyfile
deleted file mode 100644
index 5fa23ee..0000000
--- a/Doxyfile
+++ /dev/null
@@ -1,275 +0,0 @@
-# Doxyfile 1.4.1-KDevelop
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-PROJECT_NAME = kchmviewer.tdevelop
-PROJECT_NUMBER = 0.1
-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 = YES
-STRIP_FROM_PATH = /home/tim/
-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
-SHOW_DIRECTORIES = YES
-FILE_VERSION_FILTER =
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET = NO
-WARNINGS = YES
-WARN_IF_UNDOCUMENTED = YES
-WARN_IF_DOC_ERROR = YES
-WARN_NO_PARAMDOC = NO
-WARN_FORMAT = "$file:$line: $text"
-WARN_LOGFILE =
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT = /home/tim/work/kchmviewer
-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 \
- *.dox \
- *.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_PATTERNS =
-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 = kchmviewer.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
-GROUP_GRAPHS = YES
-UML_LOOK = NO
-TEMPLATE_RELATIONS = NO
-INCLUDE_GRAPH = YES
-INCLUDED_BY_GRAPH = YES
-CALL_GRAPH = NO
-GRAPHICAL_HIERARCHY = YES
-DIRECTORY_GRAPH = YES
-DOT_IMAGE_FORMAT = png
-DOT_PATH =
-DOTFILE_DIRS =
-MAX_DOT_GRAPH_WIDTH = 1024
-MAX_DOT_GRAPH_HEIGHT = 1024
-MAX_DOT_GRAPH_DEPTH = 1000
-DOT_TRANSPARENT = NO
-DOT_MULTI_TARGETS = NO
-GENERATE_LEGEND = YES
-DOT_CLEANUP = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
-#---------------------------------------------------------------------------
-SEARCHENGINE = NO
diff --git a/kchmviewer.tdevelop b/kchmviewer.tdevelop
deleted file mode 100644
index 76a8a51..0000000
--- a/kchmviewer.tdevelop
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version = '1.0'?>
-<tdevelop>
- <general>
- <author>tim</author>
- <email>tim@krasnogorsk.ru</email>
- <version>0.1</version>
- <projectmanagement>KDevAutoProject</projectmanagement>
- <primarylanguage>C++</primarylanguage>
- <keywords>
- <keyword>C++</keyword>
- <keyword>Code</keyword>
- </keywords>
- <ignoreparts/>
- <projectdirectory>.</projectdirectory>
- <absoluteprojectpath>false</absoluteprojectpath>
- <description/>
- <versioncontrol/>
- <projectname>kchmviewer</projectname>
- <defaultencoding/>
- </general>
- <kdevautoproject>
- <general>
- <activetarget>src/kchmviewer</activetarget>
- <useconfiguration>debug</useconfiguration>
- </general>
- <run>
- <mainprogram>/home/tim/work/kchmviewer/build/src/kchmviewer</mainprogram>
- <terminal>false</terminal>
- <directoryradio>build</directoryradio>
- <runarguments>
- <kchmviewer/>
- </runarguments>
- <customdirectory>/</customdirectory>
- <programargs/>
- <autocompile>true</autocompile>
- <envvars/>
- <globaldebugarguments/>
- <globalcwd>/home/tim/work/kchmviewer/build</globalcwd>
- <useglobalprogram>false</useglobalprogram>
- <autoinstall>false</autoinstall>
- <autotdesu>false</autotdesu>
- </run>
- <configurations>
- <optimized>
- <builddir>build</builddir>
- <ccompiler>kdevgccoptions</ccompiler>
- <cxxcompiler>kdevgppoptions</cxxcompiler>
- <f77compiler>kdevg77options</f77compiler>
- <cxxflags>-O2 -g0</cxxflags>
- <envvars/>
- <configargs/>
- <topsourcedir/>
- <cppflags/>
- <ldflags/>
- <ccompilerbinary/>
- <cxxcompilerbinary/>
- <f77compilerbinary/>
- <cflags/>
- <f77flags/>
- </optimized>
- <debug>
- <configargs>--enable-debug=full --with-kde</configargs>
- <builddir>build</builddir>
- <ccompiler>kdevgccoptions</ccompiler>
- <cxxcompiler>kdevgppoptions</cxxcompiler>
- <f77compiler>kdevg77options</f77compiler>
- <cxxflags>-O0 -g3</cxxflags>
- <envvars/>
- <topsourcedir/>
- <cppflags/>
- <ldflags/>
- <ccompilerbinary/>
- <cxxcompilerbinary/>
- <f77compilerbinary/>
- <cflags>-g</cflags>
- <f77flags/>
- </debug>
- <default>
- <envvars/>
- <configargs/>
- <builddir>build</builddir>
- <topsourcedir/>
- <cppflags/>
- <ldflags/>
- <ccompiler>kdevgccoptions</ccompiler>
- <cxxcompiler>kdevgppoptions</cxxcompiler>
- <f77compiler>kdevg77options</f77compiler>
- <ccompilerbinary/>
- <cxxcompilerbinary/>
- <f77compilerbinary/>
- <cflags/>
- <cxxflags/>
- <f77flags/>
- </default>
- </configurations>
- <make>
- <envvars/>
- <abortonerror>true</abortonerror>
- <numberofjobs>1</numberofjobs>
- <dontact>false</dontact>
- <makebin/>
- <prio>0</prio>
- <runmultiplejobs>false</runmultiplejobs>
- </make>
- </kdevautoproject>
- <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>kde2book</toc>
- <toc>opengl</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>qt-kdev3</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>Guide to the Qt Translation Tools</toc>
- <toc>Qt Assistant Manual</toc>
- <toc>Qt Designer Manual</toc>
- <toc>Qt Reference Documentation</toc>
- <toc>qmake User Guide</toc>
- </ignoreqt_xml>
- <ignoredoxygen>
- <toc>KDE Libraries (Doxygen)</toc>
- </ignoredoxygen>
- </kdevdoctreeview>
- <kdevfilecreate>
- <filetypes/>
- <useglobaltypes>
- <type ext="cpp" />
- <type ext="h" />
- </useglobaltypes>
- </kdevfilecreate>
- <kdevfileview>
- <groups>
- <group pattern="*.h" name="Header files" />
- <group pattern="*.cpp" name="Source files" />
- <hidenonprojectfiles>false</hidenonprojectfiles>
- <hidenonlocation>false</hidenonlocation>
- </groups>
- <tree>
- <hidepatterns>*.o,*.lo,CVS</hidepatterns>
- <hidenonprojectfiles>false</hidenonprojectfiles>
- </tree>
- </kdevfileview>
- <kdevdocumentation>
- <projectdoc>
- <docsystem>Doxygen Documentation Collection</docsystem>
- <docurl>kchmviewer.tag</docurl>
- <usermanualurl/>
- </projectdoc>
- </kdevdocumentation>
- <substmap>
- <APPNAME>kchmviewer</APPNAME>
- <APPNAMELC>kchmviewer</APPNAMELC>
- <APPNAMESC>Kchmviewer</APPNAMESC>
- <APPNAMEUC>KCHMVIEWER</APPNAMEUC>
- <AUTHOR>tim</AUTHOR>
- <EMAIL>tim@krasnogorsk.ru</EMAIL>
- <LICENSE>GPL</LICENSE>
- <LICENSEFILE>COPYING</LICENSEFILE>
- <VERSION>0.1</VERSION>
- <YEAR>2005</YEAR>
- <dest>/home/tim/work/kchmviewer</dest>
- </substmap>
- <kdevcppsupport>
- <references/>
- <codecompletion>
- <includeGlobalFunctions>true</includeGlobalFunctions>
- <includeTypes>true</includeTypes>
- <includeEnums>true</includeEnums>
- <includeTypedefs>false</includeTypedefs>
- <automaticCodeCompletion>true</automaticCodeCompletion>
- <automaticArgumentsHint>true</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>false</processFunctionArguments>
- <preProcessAllHeaders>true</preProcessAllHeaders>
- <parseMissingHeaders>false</parseMissingHeaders>
- <resolveIncludePaths>true</resolveIncludePaths>
- <alwaysParseInBackground>true</alwaysParseInBackground>
- <usePermanentCaching>true</usePermanentCaching>
- <alwaysIncludeNamespaces>false</alwaysIncludeNamespaces>
- <includePaths>.;</includePaths>
- </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>EmbeddedKDevDesigner</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>
- <cppsupportpart>
- <filetemplates>
- <interfacesuffix>.h</interfacesuffix>
- <implementationsuffix>.cpp</implementationsuffix>
- </filetemplates>
- </cppsupportpart>
- <kdevdebugger>
- <general>
- <programargs/>
- <gdbpath/>
- <dbgshell/>
- <configGdbScript/>
- <runShellScript/>
- <runGdbScript/>
- <breakonloadinglibs>false</breakonloadinglibs>
- <separatetty>false</separatetty>
- <floatingtoolbar>false</floatingtoolbar>
- </general>
- <display>
- <staticmembers>false</staticmembers>
- <demanglenames>true</demanglenames>
- <outputradix>16</outputradix>
- </display>
- </kdevdebugger>
- <ctagspart>
- <customArguments/>
- <customTagfilePath/>
- </ctagspart>
-</tdevelop>
diff --git a/kchmviewer.tdevelop.pcs b/kchmviewer.tdevelop.pcs
deleted file mode 100644
index d41be81..0000000
--- a/kchmviewer.tdevelop.pcs
+++ /dev/null
Binary files differ
diff --git a/src/kchmbookmarkwindow.cpp b/src/kchmbookmarkwindow.cpp
index a95953c..dc1b3e4 100644
--- a/src/kchmbookmarkwindow.cpp
+++ b/src/kchmbookmarkwindow.cpp
@@ -50,29 +50,29 @@ KCHMBookmarkWindow::KCHMBookmarkWindow(TQWidget *parent, const char *name)
hlayout->addWidget (del);
connect( m_bookmarkList,
- TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int) ),
+ TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int) ),
this,
- TQT_SLOT( onDoubleClicked ( TQListViewItem *, const TQPoint &, int) ) );
+ TQ_SLOT( onDoubleClicked ( TQListViewItem *, const TQPoint &, int) ) );
connect( add,
- TQT_SIGNAL( clicked () ),
+ TQ_SIGNAL( clicked () ),
this,
- TQT_SLOT( onAddBookmarkPressed( ) ) );
+ TQ_SLOT( onAddBookmarkPressed( ) ) );
connect( del,
- TQT_SIGNAL( clicked () ),
+ TQ_SIGNAL( clicked () ),
this,
- TQT_SLOT( onDelBookmarkPressed( ) ) );
+ TQ_SLOT( onDelBookmarkPressed( ) ) );
connect( edit,
- TQT_SIGNAL( clicked () ),
+ TQ_SIGNAL( clicked () ),
this,
- TQT_SLOT( onEditBookmarkPressed( ) ) );
+ TQ_SLOT( onEditBookmarkPressed( ) ) );
connect( m_bookmarkList,
- TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ),
+ TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ),
this,
- TQT_SLOT( slotContextMenuRequested ( TQListViewItem *, const TQPoint &, int ) ) );
+ TQ_SLOT( slotContextMenuRequested ( TQListViewItem *, const TQPoint &, int ) ) );
m_menuBookmarks = 0;
m_contextMenu = 0;
@@ -198,10 +198,10 @@ void KCHMBookmarkWindow::createMenu( KCHMMainWindow * parent )
m_menuBookmarks = new KTQPopupMenu( parent );
parent->menuBar()->insertItem( i18n( "&Bookmarks"), m_menuBookmarks );
- m_menuBookmarks->insertItem( i18n( "&Add bookmark"), this, TQT_SLOT(onAddBookmarkPressed()), CTRL+Key_B );
+ m_menuBookmarks->insertItem( i18n( "&Add bookmark"), this, TQ_SLOT(onAddBookmarkPressed()), CTRL+Key_B );
m_menuBookmarks->insertSeparator();
- connect( m_menuBookmarks, TQT_SIGNAL( activated(int) ), this, TQT_SLOT ( onBookmarkSelected(int) ));
+ connect( m_menuBookmarks, TQ_SIGNAL( activated(int) ), this, TQ_SLOT ( onBookmarkSelected(int) ));
}
void KCHMBookmarkWindow::onBookmarkSelected( int bookmark )
diff --git a/src/kchmbookmarkwindow.h b/src/kchmbookmarkwindow.h
index 2a79b49..40d1c19 100644
--- a/src/kchmbookmarkwindow.h
+++ b/src/kchmbookmarkwindow.h
@@ -31,7 +31,7 @@
*/
class KCHMBookmarkWindow : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
KCHMBookmarkWindow(TQWidget *parent = 0, const char *name = 0);
diff --git a/src/kchmcontentswindow.cpp b/src/kchmcontentswindow.cpp
index 200df61..eeaef20 100644
--- a/src/kchmcontentswindow.cpp
+++ b/src/kchmcontentswindow.cpp
@@ -42,11 +42,11 @@ KCHMContentsWindow::KCHMContentsWindow(TQWidget *parent, const char *name)
header()->hide();
setShowToolTips( false );
- connect( this, TQT_SIGNAL( onItem ( TQListViewItem * ) ), this, TQT_SLOT( slotOnItem( TQListViewItem * ) ) );
+ connect( this, TQ_SIGNAL( onItem ( TQListViewItem * ) ), this, TQ_SLOT( slotOnItem( TQListViewItem * ) ) );
connect( this,
- TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ),
+ TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ),
this,
- TQT_SLOT( slotContextMenuRequested ( TQListViewItem *, const TQPoint &, int ) ) );
+ TQ_SLOT( slotContextMenuRequested ( TQListViewItem *, const TQPoint &, int ) ) );
new KCHMListItemTooltip( this );
diff --git a/src/kchmcontentswindow.h b/src/kchmcontentswindow.h
index 5c29956..83b27db 100644
--- a/src/kchmcontentswindow.h
+++ b/src/kchmcontentswindow.h
@@ -30,7 +30,7 @@
*/
class KCHMContentsWindow : public KQListView
{
- Q_OBJECT
+ TQ_OBJECT
public:
KCHMContentsWindow( TQWidget *parent = 0, const char *name = 0 );
diff --git a/src/kchmdialogchooseurlfromlist.cpp b/src/kchmdialogchooseurlfromlist.cpp
index bb50a13..a6b7738 100644
--- a/src/kchmdialogchooseurlfromlist.cpp
+++ b/src/kchmdialogchooseurlfromlist.cpp
@@ -46,11 +46,11 @@ KCHMDialogChooseUrlFromList::KCHMDialogChooseUrlFromList(const TQStringList& url
hlayout->addWidget (bok);
hlayout->addWidget (bcancel);
- connect( m_urlsList, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int) ), this, TQT_SLOT( onDoubleClicked ( TQListViewItem *, const TQPoint &, int) ) );
- connect( m_urlsList, TQT_SIGNAL( currentChanged ( TQListViewItem *) ), this, TQT_SLOT( onCurrentChanged ( TQListViewItem *) ) );
+ connect( m_urlsList, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int) ), this, TQ_SLOT( onDoubleClicked ( TQListViewItem *, const TQPoint &, int) ) );
+ connect( m_urlsList, TQ_SIGNAL( currentChanged ( TQListViewItem *) ), this, TQ_SLOT( onCurrentChanged ( TQListViewItem *) ) );
- connect( bok, TQT_SIGNAL( clicked () ), this, TQT_SLOT( accept() ) );
- connect( bcancel, TQT_SIGNAL( clicked () ), this, TQT_SLOT( reject() ) );
+ connect( bok, TQ_SIGNAL( clicked () ), this, TQ_SLOT( accept() ) );
+ connect( bcancel, TQ_SIGNAL( clicked () ), this, TQ_SLOT( reject() ) );
m_acceptedurl = TQString();
}
diff --git a/src/kchmdialogchooseurlfromlist.h b/src/kchmdialogchooseurlfromlist.h
index afe44df..d972f96 100644
--- a/src/kchmdialogchooseurlfromlist.h
+++ b/src/kchmdialogchooseurlfromlist.h
@@ -30,7 +30,7 @@
*/
class KCHMDialogChooseUrlFromList : public TQDialog
{
-Q_OBJECT
+TQ_OBJECT
public:
KCHMDialogChooseUrlFromList (const TQStringList& urls, const TQStringList& titles, TQWidget* parent);
diff --git a/src/kchmindexwindow.cpp b/src/kchmindexwindow.cpp
index b678187..061ad86 100644
--- a/src/kchmindexwindow.cpp
+++ b/src/kchmindexwindow.cpp
@@ -52,24 +52,24 @@ KCHMIndexWindow::KCHMIndexWindow ( TQWidget * parent, const char * name, WFlags
layout->addWidget (m_indexList);
connect( m_indexFinder,
- TQT_SIGNAL( textChanged (const TQString &) ),
+ TQ_SIGNAL( textChanged (const TQString &) ),
this,
- TQT_SLOT( onTextChanged(const TQString &) ) );
+ TQ_SLOT( onTextChanged(const TQString &) ) );
connect( m_indexFinder,
- TQT_SIGNAL( returnPressed() ),
+ TQ_SIGNAL( returnPressed() ),
this,
- TQT_SLOT( onReturnPressed() ) );
+ TQ_SLOT( onReturnPressed() ) );
connect( m_indexList,
- TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int) ),
+ TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int) ),
this,
- TQT_SLOT( onDoubleClicked ( TQListViewItem *, const TQPoint &, int) ) );
+ TQ_SLOT( onDoubleClicked ( TQListViewItem *, const TQPoint &, int) ) );
connect( m_indexList,
- TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ),
+ TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ),
this,
- TQT_SLOT( slotContextMenuRequested ( TQListViewItem *, const TQPoint &, int ) ) );
+ TQ_SLOT( slotContextMenuRequested ( TQListViewItem *, const TQPoint &, int ) ) );
m_indexListFilled = false;
m_lastSelectedItem = 0;
diff --git a/src/kchmindexwindow.h b/src/kchmindexwindow.h
index be2184f..69ce64c 100644
--- a/src/kchmindexwindow.h
+++ b/src/kchmindexwindow.h
@@ -32,7 +32,7 @@
*/
class KCHMIndexWindow : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
KCHMIndexWindow ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 );
diff --git a/src/kchmmainwindow.cpp b/src/kchmmainwindow.cpp
index 3361542..f6391d2 100644
--- a/src/kchmmainwindow.cpp
+++ b/src/kchmmainwindow.cpp
@@ -109,12 +109,12 @@ KCHMMainWindow::KCHMMainWindow()
#endif /* defined (ENABLE_AUTOTEST_SUPPORT) */
TQAccel * accel = new TQAccel( this );
- accel->connectItem ( accel->insertItem ( Key_F11 ), this, TQT_SLOT ( slotToggleFullScreenMode() ) );
- accel->connectItem ( accel->insertItem ( CTRL + Key_1), this, TQT_SLOT ( slotActivateContentTab() ) );
- accel->connectItem ( accel->insertItem ( CTRL + Key_2), this, TQT_SLOT ( slotActivateIndexTab() ) );
- accel->connectItem ( accel->insertItem ( CTRL + Key_3), this, TQT_SLOT ( slotActivateSearchTab() ) );
- accel->connectItem ( accel->insertItem ( CTRL + Key_4), this, TQT_SLOT ( slotActivateBookmarkTab() ) );
- accel->connectItem ( accel->insertItem ( Key_F3 ), m_searchToolbar, TQT_SLOT ( onBtnNextSearchResult() ) );
+ accel->connectItem ( accel->insertItem ( Key_F11 ), this, TQ_SLOT ( slotToggleFullScreenMode() ) );
+ accel->connectItem ( accel->insertItem ( CTRL + Key_1), this, TQ_SLOT ( slotActivateContentTab() ) );
+ accel->connectItem ( accel->insertItem ( CTRL + Key_2), this, TQ_SLOT ( slotActivateIndexTab() ) );
+ accel->connectItem ( accel->insertItem ( CTRL + Key_3), this, TQ_SLOT ( slotActivateSearchTab() ) );
+ accel->connectItem ( accel->insertItem ( CTRL + Key_4), this, TQ_SLOT ( slotActivateBookmarkTab() ) );
+ accel->connectItem ( accel->insertItem ( Key_F3 ), m_searchToolbar, TQ_SLOT ( onBtnNextSearchResult() ) );
statusBar()->show();
setIcon( *gIconStorage.getApplicationIcon() );
@@ -474,7 +474,7 @@ void KCHMMainWindow::setupToolbarsAndMenu( )
i18n( "Open File" ),
TQString(),
this,
- TQT_SLOT( slotOpenMenuItemActivated() ),
+ TQ_SLOT( slotOpenMenuItemActivated() ),
toolbar);
TQString fileOpenText = i18n( "Click this button to open an existing chm file." );
@@ -485,7 +485,7 @@ void KCHMMainWindow::setupToolbarsAndMenu( )
i18n( "Print File" ),
TQString(),
this,
- TQT_SLOT( slotPrintMenuItemActivated() ),
+ TQ_SLOT( slotPrintMenuItemActivated() ),
toolbar);
TQString filePrintText = i18n( "Click this button to print the current page");
@@ -496,30 +496,30 @@ void KCHMMainWindow::setupToolbarsAndMenu( )
menuBar()->insertItem( i18n( "&File"), file );
int id;
- id = file->insertItem ( iconFileOpen, i18n( "&Open..."), this, TQT_SLOT( slotOpenMenuItemActivated() ), CTRL+Key_O );
+ id = file->insertItem ( iconFileOpen, i18n( "&Open..."), this, TQ_SLOT( slotOpenMenuItemActivated() ), CTRL+Key_O );
file->TQMenuData::setWhatsThis( id, fileOpenText );
- id = file->insertItem( iconFilePrint, i18n( "&Print..."), this, TQT_SLOT( slotPrintMenuItemActivated() ), CTRL+Key_P );
+ id = file->insertItem( iconFilePrint, i18n( "&Print..."), this, TQ_SLOT( slotPrintMenuItemActivated() ), CTRL+Key_P );
file->TQMenuData::setWhatsThis( id, filePrintText );
file->insertSeparator();
- id = file->insertItem ( i18n( "E&xtract CHM content..."), this, TQT_SLOT( slotExtractCHM() ) );
+ id = file->insertItem ( i18n( "E&xtract CHM content..."), this, TQ_SLOT( slotExtractCHM() ) );
file->TQMenuData::setWhatsThis( id, i18n( "Click this button to extract the whole CHM file content into a specific directory") );
file->insertSeparator();
m_menuHistory = new KTQPopupMenu( file );
- connect ( m_menuHistory, TQT_SIGNAL( activated(int) ), this, TQT_SLOT ( slotHistoryMenuItemActivated(int) ));
+ connect ( m_menuHistory, TQ_SIGNAL( activated(int) ), this, TQ_SLOT ( slotHistoryMenuItemActivated(int) ));
file->insertItem( i18n( "&Recent files"), m_menuHistory );
file->insertSeparator();
- file->insertItem( i18n( "&Quit"), tqApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q );
+ file->insertItem( i18n( "&Quit"), tqApp, TQ_SLOT( closeAllWindows() ), CTRL+Key_Q );
KTQPopupMenu * menu_edit = new KTQPopupMenu( this );
menuBar()->insertItem( i18n( "&Edit"), menu_edit );
- menu_edit->insertItem ( i18n( "&Copy"), this, TQT_SLOT( slotBrowserCopy()), CTRL+Key_C );
- menu_edit->insertItem ( i18n( "&Select all"), this, TQT_SLOT( slotBrowserSelectAll()), CTRL+Key_A );
+ menu_edit->insertItem ( i18n( "&Copy"), this, TQ_SLOT( slotBrowserCopy()), CTRL+Key_C );
+ menu_edit->insertItem ( i18n( "&Select all"), this, TQ_SLOT( slotBrowserSelectAll()), CTRL+Key_A );
menu_edit->insertSeparator();
@@ -537,16 +537,16 @@ void KCHMMainWindow::setupToolbarsAndMenu( )
KTQPopupMenu * settings = new KTQPopupMenu( this );
menuBar()->insertItem( i18n( "&Settings"), settings );
- settings->insertItem( i18n( "&Change settings..."), this, TQT_SLOT( slotChangeSettingsMenuItemActivated() ));
+ settings->insertItem( i18n( "&Change settings..."), this, TQ_SLOT( slotChangeSettingsMenuItemActivated() ));
#if defined(USE_KDE)
TQPopupMenu *help = helpMenu( m_aboutDlgMenuText );
#else
KTQPopupMenu * help = new KTQPopupMenu( this );
- help->insertItem( i18n( "&About"), this, TQT_SLOT( slotAboutMenuItemActivated() ), Key_F1 );
- help->insertItem( i18n( "About &TQt"), this, TQT_SLOT( slotAboutQtMenuItemActivated() ));
+ help->insertItem( i18n( "&About"), this, TQ_SLOT( slotAboutMenuItemActivated() ), Key_F1 );
+ help->insertItem( i18n( "About &TQt"), this, TQ_SLOT( slotAboutQtMenuItemActivated() ));
help->insertSeparator();
- help->insertItem( i18n( "What's &This"), this, TQT_SLOT(whatsThis()), SHIFT+Key_F1 );
+ help->insertItem( i18n( "What's &This"), this, TQ_SLOT(whatsThis()), SHIFT+Key_F1 );
#endif
menuBar()->insertItem( i18n( "&Help"), help );
@@ -916,14 +916,14 @@ void KCHMMainWindow::showOrHideContextWindow( int tabindex )
// Handle clicking on m_contentsWindow element
connect( m_contentsWindow,
- TQT_SIGNAL( clicked( TQListViewItem* ) ),
+ TQ_SIGNAL( clicked( TQListViewItem* ) ),
this,
- TQT_SLOT( slotOnTreeClicked( TQListViewItem* ) ) );
+ TQ_SLOT( slotOnTreeClicked( TQListViewItem* ) ) );
connect( m_contentsWindow,
- TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
+ TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
this,
- TQT_SLOT( slotOnTreeDoubleClicked ( TQListViewItem *, const TQPoint &, int ) ) );
+ TQ_SLOT( slotOnTreeDoubleClicked ( TQListViewItem *, const TQPoint &, int ) ) );
m_tabWidget->insertTab (m_contentsWindow, i18n( "Contents" ), tabindex);
}
@@ -1260,7 +1260,7 @@ void KCHMMainWindow::runAutoTest()
else
m_autoteststate = STATE_OPEN_INDEX;
- TQTimer::singleShot (500, this, TQT_SLOT(runAutoTest()) );
+ TQTimer::singleShot (500, this, TQ_SLOT(runAutoTest()) );
break; // allow to finish the initialization sequence
case STATE_CONTENTS_OPENNEXTPAGE:
@@ -1272,7 +1272,7 @@ void KCHMMainWindow::runAutoTest()
else
m_autoteststate = STATE_OPEN_INDEX;
- TQTimer::singleShot (50, this, TQT_SLOT(runAutoTest()) );
+ TQTimer::singleShot (50, this, TQ_SLOT(runAutoTest()) );
break;
case STATE_OPEN_INDEX:
@@ -1280,7 +1280,7 @@ void KCHMMainWindow::runAutoTest()
m_tabWidget->setCurrentPage (1);
m_autoteststate = STATE_SHUTDOWN;
- TQTimer::singleShot (500, this, TQT_SLOT(runAutoTest()) );
+ TQTimer::singleShot (500, this, TQ_SLOT(runAutoTest()) );
break;
case STATE_SHUTDOWN:
diff --git a/src/kchmmainwindow.h b/src/kchmmainwindow.h
index a4d1127..2a44229 100644
--- a/src/kchmmainwindow.h
+++ b/src/kchmmainwindow.h
@@ -57,7 +57,7 @@ class KCHMUserEvent : public TQEvent
class KCHMMainWindow : public KQMainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/src/kchmnavtoolbar.cpp b/src/kchmnavtoolbar.cpp
index 7ebb6fc..e6215b4 100644
--- a/src/kchmnavtoolbar.cpp
+++ b/src/kchmnavtoolbar.cpp
@@ -37,7 +37,7 @@ KCHMNavToolbar::KCHMNavToolbar( KCHMMainWindow *parent )
i18n( "Move backward in history"),
TQString(),
parent,
- TQT_SLOT( slotNavigateBack() ),
+ TQ_SLOT( slotNavigateBack() ),
this);
TQWhatsThis::add( m_toolbarIconBackward, i18n( "Click this button to move backward in browser history") );
@@ -46,7 +46,7 @@ KCHMNavToolbar::KCHMNavToolbar( KCHMMainWindow *parent )
i18n( "Move forward in history"),
TQString(),
parent,
- TQT_SLOT( slotNavigateForward() ),
+ TQ_SLOT( slotNavigateForward() ),
this);
TQWhatsThis::add( m_toolbarIconForward, i18n( "Click this button to move forward in browser history") );
@@ -55,7 +55,7 @@ KCHMNavToolbar::KCHMNavToolbar( KCHMMainWindow *parent )
i18n( "Go to the home page"),
TQString(),
parent,
- TQT_SLOT( slotNavigateHome() ),
+ TQ_SLOT( slotNavigateHome() ),
this);
TQWhatsThis::add( hb, i18n( "Click this button to move to the home page") );
}
diff --git a/src/kchmnavtoolbar.h b/src/kchmnavtoolbar.h
index 6faee38..9b5d25e 100644
--- a/src/kchmnavtoolbar.h
+++ b/src/kchmnavtoolbar.h
@@ -26,7 +26,7 @@
class KCHMNavToolbar : public TQToolBar
{
-Q_OBJECT
+TQ_OBJECT
public:
KCHMNavToolbar( KCHMMainWindow *parent );
diff --git a/src/kchmsearchengine.cpp b/src/kchmsearchengine.cpp
index e9e2a35..7ef266f 100644
--- a/src/kchmsearchengine.cpp
+++ b/src/kchmsearchengine.cpp
@@ -74,9 +74,9 @@ bool KCHMSearchEngine::loadOrGenerateIndex( )
m_Index->setDocListFile( indexfiledoc );
m_progressDlg = new TQProgressDialog( 0 );
- connect( m_progressDlg, TQT_SIGNAL( canceled() ), this, TQT_SLOT( cancelButtonPressed() ) );
+ connect( m_progressDlg, TQ_SIGNAL( canceled() ), this, TQ_SLOT( cancelButtonPressed() ) );
- connect( m_Index, TQT_SIGNAL( indexingProgress( int ) ), this, TQT_SLOT( setIndexingProgress( int ) ) );
+ connect( m_Index, TQ_SIGNAL( indexingProgress( int ) ), this, TQ_SLOT( setIndexingProgress( int ) ) );
KCHMShowWaitCursor waitcursor;
TQFile f( indexfiledict );
diff --git a/src/kchmsearchengine.h b/src/kchmsearchengine.h
index b4f0402..223ac22 100644
--- a/src/kchmsearchengine.h
+++ b/src/kchmsearchengine.h
@@ -35,7 +35,7 @@ namespace QtAs { class Index; };
class KCHMSearchEngine : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/src/kchmsearchengine_impl.cpp b/src/kchmsearchengine_impl.cpp
index b57e029..0536626 100644
--- a/src/kchmsearchengine_impl.cpp
+++ b/src/kchmsearchengine_impl.cpp
@@ -72,8 +72,8 @@ Index::Index( const TQString &dp, const TQString & )
: TQObject( 0, 0 ), dict( 8999 ), docPath( dp )
{
lastWindowClosed = false;
- connect( tqApp, TQT_SIGNAL( lastWindowClosed() ),
- this, TQT_SLOT( setLastWinClosed() ) );
+ connect( tqApp, TQ_SIGNAL( lastWindowClosed() ),
+ this, TQ_SLOT( setLastWinClosed() ) );
}
Index::Index( const TQStringList &dl, const TQString & )
@@ -81,8 +81,8 @@ Index::Index( const TQStringList &dl, const TQString & )
{
docList = dl;
lastWindowClosed = false;
- connect( tqApp, TQT_SIGNAL( lastWindowClosed() ),
- this, TQT_SLOT( setLastWinClosed() ) );
+ connect( tqApp, TQ_SIGNAL( lastWindowClosed() ),
+ this, TQ_SLOT( setLastWinClosed() ) );
}
void Index::setLastWinClosed()
diff --git a/src/kchmsearchengine_impl.h b/src/kchmsearchengine_impl.h
index 7ef039f..0d3ec83 100644
--- a/src/kchmsearchengine_impl.h
+++ b/src/kchmsearchengine_impl.h
@@ -64,7 +64,7 @@ TQDataStream &operator<<( TQDataStream &s, const Document &l );
class Index : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
struct Entry
diff --git a/src/kchmsearchtoolbar.cpp b/src/kchmsearchtoolbar.cpp
index a51bb5f..2c7e272 100644
--- a/src/kchmsearchtoolbar.cpp
+++ b/src/kchmsearchtoolbar.cpp
@@ -63,18 +63,18 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
// Create the combobox to enter the find text
m_findBox = new TQComboBox (TRUE, this);
m_findBox->setMinimumWidth (200);
- connect( m_findBox->lineEdit(), TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( onReturnPressed() ) );
+ connect( m_findBox->lineEdit(), TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( onReturnPressed() ) );
TQWhatsThis::add( m_findBox, i18n( "Enter here the text to search in the current page.") );
TQAccel *acc = new TQAccel( this );
- acc->connectItem( acc->insertItem(Key_F+CTRL), this, TQT_SLOT( onAccelFocusSearchField() ) );
+ acc->connectItem( acc->insertItem(Key_F+CTRL), this, TQ_SLOT( onAccelFocusSearchField() ) );
// Button 'prevous search result'
m_buttonPrev = new TQToolButton (iconPrev,
i18n( "Previous search result"),
TQString(),
this,
- TQT_SLOT(onBtnPrevSearchResult()),
+ TQ_SLOT(onBtnPrevSearchResult()),
this);
TQWhatsThis::add( m_buttonPrev, i18n( "Click this button to find previous search result.") );
@@ -83,7 +83,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
i18n( "Next search result"),
TQString(),
this,
- TQT_SLOT(onBtnNextSearchResult()),
+ TQ_SLOT(onBtnNextSearchResult()),
this);
TQWhatsThis::add( m_buttonNext, i18n( "Click this button to find next search result.") );
@@ -92,7 +92,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
i18n( "Locate this topic in content window"),
TQString(),
this,
- TQT_SLOT( onBtnLocateInContentWindow() ),
+ TQ_SLOT( onBtnLocateInContentWindow() ),
this );
TQWhatsThis::add( m_buttonLocateInContent, i18n( "Click this button to find current topic in the content window, and open it.") );
@@ -101,7 +101,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
i18n( "Increase font size"),
TQString(),
this,
- TQT_SLOT(onBtnFontInc()),
+ TQ_SLOT(onBtnFontInc()),
this);
TQWhatsThis::add( m_buttonFontInc, i18n( "Click this button to increase the font size.") );
@@ -110,7 +110,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
i18n( "Decrease font size"),
TQString(),
this,
- TQT_SLOT(onBtnFontDec()),
+ TQ_SLOT(onBtnFontDec()),
this);
TQWhatsThis::add( m_buttonFontDec, i18n( "Click this button to decrease the font size.") );
@@ -119,7 +119,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
i18n( "View HTML source"),
TQString(),
this,
- TQT_SLOT(onBtnViewSource()),
+ TQ_SLOT(onBtnViewSource()),
this);
TQWhatsThis::add( m_buttonViewSource, i18n( "Click this button to open a separate window with the page HTML source.") );
@@ -128,7 +128,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
i18n( "Add to bookmarks"),
TQString(),
this,
- TQT_SLOT(onBtnAddBookmark()),
+ TQ_SLOT(onBtnAddBookmark()),
this);
TQWhatsThis::add( m_buttonAddBookmark, i18n( "Click this button to add the current page to the bookmarks list.") );
@@ -136,7 +136,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
i18n( "Prev page in TOC"),
TQString(),
this,
- TQT_SLOT(onBtnPrevPageInToc()),
+ TQ_SLOT(onBtnPrevPageInToc()),
this);
TQWhatsThis::add( m_buttonAddBookmark, i18n( "Click this button to go to previous page in Table Of Content.") );
@@ -144,7 +144,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
i18n( "Next page in TOC"),
TQString(),
this,
- TQT_SLOT(onBtnNextPageInToc()),
+ TQ_SLOT(onBtnNextPageInToc()),
this);
TQWhatsThis::add( m_buttonAddBookmark, i18n( "Click this button to go to next page in Table of Content.") );
@@ -152,20 +152,20 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
m_MenuView = new KTQPopupMenu( parent );
parent->menuBar()->insertItem( i18n( "&View"), m_MenuView );
- m_MenuView->insertItem( i18n( "&Increase font"), this, TQT_SLOT(onBtnFontInc()), CTRL+Key_Plus );
- m_MenuView->insertItem( i18n( "&Decrease font"), this, TQT_SLOT(onBtnFontDec()), CTRL+Key_Minus );
- m_MenuView->insertItem( i18n( "&View HTML source"), this, TQT_SLOT(onBtnViewSource()), CTRL+Key_U );
+ m_MenuView->insertItem( i18n( "&Increase font"), this, TQ_SLOT(onBtnFontInc()), CTRL+Key_Plus );
+ m_MenuView->insertItem( i18n( "&Decrease font"), this, TQ_SLOT(onBtnFontDec()), CTRL+Key_Minus );
+ m_MenuView->insertItem( i18n( "&View HTML source"), this, TQ_SLOT(onBtnViewSource()), CTRL+Key_U );
m_MenuView->insertSeparator();
- m_MenuView->insertItem( i18n( "&Bookmark this page"), this, TQT_SLOT(onBtnAddBookmark()), CTRL+Key_T );
+ m_MenuView->insertItem( i18n( "&Bookmark this page"), this, TQ_SLOT(onBtnAddBookmark()), CTRL+Key_T );
m_MenuView->insertSeparator();
m_menuShowFullscreenMenuID = m_MenuView->insertItem( i18n( "&Full screen"), this,
- TQT_SLOT(onBtnFullScreen()), Key_F11 );
+ TQ_SLOT(onBtnFullScreen()), Key_F11 );
m_menuShowContentWindowMenuID = m_MenuView->insertItem( i18n( "&Show contents window"), this,
- TQT_SLOT(onBtnToggleContentWindow()), Key_F9 );
+ TQ_SLOT(onBtnToggleContentWindow()), Key_F9 );
m_MenuView->insertItem( i18n( "&Locate in contents window"), this,
- TQT_SLOT(onBtnLocateInContentWindow()), CTRL+Key_L );
+ TQ_SLOT(onBtnLocateInContentWindow()), CTRL+Key_L );
m_MenuView->setItemChecked( m_menuShowFullscreenMenuID, false );
m_MenuView->setItemChecked( m_menuShowContentWindowMenuID, true );
@@ -177,7 +177,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
// Because the encoding menu is very large, it is not reasonable to have a slot for every item.
// It is simplier just to use a single slot for any menu item of this submenu.
- connect (menu_langlist, TQT_SIGNAL( activated(int) ), this, TQT_SLOT ( onMenuActivated(int) ));
+ connect (menu_langlist, TQ_SIGNAL( activated(int) ), this, TQ_SLOT ( onMenuActivated(int) ));
// Add the language entries
const LCHMTextEncoding * enctable = LCHMFileImpl::getTextEncodingTable();
@@ -197,7 +197,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
if ( !menu_sublang )
{
menu_sublang = new KTQPopupMenu( menu_langlist );
- connect (menu_sublang, TQT_SIGNAL( activated(int) ), this, TQT_SLOT ( onMenuActivated(int) ));
+ connect (menu_sublang, TQ_SIGNAL( activated(int) ), this, TQ_SLOT ( onMenuActivated(int) ));
}
menu_sublang->insertItem( item->sublanguage, idx );
@@ -225,7 +225,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
TQMap<TQString,bool> addedCharsets;
menu_enclist = new KTQPopupMenu( parent );
- connect (menu_enclist, TQT_SIGNAL( activated(int) ), this, TQT_SLOT ( onMenuActivated(int) ));
+ connect (menu_enclist, TQ_SIGNAL( activated(int) ), this, TQ_SLOT ( onMenuActivated(int) ));
// Add the codepage entries
for ( idx = 0; (enctable + idx)->language; idx++ )
diff --git a/src/kchmsearchtoolbar.h b/src/kchmsearchtoolbar.h
index f031cca..ec8139b 100644
--- a/src/kchmsearchtoolbar.h
+++ b/src/kchmsearchtoolbar.h
@@ -33,7 +33,7 @@
*/
class KCHMSearchAndViewToolbar : public TQToolBar
{
- Q_OBJECT
+ TQ_OBJECT
public:
KCHMSearchAndViewToolbar (KCHMMainWindow *parent);
diff --git a/src/kchmsearchwindow.cpp b/src/kchmsearchwindow.cpp
index be0122c..8d936c7 100644
--- a/src/kchmsearchwindow.cpp
+++ b/src/kchmsearchwindow.cpp
@@ -44,7 +44,7 @@ KCHMSearchWindow::KCHMSearchWindow( TQWidget * parent, const char * name, WFlags
labellayout->addStretch( 10 );
KCHMClickableLabel * helplink = new KCHMClickableLabel( i18n( "<a href=\"q\"><b>Help</b></a>"), this );
- connect( helplink, TQT_SIGNAL( clicked() ), this, TQT_SLOT( onHelpClicked() ) );
+ connect( helplink, TQ_SIGNAL( clicked() ), this, TQ_SLOT( onHelpClicked() ) );
helplink->setCursor( TQCursor( TQt::PointingHandCursor ) );
labellayout->addWidget ( helplink );
@@ -68,24 +68,24 @@ KCHMSearchWindow::KCHMSearchWindow( TQWidget * parent, const char * name, WFlags
m_searchList->setShowToolTips(true);
connect( searchButton,
- TQT_SIGNAL( clicked () ),
+ TQ_SIGNAL( clicked () ),
this,
- TQT_SLOT( onReturnPressed() ) );
+ TQ_SLOT( onReturnPressed() ) );
connect( m_searchQuery->lineEdit(),
- TQT_SIGNAL( returnPressed() ),
+ TQ_SIGNAL( returnPressed() ),
this,
- TQT_SLOT( onReturnPressed() ) );
+ TQ_SLOT( onReturnPressed() ) );
connect( m_searchList,
- TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int) ),
+ TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int) ),
this,
- TQT_SLOT( onDoubleClicked ( TQListViewItem *, const TQPoint &, int) ) );
+ TQ_SLOT( onDoubleClicked ( TQListViewItem *, const TQPoint &, int) ) );
connect( m_searchList,
- TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ),
+ TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ),
this,
- TQT_SLOT( slotContextMenuRequested ( TQListViewItem *, const TQPoint &, int ) ) );
+ TQ_SLOT( slotContextMenuRequested ( TQListViewItem *, const TQPoint &, int ) ) );
//layout->addSpacing (10);
layout->addWidget (m_searchList);
diff --git a/src/kchmsearchwindow.h b/src/kchmsearchwindow.h
index 5a068a8..c9a553f 100644
--- a/src/kchmsearchwindow.h
+++ b/src/kchmsearchwindow.h
@@ -36,7 +36,7 @@ class KCHMSearchEngine;
class KCHMClickableLabel : public TQLabel
{
- Q_OBJECT
+ TQ_OBJECT
public:
KCHMClickableLabel( const TQString& label, TQWidget * parent )
@@ -54,7 +54,7 @@ class KCHMClickableLabel : public TQLabel
class KCHMSearchWindow : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
KCHMSearchWindow ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 );
diff --git a/src/kchmsetupdialog.ui b/src/kchmsetupdialog.ui
index d15e5c5..3b90782 100644
--- a/src/kchmsetupdialog.ui
+++ b/src/kchmsetupdialog.ui
@@ -262,7 +262,7 @@
<cstring>m_groupQtsettings</cstring>
</property>
<property name="title">
- <string>Qt version settings</string>
+ <string>TQt version settings</string>
</property>
<hbox>
<property name="name">
@@ -667,9 +667,9 @@
<tabstop>buttonOk</tabstop>
<tabstop>buttonCancel</tabstop>
</tabstops>
-<Q_SLOTS>
+<slots>
<slot>m_radioUseTDEHTMLPart_toggled( bool )</slot>
<slot>slotShowHelp()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/src/kchmsetupdialog_impl.h b/src/kchmsetupdialog_impl.h
index c98b4d8..1f35dde 100644
--- a/src/kchmsetupdialog_impl.h
+++ b/src/kchmsetupdialog_impl.h
@@ -22,7 +22,7 @@
class KCHMSetupDialog_impl : public KCHMSetupDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
KCHMSetupDialog_impl( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
diff --git a/src/kchmviewwindow.cpp b/src/kchmviewwindow.cpp
index 71e0813..5edca53 100644
--- a/src/kchmviewwindow.cpp
+++ b/src/kchmviewwindow.cpp
@@ -145,8 +145,8 @@ KTQPopupMenu * KCHMViewWindow::createStandardContextMenu( TQWidget * parent )
{
KTQPopupMenu * contextMenu = new KTQPopupMenu( parent );
- contextMenu->insertItem ( "&Copy", ::mainWindow, TQT_SLOT(slotBrowserCopy()) );
- contextMenu->insertItem ( "&Select all", ::mainWindow, TQT_SLOT(slotBrowserSelectAll()) );
+ contextMenu->insertItem ( "&Copy", ::mainWindow, TQ_SLOT(slotBrowserCopy()) );
+ contextMenu->insertItem ( "&Select all", ::mainWindow, TQ_SLOT(slotBrowserSelectAll()) );
return contextMenu;
}
@@ -171,9 +171,9 @@ KTQPopupMenu * KCHMViewWindow::getContextMenu( const TQString & link, TQWidget *
m_contextMenuLink = createStandardContextMenu( parent );
m_contextMenuLink->insertSeparator();
- m_contextMenuLink->insertItem ( "&Open this link in a new tab", ::mainWindow, TQT_SLOT(slotOpenPageInNewTab()), TQKeySequence("Shift+Enter") );
+ m_contextMenuLink->insertItem ( "&Open this link in a new tab", ::mainWindow, TQ_SLOT(slotOpenPageInNewTab()), TQKeySequence("Shift+Enter") );
- m_contextMenuLink->insertItem ( "&Open this link in a new background tab", ::mainWindow, TQT_SLOT(slotOpenPageInNewBackgroundTab()), TQKeySequence("Ctrl+Enter") );
+ m_contextMenuLink->insertItem ( "&Open this link in a new background tab", ::mainWindow, TQ_SLOT(slotOpenPageInNewBackgroundTab()), TQKeySequence("Ctrl+Enter") );
}
setTabKeeper( link );
@@ -286,12 +286,12 @@ KTQPopupMenu * KCHMViewWindow::createListItemContextMenu( TQWidget * w )
contextMenu->insertItem ( "&Open this link in a new tab",
::mainWindow,
- TQT_SLOT( slotOpenPageInNewTab() ),
+ TQ_SLOT( slotOpenPageInNewTab() ),
TQKeySequence( "Shift+Enter" ) );
contextMenu->insertItem ( "&Open this link in a new background tab",
::mainWindow,
- TQT_SLOT( slotOpenPageInNewBackgroundTab() ),
+ TQ_SLOT( slotOpenPageInNewBackgroundTab() ),
TQKeySequence( "Ctrl+Enter" ) );
return contextMenu;
diff --git a/src/kchmviewwindow_qtextbrowser.cpp b/src/kchmviewwindow_qtextbrowser.cpp
index 41db166..d3f1f72 100644
--- a/src/kchmviewwindow_qtextbrowser.cpp
+++ b/src/kchmviewwindow_qtextbrowser.cpp
@@ -47,7 +47,7 @@ KCHMViewWindow_QTextBrowser::KCHMViewWindow_QTextBrowser( TQTabWidget * parent )
invalidate();
setTextFormat ( TQt::RichText );
- connect( this, TQT_SIGNAL( linkClicked (const TQString &) ), this, TQT_SLOT( slotLinkClicked(const TQString &) ) );
+ connect( this, TQ_SIGNAL( linkClicked (const TQString &) ), this, TQ_SLOT( slotLinkClicked(const TQString &) ) );
}
diff --git a/src/kchmviewwindow_qtextbrowser.h b/src/kchmviewwindow_qtextbrowser.h
index 15550cb..413b940 100644
--- a/src/kchmviewwindow_qtextbrowser.h
+++ b/src/kchmviewwindow_qtextbrowser.h
@@ -32,7 +32,7 @@
*/
class KCHMViewWindow_QTextBrowser : public TQTextBrowser, public KCHMViewWindow
{
-Q_OBJECT
+TQ_OBJECT
public:
KCHMViewWindow_QTextBrowser( TQTabWidget * parent );
@@ -75,8 +75,8 @@ public:
//! Sets the scrollbar position.
virtual void setScrollbarPosition(int pos);
- virtual TQObject * getTQObject() { return TQT_TQOBJECT(this); }
- virtual TQWidget * getTQWidget() { return TQT_TQWIDGET(this); }
+ virtual TQObject * getTQObject() { return this; }
+ virtual TQWidget * getTQWidget() { return this; }
static TQString decodeUrl( const TQString &url );
diff --git a/src/kchmviewwindowmgr.cpp b/src/kchmviewwindowmgr.cpp
index bf2bc69..ea66069 100644
--- a/src/kchmviewwindowmgr.cpp
+++ b/src/kchmviewwindowmgr.cpp
@@ -40,7 +40,7 @@ KCHMViewWindowMgr::KCHMViewWindowMgr( TQWidget *parent )
m_MenuWindow = 0;
// on current tab changed
- connect( this, TQT_SIGNAL( currentChanged(TQWidget *) ), this, TQT_SLOT( onTabChanged(TQWidget *) ) );
+ connect( this, TQ_SIGNAL( currentChanged(TQWidget *) ), this, TQ_SLOT( onTabChanged(TQWidget *) ) );
// Create an iconset for the button
TQIconSet iset( *gIconStorage.getCloseWindowIcon() );
@@ -49,7 +49,7 @@ KCHMViewWindowMgr::KCHMViewWindowMgr( TQWidget *parent )
m_closeButton = new TQPushButton( iset, TQString(), this );
m_closeButton->setFlat( true );
m_closeButton->setEnabled( false );
- connect( m_closeButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closeCurrentWindow() ) );
+ connect( m_closeButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeCurrentWindow() ) );
setCornerWidget( m_closeButton, TopRight);
}
@@ -64,11 +64,11 @@ void KCHMViewWindowMgr::createMenu( KCHMMainWindow * parent )
m_MenuWindow = new KTQPopupMenu( parent );
parent->menuBar()->insertItem( i18n( "&Window"), m_MenuWindow );
- m_menuIdClose = m_MenuWindow->insertItem( i18n( "&Close"), this, TQT_SLOT( closeCurrentWindow()), CTRL+Key_W );
+ m_menuIdClose = m_MenuWindow->insertItem( i18n( "&Close"), this, TQ_SLOT( closeCurrentWindow()), CTRL+Key_W );
m_MenuWindow->insertSeparator();
- //connect( m_MenuWindow, TQT_SIGNAL( activated(int) ), this, TQT_SLOT ( onCloseWindow(int) ));
- connect( m_MenuWindow, TQT_SIGNAL( activated(int) ), this, TQT_SLOT ( onActiveWindow(int) ));
+ //connect( m_MenuWindow, TQ_SIGNAL( activated(int) ), this, TQ_SLOT ( onCloseWindow(int) ));
+ connect( m_MenuWindow, TQ_SIGNAL( activated(int) ), this, TQ_SLOT ( onActiveWindow(int) ));
}
void KCHMViewWindowMgr::invalidate()
@@ -114,7 +114,7 @@ KCHMViewWindow * KCHMViewWindowMgr::addNewTab( bool set_active )
showPage( widget );
// Handle clicking on link in browser window
- connect( viewvnd->getTQObject(), TQT_SIGNAL( signalLinkClicked (const TQString &, bool &) ), ::mainWindow, TQT_SLOT( slotLinkClicked(const TQString &, bool &) ) );
+ connect( viewvnd->getTQObject(), TQ_SIGNAL( signalLinkClicked (const TQString &, bool &) ), ::mainWindow, TQ_SLOT( slotLinkClicked(const TQString &, bool &) ) );
return viewvnd;
}
diff --git a/src/kchmviewwindowmgr.h b/src/kchmviewwindowmgr.h
index eea46de..c2f6fc6 100644
--- a/src/kchmviewwindowmgr.h
+++ b/src/kchmviewwindowmgr.h
@@ -30,7 +30,7 @@
class KCHMViewWindowMgr : public TQTabWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
KCHMViewWindowMgr( TQWidget *parent = 0 );
diff --git a/src/main.cpp b/src/main.cpp
index 35542f4..3bfe936 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -87,7 +87,7 @@ int main( int argc, char ** argv )
mainWindow->show();
#if !defined(USE_KDE)
- app.connect( &app, TQT_SIGNAL(lastWindowClosed()), &app, TQT_SLOT(quit()) );
+ app.connect( &app, TQ_SIGNAL(lastWindowClosed()), &app, TQ_SLOT(quit()) );
#else
app.setMainWidget( mainWindow );
#endif
diff --git a/src/tde/kchmdcopiface.h b/src/tde/kchmdcopiface.h
index 6922a82..1fd2ff2 100644
--- a/src/tde/kchmdcopiface.h
+++ b/src/tde/kchmdcopiface.h
@@ -29,7 +29,7 @@
class KCHMDCOPIface : public TQObject, public DCOPObject
{
- Q_OBJECT
+ TQ_OBJECT
//
K_DCOP
diff --git a/src/tde/kchmviewwindow_tdehtmlpart.cpp b/src/tde/kchmviewwindow_tdehtmlpart.cpp
index 3a57e35..ad4a617 100644
--- a/src/tde/kchmviewwindow_tdehtmlpart.cpp
+++ b/src/tde/kchmviewwindow_tdehtmlpart.cpp
@@ -46,11 +46,11 @@ KCHMViewWindow_TDEHTMLPart::KCHMViewWindow_TDEHTMLPart( TQTabWidget * parent )
invalidate();
- connect( browserExtension(), TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ),
- this, TQT_SLOT ( onOpenURLRequest( const KURL &, const KParts::URLArgs & )) );
+ connect( browserExtension(), TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ),
+ this, TQ_SLOT ( onOpenURLRequest( const KURL &, const KParts::URLArgs & )) );
- connect( this, TQT_SIGNAL ( popupMenu ( const TQString &, const TQPoint &) ),
- this, TQT_SLOT ( onPopupMenu ( const TQString &, const TQPoint &) ) );
+ connect( this, TQ_SIGNAL ( popupMenu ( const TQString &, const TQPoint &) ),
+ this, TQ_SLOT ( onPopupMenu ( const TQString &, const TQPoint &) ) );
}
diff --git a/src/tde/kchmviewwindow_tdehtmlpart.h b/src/tde/kchmviewwindow_tdehtmlpart.h
index 0dcbe47..ee7d7d3 100644
--- a/src/tde/kchmviewwindow_tdehtmlpart.h
+++ b/src/tde/kchmviewwindow_tdehtmlpart.h
@@ -44,7 +44,7 @@
#if defined (USE_KDE)
class KCHMViewWindow_TDEHTMLPart : public TDEHTMLPart, public KCHMViewWindow
{
-Q_OBJECT
+TQ_OBJECT
public:
KCHMViewWindow_TDEHTMLPart( TQTabWidget * parent );
diff --git a/translations/desktop_files/ru.po b/translations/desktop_files/ru.po
index cc2d3e0..53a471f 100644
--- a/translations/desktop_files/ru.po
+++ b/translations/desktop_files/ru.po
@@ -1,35 +1,37 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Andrei Stepanov <adem4ik@gmail.com>, 2023.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-17 17:54+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"
+"PO-Revision-Date: 2023-12-01 10:13+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/applications/kchmviewer-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
#: kchmviewer.desktop:8
msgid "KchmViewer"
-msgstr ""
+msgstr "KchmViewer"
#. GenericName
#: kchmviewer.desktop:9
msgid "CHM (MS-Help) Viewer"
-msgstr ""
+msgstr "Программа просмотра CHM (MS-Help)"
#. Comment
#: kchmviewer.desktop:10
msgid "A viewer for CHM (MS-Help) files"
-msgstr ""
+msgstr "Просмотрщик файлов CHM (MS-Help)"
#. Description
#: msits.protocol:9
diff --git a/translations/messages/cs.po b/translations/messages/cs.po
index 43aa6eb..bf3b0e0 100644
--- a/translations/messages/cs.po
+++ b/translations/messages/cs.po
@@ -215,7 +215,7 @@ msgstr "&Změnit nastavení"
#: kchmmainwindow.cpp:547
#, fuzzy
msgid "About &TQt"
-msgstr "O &Qt"
+msgstr "O &TQt"
#: kchmmainwindow.cpp:549
msgid "What's &This"
@@ -517,7 +517,7 @@ msgid ""
"Your TQt library has been compiled without printing support"
msgstr ""
"Není možné tisknout.\n"
-"Vaše knihovna Qt byla přeložena bez podpory tisku."
+"Vaše knihovna TQt byla přeložena bez podpory tisku."
#: kchmviewwindowmgr.cpp:65
msgid "&Window"
@@ -639,8 +639,8 @@ msgstr "Zvláštní nastavení verzí"
#: kchmsetupdialog.ui:265
#, no-c-format
-msgid "Qt version settings"
-msgstr "Nastavení Qt verze"
+msgid "TQt version settings"
+msgstr "Nastavení TQt verze"
#: kchmsetupdialog.ui:287
#, no-c-format
diff --git a/translations/messages/fr.po b/translations/messages/fr.po
index b9e9815..f72462a 100644
--- a/translations/messages/fr.po
+++ b/translations/messages/fr.po
@@ -223,7 +223,7 @@ msgstr "&Modifier les paramètres..."
#: kchmmainwindow.cpp:547
#, fuzzy
msgid "About &TQt"
-msgstr "A propos de &Qt"
+msgstr "A propos de &TQt"
#: kchmmainwindow.cpp:549
msgid "What's &This"
@@ -542,7 +542,7 @@ msgid ""
"Your TQt library has been compiled without printing support"
msgstr ""
"Impossible d'imprimer.\n"
-"La librairie Qt de votre système a été compilée sans la capacité à imprimer"
+"La librairie TQt de votre système a été compilée sans la capacité à imprimer"
#: kchmviewwindowmgr.cpp:65
msgid "&Window"
@@ -665,8 +665,8 @@ msgstr "Paramètres spécifiques à la version"
#: kchmsetupdialog.ui:265
#, no-c-format
-msgid "Qt version settings"
-msgstr "Paramètres spécifiques à la version de Qt"
+msgid "TQt version settings"
+msgstr "Paramètres spécifiques à la version de TQt"
#: kchmsetupdialog.ui:287
#, no-c-format
@@ -774,36 +774,6 @@ msgstr ""
msgid "F1"
msgstr "F1"
-#~ msgid "Alt+L"
-#~ msgstr "Alt+D"
-
-#~ msgid "Alt+E"
-#~ msgstr "Alt+E"
-
-#~ msgid "Alt+Y"
-#~ msgstr "Alt+X"
-
-#~ msgid "Alt+Q"
-#~ msgstr "Alt+Q"
-
-#~ msgid "Alt+K"
-#~ msgstr "Alt+K"
-
-#~ msgid "Alt+S"
-#~ msgstr "Alt+S"
-
-#~ msgid "Alt+P"
-#~ msgstr "Alt+G"
-
-#~ msgid "Alt+J"
-#~ msgstr "Alt+J"
-
-#~ msgid "Alt+R"
-#~ msgstr "Alt+R"
-
-#~ msgid "Alt+X"
-#~ msgstr "Alt+X"
-
#, fuzzy
#~ msgid "&Bookmarks"
#~ msgstr "&Ajouter un marque-page"
diff --git a/translations/messages/hu.po b/translations/messages/hu.po
index 99b8020..444e953 100644
--- a/translations/messages/hu.po
+++ b/translations/messages/hu.po
@@ -219,7 +219,7 @@ msgstr "&Beállítások megváltoztatása"
#: kchmmainwindow.cpp:547
#, fuzzy
msgid "About &TQt"
-msgstr "&Qt névjegye"
+msgstr "&TQt névjegye"
#: kchmmainwindow.cpp:549
msgid "What's &This"
@@ -522,7 +522,7 @@ msgid ""
"Your TQt library has been compiled without printing support"
msgstr ""
"Nem nyomtatható.\n"
-"A Qt könyvtár nyomtatás támogatás nélkül lett lefordítva."
+"A TQt könyvtár nyomtatás támogatás nélkül lett lefordítva."
#: kchmviewwindowmgr.cpp:65
msgid "&Window"
@@ -645,8 +645,8 @@ msgstr "Verzió függő beállítások"
#: kchmsetupdialog.ui:265
#, no-c-format
-msgid "Qt version settings"
-msgstr "Qt verzió beállítások"
+msgid "TQt version settings"
+msgstr "TQt verzió beállítások"
#: kchmsetupdialog.ui:287
#, no-c-format
@@ -754,36 +754,6 @@ msgstr ""
msgid "F1"
msgstr "F1"
-#~ msgid "Alt+L"
-#~ msgstr "Alt+L"
-
-#~ msgid "Alt+E"
-#~ msgstr "Alt+E"
-
-#~ msgid "Alt+Y"
-#~ msgstr "Alt+Y"
-
-#~ msgid "Alt+Q"
-#~ msgstr "Alt+Q"
-
-#~ msgid "Alt+K"
-#~ msgstr "Alt+K"
-
-#~ msgid "Alt+S"
-#~ msgstr "Alt+S"
-
-#~ msgid "Alt+P"
-#~ msgstr "Alt+P"
-
-#~ msgid "Alt+J"
-#~ msgstr "Alt+J"
-
-#~ msgid "Alt+R"
-#~ msgstr "Alt+R"
-
-#~ msgid "Alt+X"
-#~ msgstr "Alt+X"
-
#, fuzzy
#~ msgid "&Edit"
#~ msgstr "Szerkesztő"
diff --git a/translations/messages/kchmviewer.pot b/translations/messages/kchmviewer.pot
index 4d11a84..323d46e 100644
--- a/translations/messages/kchmviewer.pot
+++ b/translations/messages/kchmviewer.pot
@@ -601,7 +601,7 @@ msgstr ""
#: kchmsetupdialog.ui:265
#, no-c-format
-msgid "Qt version settings"
+msgid "TQt version settings"
msgstr ""
#: kchmsetupdialog.ui:287
diff --git a/translations/messages/nl.po b/translations/messages/nl.po
index 2fddb3a..edf0ce0 100644
--- a/translations/messages/nl.po
+++ b/translations/messages/nl.po
@@ -219,7 +219,7 @@ msgstr "Instellingen wij&zigen..."
#: kchmmainwindow.cpp:547
#, fuzzy
msgid "About &TQt"
-msgstr "Over &Qt"
+msgstr "Over &TQt"
#: kchmmainwindow.cpp:549
msgid "What's &This"
@@ -533,7 +533,7 @@ msgid ""
"Your TQt library has been compiled without printing support"
msgstr ""
"Kon niet afdrukken.\n"
-"Uw Qt-bibliotheek is gecompileerd zonder ondersteuning voor afdrukken"
+"Uw TQt-bibliotheek is gecompileerd zonder ondersteuning voor afdrukken"
#: kchmviewwindowmgr.cpp:65
msgid "&Window"
@@ -656,8 +656,8 @@ msgstr "Versiespecifieke instellingen"
#: kchmsetupdialog.ui:265
#, no-c-format
-msgid "Qt version settings"
-msgstr "Qt-versie instellen"
+msgid "TQt version settings"
+msgstr "TQt-versie instellen"
#: kchmsetupdialog.ui:287
#, no-c-format
@@ -766,36 +766,6 @@ msgstr ""
msgid "F1"
msgstr "F1"
-#~ msgid "Alt+L"
-#~ msgstr "Alt+L"
-
-#~ msgid "Alt+E"
-#~ msgstr "Alt+E"
-
-#~ msgid "Alt+Y"
-#~ msgstr "Alt+Y"
-
-#~ msgid "Alt+Q"
-#~ msgstr "Alt+Q"
-
-#~ msgid "Alt+K"
-#~ msgstr "Alt+K"
-
-#~ msgid "Alt+S"
-#~ msgstr "Alt+S"
-
-#~ msgid "Alt+P"
-#~ msgstr "Alt+P"
-
-#~ msgid "Alt+J"
-#~ msgstr "Alt+J"
-
-#~ msgid "Alt+R"
-#~ msgstr "Alt+R"
-
-#~ msgid "Alt+X"
-#~ msgstr "Alt+X"
-
#, fuzzy
#~ msgid "&Bookmarks"
#~ msgstr "Bl&adwijzer toevoegen"
diff --git a/translations/messages/ru.po b/translations/messages/ru.po
index 0d27d43..45a95cb 100644
--- a/translations/messages/ru.po
+++ b/translations/messages/ru.po
@@ -5,38 +5,35 @@
# Ivan Bobrov <ibobrik@gmail.com>, 2006.
# George Yunaev <gyunaev@ulduzsoft.com>, 2006.
# Alexander Golubev <fatzer2@gmail.com>, 2021.
+# Andrei Stepanov <adem4ik@gmail.com>, 2024.
msgid ""
msgstr ""
"Project-Id-Version: rus\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-09-14 18:33+0000\n"
-"PO-Revision-Date: 2021-01-21 09:11+0000\n"
-"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
+"PO-Revision-Date: 2024-04-21 17:51+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
"projects/applications/kchmviewer/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.4.2\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"
#. 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 ""
-"_: NAME OF TRANSLATORS\n"
-"Иван Бобров"
+msgstr "Иван Бобров,Андрей Степанов"
#. 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 ""
-"_: EMAIL OF TRANSLATORS\n"
-"ibobrik@gmail.com"
+msgstr "ibobrik@gmail.com,adem4ik@gmail.com"
#: kchmbookmarkwindow.cpp:44
msgid "&Add"
@@ -225,7 +222,7 @@ msgstr "Изменить настройки"
#: kchmmainwindow.cpp:547
#, fuzzy
msgid "About &TQt"
-msgstr "О библиотеке Qt..."
+msgstr "О библиотеке TQt..."
#: kchmmainwindow.cpp:549
msgid "What's &This"
@@ -534,7 +531,7 @@ msgid ""
"Your TQt library has been compiled without printing support"
msgstr ""
"Печать невозможна.\n"
-"Ваша библиотека QT была собрана без поддержки печати."
+"Ваша библиотека TQt была собрана без поддержки печати."
#: kchmviewwindowmgr.cpp:65
msgid "&Window"
@@ -656,8 +653,8 @@ msgstr "Зависимые от версии настройки"
#: kchmsetupdialog.ui:265
#, no-c-format
-msgid "Qt version settings"
-msgstr "Настройки QT"
+msgid "TQt version settings"
+msgstr "Настройки TQt"
#: kchmsetupdialog.ui:287
#, no-c-format
diff --git a/translations/messages/tr.po b/translations/messages/tr.po
index 1fb0a38..a372147 100644
--- a/translations/messages/tr.po
+++ b/translations/messages/tr.po
@@ -527,7 +527,7 @@ msgid ""
"Your TQt library has been compiled without printing support"
msgstr ""
"Yazdırılamadı.\n"
-"Qt kütüphaneniz yazdırma desteği ile derlenmemiş"
+"TQt kütüphaneniz yazdırma desteği ile derlenmemiş"
#: kchmviewwindowmgr.cpp:65
msgid "&Window"
@@ -649,8 +649,8 @@ msgstr "Sürüme özel seçenekler"
#: kchmsetupdialog.ui:265
#, no-c-format
-msgid "Qt version settings"
-msgstr "Qt sürüm seçenekleri"
+msgid "TQt version settings"
+msgstr "TQt sürüm seçenekleri"
#: kchmsetupdialog.ui:287
#, no-c-format
@@ -758,36 +758,6 @@ msgstr ""
msgid "F1"
msgstr "F1"
-#~ msgid "Alt+L"
-#~ msgstr "Alt+L"
-
-#~ msgid "Alt+E"
-#~ msgstr "Alt+E"
-
-#~ msgid "Alt+Y"
-#~ msgstr "Alt+Y"
-
-#~ msgid "Alt+Q"
-#~ msgstr "Alt+Q"
-
-#~ msgid "Alt+K"
-#~ msgstr "Alt+K"
-
-#~ msgid "Alt+S"
-#~ msgstr "Alt+S"
-
-#~ msgid "Alt+P"
-#~ msgstr "Alt+P"
-
-#~ msgid "Alt+J"
-#~ msgstr "Alt+J"
-
-#~ msgid "Alt+R"
-#~ msgstr "Alt+R"
-
-#~ msgid "Alt+X"
-#~ msgstr "Alt+X"
-
#, fuzzy
#~ msgid "&Edit"
#~ msgstr "Düzen"
diff --git a/translations/messages/zh_CN.po b/translations/messages/zh_CN.po
index c5023b8..22f889f 100644
--- a/translations/messages/zh_CN.po
+++ b/translations/messages/zh_CN.po
@@ -637,8 +637,8 @@ msgstr "版本指定设置"
#: kchmsetupdialog.ui:265
#, no-c-format
-msgid "Qt version settings"
-msgstr "QT 版本设置"
+msgid "TQt version settings"
+msgstr "TQt 版本设置"
#: kchmsetupdialog.ui:287
#, no-c-format
@@ -744,36 +744,6 @@ msgstr ""
msgid "F1"
msgstr "F1"
-#~ msgid "Alt+L"
-#~ msgstr "Alt+L"
-
-#~ msgid "Alt+E"
-#~ msgstr "Alt+E"
-
-#~ msgid "Alt+Y"
-#~ msgstr "Alt+Y"
-
-#~ msgid "Alt+Q"
-#~ msgstr "Alt+Q"
-
-#~ msgid "Alt+K"
-#~ msgstr "Alt+K"
-
-#~ msgid "Alt+S"
-#~ msgstr "Alt+S"
-
-#~ msgid "Alt+P"
-#~ msgstr "Alt+P"
-
-#~ msgid "Alt+J"
-#~ msgstr "Alt+J"
-
-#~ msgid "Alt+R"
-#~ msgstr "Alt+R"
-
-#~ msgid "Alt+X"
-#~ msgstr "Alt+x"
-
#, fuzzy
#~ msgid "&Bookmarks"
#~ msgstr "添加书签(&A)"