diff options
Diffstat (limited to 'katapult')
53 files changed, 106 insertions, 608 deletions
diff --git a/katapult/Doxyfile b/katapult/Doxyfile deleted file mode 100644 index a5d09b3..0000000 --- a/katapult/Doxyfile +++ /dev/null @@ -1,248 +0,0 @@ -# Doxyfile 1.3.5-KDevelop - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- -PROJECT_NAME = katapult.tdevelop -PROJECT_NUMBER = 0.1 -OUTPUT_DIRECTORY = -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/doros/src/local/kde/katapult/debug/src/ -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 -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/doros/src/local/kde/katapult -FILE_PATTERNS = *.c \ - *.cc \ - *.cxx \ - *.cpp \ - *.c++ \ - *.java \ - *.ii \ - *.ixx \ - *.ipp \ - *.i++ \ - *.inl \ - *.h \ - *.hh \ - *.hxx \ - *.hpp \ - *.h++ \ - *.idl \ - *.odl \ - *.cs \ - *.php \ - *.php3 \ - *.inc \ - *.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 = -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 diff --git a/katapult/common/actionregistry.h b/katapult/common/actionregistry.h index db9e6e6..58f50ab 100644 --- a/katapult/common/actionregistry.h +++ b/katapult/common/actionregistry.h @@ -33,7 +33,7 @@ class KatapultAction; /** @author Joe Ferris */ -class KDE_EXPORT ActionRegistry{ +class TDE_EXPORT ActionRegistry{ public: ~ActionRegistry(); diff --git a/katapult/common/cachedcatalog.h b/katapult/common/cachedcatalog.h index 291b0d3..b41afd5 100644 --- a/katapult/common/cachedcatalog.h +++ b/katapult/common/cachedcatalog.h @@ -30,9 +30,9 @@ class KatapultItem; /** @author Joe Ferris */ -class KDE_EXPORT CachedCatalog : public KatapultCatalog +class TDE_EXPORT CachedCatalog : public KatapultCatalog { - Q_OBJECT + TQ_OBJECT public: CachedCatalog(); diff --git a/katapult/common/imagedisplay.cpp b/katapult/common/imagedisplay.cpp index 3aaf7e2..9350960 100644 --- a/katapult/common/imagedisplay.cpp +++ b/katapult/common/imagedisplay.cpp @@ -51,7 +51,7 @@ ImageDisplay::ImageDisplay(TQObject *, const char *name, const TQStringList&) { KWin::setType(winId(), NET::Dock); setBackgroundMode(NoBackground); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); singlebg = 0; doublebg = 0; @@ -74,7 +74,7 @@ ImageDisplay::ImageDisplay(TQObject *, const char *name, const TQStringList&) alpha = 0; fadeTimer = new TQTimer(this); - connect(fadeTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(continueFade())); + connect(fadeTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(continueFade())); desktopSize = tqApp->desktop()->availableGeometry(TQCursor::pos()); @@ -408,16 +408,16 @@ TQWidget * ImageDisplay::configure() ImageDisplaySettings *settings = new ImageDisplaySettings(); settings->fadeTime->setValue(fadeTime); - connect(settings->fadeTime, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setFadeOut(int))); + connect(settings->fadeTime, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setFadeOut(int))); settings->displayFont->setCurrentFont(fontFace); - connect(settings->displayFont, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(setFont(const TQString &))); + connect(settings->displayFont, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(setFont(const TQString &))); settings->minFontSize->setValue(minFontSize); - connect(settings->minFontSize, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setMinFontSize(int))); + connect(settings->minFontSize, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setMinFontSize(int))); settings->maxFontSize->setValue(maxFontSize); - connect(settings->maxFontSize, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setMaxFontSize(int))); + connect(settings->maxFontSize, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setMaxFontSize(int))); return settings; } diff --git a/katapult/common/imagedisplay.h b/katapult/common/imagedisplay.h index aa99895..c8c408a 100644 --- a/katapult/common/imagedisplay.h +++ b/katapult/common/imagedisplay.h @@ -33,9 +33,9 @@ class TQFont; /** @author Joe Ferris, Bastian Holst */ -class KDE_EXPORT ImageDisplay : public KatapultDisplay +class TDE_EXPORT ImageDisplay : public KatapultDisplay { - Q_OBJECT + TQ_OBJECT public: ImageDisplay(TQObject *, const char *, const TQStringList&); diff --git a/katapult/common/katapultaction.h b/katapult/common/katapultaction.h index fd198a8..840717c 100644 --- a/katapult/common/katapultaction.h +++ b/katapult/common/katapultaction.h @@ -34,7 +34,7 @@ class KatapultItem; /** @author Joe Ferris */ -class KDE_EXPORT KatapultAction { +class TDE_EXPORT KatapultAction { public: virtual ~KatapultAction(); diff --git a/katapult/common/katapultcatalog.h b/katapult/common/katapultcatalog.h index 2f717d3..e2aedd8 100644 --- a/katapult/common/katapultcatalog.h +++ b/katapult/common/katapultcatalog.h @@ -32,8 +32,8 @@ class TDEConfigBase; /** @author Joe Ferris */ -class KDE_EXPORT KatapultCatalog : public TQObject { - Q_OBJECT +class TDE_EXPORT KatapultCatalog : public TQObject { + TQ_OBJECT public: diff --git a/katapult/common/katapultdisplay.h b/katapult/common/katapultdisplay.h index 320f393..846d854 100644 --- a/katapult/common/katapultdisplay.h +++ b/katapult/common/katapultdisplay.h @@ -33,9 +33,9 @@ class TDEConfigBase; /** @author Joe Ferris */ -class KDE_EXPORT KatapultDisplay : public TQWidget +class TDE_EXPORT KatapultDisplay : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/katapult/common/katapultitem.h b/katapult/common/katapultitem.h index 1720d6c..5dc90ca 100644 --- a/katapult/common/katapultitem.h +++ b/katapult/common/katapultitem.h @@ -30,8 +30,8 @@ class TQString; /** @author Joe Ferris */ -class KDE_EXPORT KatapultItem : public TQObject { - Q_OBJECT +class TDE_EXPORT KatapultItem : public TQObject { + TQ_OBJECT public: diff --git a/katapult/common/match.h b/katapult/common/match.h index fa0eccb..c94035d 100644 --- a/katapult/common/match.h +++ b/katapult/common/match.h @@ -31,7 +31,7 @@ class KatapultItem; /** @author Joe Ferris */ -class KDE_EXPORT Match { +class TDE_EXPORT Match { public: Match(); Match(const KatapultItem *, int, unsigned int); diff --git a/katapult/katapult.kdevses b/katapult/katapult.kdevses deleted file mode 100644 index a9a8c53..0000000 --- a/katapult/katapult.kdevses +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version = '1.0' encoding = 'UTF-8'?> -<!DOCTYPE KDevPrjSession> -<KDevPrjSession> - <DocsAndViews NumberOfDocuments="3" > - <Doc0 NumberOfViews="1" URL="file:///home/bastian/programmieren/katapult/trunk/katapult/katapult/katapult.cpp" > - <View0 Type="Source" /> - </Doc0> - <Doc1 NumberOfViews="1" URL="file:///home/bastian/programmieren/katapult/trunk/katapult/katapult/katapult.h" > - <View0 line="58" Type="Source" /> - </Doc1> - <Doc2 NumberOfViews="1" URL="file:///home/bastian/programmieren/katapult/trunk/katapult/katapult/main.cpp" > - <View0 line="57" Type="Source" /> - </Doc2> - </DocsAndViews> - <pluginList> - <kdevdebugger> - <breakpointList/> - </kdevdebugger> - <kdevbookmarks> - <bookmarks/> - </kdevbookmarks> - <kdevrbdebugger> - <breakpointList/> - <watchExpressions/> - </kdevrbdebugger> - <kdevvalgrind> - <executable path="" params="" /> - <valgrind path="" params="" /> - <calltree path="" params="" /> - <tdecachegrind path="" /> - </kdevvalgrind> - </pluginList> -</KDevPrjSession> diff --git a/katapult/katapult.tdevelop b/katapult/katapult.tdevelop deleted file mode 100644 index 23b3caa..0000000 --- a/katapult/katapult.tdevelop +++ /dev/null @@ -1,221 +0,0 @@ -<?xml version = '1.0'?> -<tdevelop> - <general> - <author>Joe Ferris</author> - <email>jferris@optimistictech.com</email> - <version>0.1</version> - <projectmanagement>KDevKDEAutoProject</projectmanagement> - <primarylanguage>C++</primarylanguage> - <keywords> - <keyword>C++</keyword> - <keyword>Code</keyword> - <keyword>Qt</keyword> - <keyword>KDE</keyword> - </keywords> - <projectdirectory>.</projectdirectory> - <absoluteprojectpath>false</absoluteprojectpath> - <description/> - <ignoreparts> - <part>KDevVisualBoyAdvance</part> - </ignoreparts> - <secondaryLanguages/> - </general> - <kdevautoproject> - <general> - <activetarget>katapult/katapult</activetarget> - <useconfiguration>default</useconfiguration> - <useactivetarget>true</useactivetarget> - </general> - <run> - <mainprogram>katapult</mainprogram> - <directoryradio>executable</directoryradio> - <customdirectory>/usr/bin/</customdirectory> - <programargs/> - <terminal>false</terminal> - <autocompile>true</autocompile> - <envvars/> - </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 --prefix=/usr</configargs> - <builddir>debug</builddir> - <ccompiler>kdevgccoptions</ccompiler> - <cxxcompiler>kdevgppoptions</cxxcompiler> - <f77compiler>kdevg77options</f77compiler> - <cxxflags>-O0 -g3</cxxflags> - <envvars/> - <topsourcedir/> - <cppflags/> - <ldflags/> - <ccompilerbinary/> - <cxxcompilerbinary/> - <f77compilerbinary/> - <cflags/> - <f77flags/> - </debug> - <default> - <configargs>--prefix=/usr</configargs> - <builddir/> - <topsourcedir/> - <cppflags/> - <ldflags/> - <ccompiler>kdevgccoptions</ccompiler> - <cxxcompiler>kdevgppoptions</cxxcompiler> - <f77compiler>kdevpgf77options</f77compiler> - <ccompilerbinary/> - <cxxcompilerbinary/> - <f77compilerbinary/> - <cflags/> - <cxxflags/> - <f77flags/> - </default> - </configurations> - <make> - <envvars> - <envvar value="1" name="WANT_AUTOCONF_2_5" /> - <envvar value="1" name="WANT_AUTOMAKE_1_6" /> - </envvars> - <abortonerror>false</abortonerror> - <numberofjobs>1</numberofjobs> - <dontact>false</dontact> - <makebin/> - <prio>0</prio> - </make> - </kdevautoproject> - <kdevfileview> - <groups> - <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> - </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>libtool</dbgshell> - <programargs/> - <gdbpath/> - <configGdbScript/> - <runShellScript/> - <runGdbScript/> - <breakonloadinglibs>true</breakonloadinglibs> - <separatetty>false</separatetty> - <floatingtoolbar>false</floatingtoolbar> - </general> - <display> - <staticmembers>false</staticmembers> - <demanglenames>true</demanglenames> - <outputradix>10</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>true</automaticCodeCompletion> - <automaticArgumentsHint>true</automaticArgumentsHint> - <automaticHeaderCompletion>true</automaticHeaderCompletion> - <codeCompletionDelay>250</codeCompletionDelay> - <argumentsHintDelay>400</argumentsHintDelay> - <headerCompletionDelay>250</headerCompletionDelay> - </codecompletion> - </kdevcppsupport> - <cppsupportpart> - <filetemplates> - <interfacesuffix>.h</interfacesuffix> - <implementationsuffix>.cpp</implementationsuffix> - </filetemplates> - </cppsupportpart> - <dist> - <custom>false</custom> - <bzip>false</bzip> - <archname/> - <appname>katapult.tdevelop</appname> - <version>0.1</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> - <kdevdocumentation> - <projectdoc> - <docsystem/> - <docurl/> - <usermanualurl/> - </projectdoc> - </kdevdocumentation> -</tdevelop> diff --git a/katapult/katapult/katapult.cpp b/katapult/katapult/katapult.cpp index 7c4a43b..6205c4b 100644 --- a/katapult/katapult/katapult.cpp +++ b/katapult/katapult/katapult.cpp @@ -62,16 +62,16 @@ Katapult::Katapult() settings = new KatapultSettings(); helpmenu = new KHelpMenu(this,TQString(),false); - connect(helpmenu, TQT_SIGNAL(showAboutApplication()),this, TQT_SLOT(showAboutDialog())); + connect(helpmenu, TQ_SIGNAL(showAboutApplication()),this, TQ_SLOT(showAboutDialog())); hideTimer = new TQTimer(this); - connect(hideTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(hideLauncher())); + connect(hideTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(hideLauncher())); clearTimer = new TQTimer(this); - connect(clearTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(clearQuery())); + connect(clearTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(clearQuery())); - connect(settings, TQT_SIGNAL(catalogsChanged()), TQT_TQOBJECT(this), TQT_SLOT(loadCatalogPlugins())); - connect(settings, TQT_SIGNAL(displayChanged()), TQT_TQOBJECT(this), TQT_SLOT(initDisplay())); - connect(settings, TQT_SIGNAL(systrayChanged()), TQT_TQOBJECT(this), TQT_SLOT(updateSystray())); + connect(settings, TQ_SIGNAL(catalogsChanged()), this, TQ_SLOT(loadCatalogPlugins())); + connect(settings, TQ_SIGNAL(displayChanged()), this, TQ_SLOT(initDisplay())); + connect(settings, TQ_SIGNAL(systrayChanged()), this, TQ_SLOT(updateSystray())); loadCatalogPlugins(); initDisplay(); @@ -111,16 +111,16 @@ void Katapult::initDisplay() } else { initAccel(display); setQuery(""); - connect(display, TQT_SIGNAL(keyReleased(TQKeyEvent *)), TQT_TQOBJECT(this), TQT_SLOT(keyReleased(TQKeyEvent *))); - connect(display, TQT_SIGNAL(focusOut()), TQT_TQOBJECT(this), TQT_SLOT(hideLauncher())); + connect(display, TQ_SIGNAL(keyReleased(TQKeyEvent *)), this, TQ_SLOT(keyReleased(TQKeyEvent *))); + connect(display, TQ_SIGNAL(focusOut()), this, TQ_SLOT(hideLauncher())); } } void Katapult::initAccel(TQWidget *parent) { - globalAccel = new TDEGlobalAccel(TQT_TQOBJECT(parent)); + globalAccel = new TDEGlobalAccel(parent); globalAccel->insert("show_katapult", i18n("Show Launcher"), i18n("Shows the Katapult launcher"), ALT+Key_Space, ALT+Key_Space, - TQT_TQOBJECT(this), TQT_SLOT(showLauncher())); + this, TQ_SLOT(showLauncher())); globalAccel->readSettings(); globalAccel->updateConnections(); @@ -129,23 +129,23 @@ void Katapult::initAccel(TQWidget *parent) contextMenu()->clear(); - new TDEAction(i18n("Execute"), "application-x-executable", Key_Return, TQT_TQOBJECT(this), TQT_SLOT(execute()), actions, "execute"); - new TDEAction(i18n("Clear"), "edit-clear", Key_Left, TQT_TQOBJECT(this), TQT_SLOT(clearQuery()), actions, "clear"); - new TDEAction(i18n("Close"), "window-close", Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(hideLauncher()), actions, "close"); - new TDEAction(i18n("Complete Query"), "next", Key_Right, TQT_TQOBJECT(this), TQT_SLOT(completeQuery()), actions, "complete_query"); - new TDEAction(i18n("Show Context Menu"), "menu", CTRL+Key_C, TQT_TQOBJECT(this), TQT_SLOT(showContextMenu()), actions, "show_menu"); + new TDEAction(i18n("Execute"), "application-x-executable", Key_Return, this, TQ_SLOT(execute()), actions, "execute"); + new TDEAction(i18n("Clear"), "edit-clear", Key_Left, this, TQ_SLOT(clearQuery()), actions, "clear"); + new TDEAction(i18n("Close"), "window-close", Key_Escape, this, TQ_SLOT(hideLauncher()), actions, "close"); + new TDEAction(i18n("Complete Query"), "next", Key_Right, this, TQ_SLOT(completeQuery()), actions, "complete_query"); + new TDEAction(i18n("Show Context Menu"), "menu", CTRL+Key_C, this, TQ_SLOT(showContextMenu()), actions, "show_menu"); - TDEAction *actGlobAccel = KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(showGlobalShortcutsDialog()), actions); + TDEAction *actGlobAccel = KStdAction::keyBindings(this, TQ_SLOT(showGlobalShortcutsDialog()), actions); actGlobAccel->setText(i18n("Configure &Global Shortcuts...")); actGlobAccel->plug((TQWidget *) contextMenu()); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(showShortcutsDialog()), actions)->plug((TQWidget *) contextMenu()); - KStdAction::preferences(settings, TQT_SLOT(configure()), actions)->plug((TQWidget *) contextMenu()); + KStdAction::keyBindings(this, TQ_SLOT(showShortcutsDialog()), actions)->plug((TQWidget *) contextMenu()); + KStdAction::preferences(settings, TQ_SLOT(configure()), actions)->plug((TQWidget *) contextMenu()); contextMenu()->insertItem(SmallIconSet("help"), KStdGuiItem::help().text(), helpmenu->menu()); contextMenu()->insertSeparator(); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actions)->plug((TQWidget *) contextMenu()); + KStdAction::quit(this, TQ_SLOT(close()), actions)->plug((TQWidget *) contextMenu()); actions->readShortcutSettings(); } @@ -218,7 +218,7 @@ void Katapult::setQuery(TQString _query) if(!bestMatch.isNull()) { TQPtrList<KatapultAction> itemActions = ActionRegistry::self()->actionsForItem(bestMatch.item()); action = itemActions.at(0); - connect(bestMatch.item(), TQT_SIGNAL(itemChanged()), TQT_TQOBJECT(this), TQT_SLOT(updateDisplay())); + connect(bestMatch.item(), TQ_SIGNAL(itemChanged()), this, TQ_SLOT(updateDisplay())); } } if(!(allStatus & S_HasResults) && allStatus & S_Active) { @@ -353,7 +353,7 @@ void Katapult::keyReleased(TQKeyEvent *e) void Katapult::mousePressEvent(TQMouseEvent *e) { - if(e->button() == Qt::LeftButton) + if(e->button() == TQt::LeftButton) showLauncher(); else KSystemTray::mousePressEvent(e); diff --git a/katapult/katapult/katapult.h b/katapult/katapult/katapult.h index 94ae078..173728f 100644 --- a/katapult/katapult/katapult.h +++ b/katapult/katapult/katapult.h @@ -48,7 +48,7 @@ class KatapultSettings; class Katapult : public KSystemTray, virtual public KatapultIface { - Q_OBJECT + TQ_OBJECT public: Katapult(); diff --git a/katapult/katapult/katapultconfigdlg.cpp b/katapult/katapult/katapultconfigdlg.cpp index 2ca0fb7..ede7321 100644 --- a/katapult/katapult/katapultconfigdlg.cpp +++ b/katapult/katapult/katapultconfigdlg.cpp @@ -60,7 +60,7 @@ KatapultConfigDlg::KatapultConfigDlg(KatapultSettings *settings) case KatapultSettings::NR_HideDisplay: general->nrHideDisplay->setChecked(TRUE); break; default: general->nrClearQuery->setChecked(TRUE); break; } - connect(general->nrDoNothing, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(nrDoNothingToggled(bool))); + connect(general->nrDoNothing, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(nrDoNothingToggled(bool))); general->noResultsDelay->setEnabled(!general->nrDoNothing->isChecked()); // catalog settings @@ -98,10 +98,10 @@ KatapultConfigDlg::KatapultConfigDlg(KatapultSettings *settings) unfoldTreeList(TRUE); // connect signals - connect(catalogConf->catalogs, TQT_SIGNAL(added(TQListBoxItem *)), this, TQT_SLOT(activateCatalog(TQListBoxItem* ))); - connect(catalogConf->catalogs, TQT_SIGNAL(removed(TQListBoxItem *)), this, TQT_SLOT(deactivateCatalog(TQListBoxItem* ))); - connect(display->displayName, TQT_SIGNAL(activated(int)), this, TQT_SLOT(activateDisplay(int))); - connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(saveSettings())); + connect(catalogConf->catalogs, TQ_SIGNAL(added(TQListBoxItem *)), this, TQ_SLOT(activateCatalog(TQListBoxItem* ))); + connect(catalogConf->catalogs, TQ_SIGNAL(removed(TQListBoxItem *)), this, TQ_SLOT(deactivateCatalog(TQListBoxItem* ))); + connect(display->displayName, TQ_SIGNAL(activated(int)), this, TQ_SLOT(activateDisplay(int))); + connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(saveSettings())); } KatapultConfigDlg::~KatapultConfigDlg() diff --git a/katapult/katapult/katapultconfigdlg.h b/katapult/katapult/katapultconfigdlg.h index 55e1a77..afb8362 100644 --- a/katapult/katapult/katapultconfigdlg.h +++ b/katapult/katapult/katapultconfigdlg.h @@ -37,7 +37,7 @@ class TQFrame; */ class KatapultConfigDlg : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: KatapultConfigDlg(KatapultSettings *settings); diff --git a/katapult/katapult/katapultsettings.h b/katapult/katapult/katapultsettings.h index f6e5257..f004c1a 100644 --- a/katapult/katapult/katapultsettings.h +++ b/katapult/katapult/katapultsettings.h @@ -34,7 +34,7 @@ class TQString; */ class KatapultSettings : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum NRAction { diff --git a/katapult/katapult/settings.cpp b/katapult/katapult/settings.cpp index 002aee6..062f52e 100644 --- a/katapult/katapult/settings.cpp +++ b/katapult/katapult/settings.cpp @@ -54,8 +54,8 @@ MyDialog1::MyDialog1( TQWidget* parent, const char* name, bool modal, WFlags fl buttonHelp = new TQPushButton( this, "buttonHelp" ); buttonHelp->setAutoDefault( TRUE ); Layout1->addWidget( buttonHelp ); - Qt::Horizontal_Spacing2 = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - Layout1->addItem(Qt::Horizontal_Spacing2 ); + TQt::Horizontal_Spacing2 = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + Layout1->addItem(TQt::Horizontal_Spacing2 ); buttonOk = new TQPushButton( this, "buttonOk" ); buttonOk->setAutoDefault( TRUE ); @@ -72,8 +72,8 @@ MyDialog1::MyDialog1( TQWidget* parent, const char* name, bool modal, WFlags fl clearWState( WState_Polished ); // signals and slots connections - connect( buttonOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); - connect( buttonCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) ); + connect( buttonOk, TQ_SIGNAL( clicked() ), this, TQ_SLOT( accept() ) ); + connect( buttonCancel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( reject() ) ); } /* diff --git a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp index 071a265..e05c2c7 100644 --- a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp +++ b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp @@ -104,7 +104,7 @@ void AmarokCatalog::queryChanged() newStatus = 0; } else { TQDataStream reply(replyData, IO_ReadOnly); - if (replyType == TQSTRINGLIST_OBJECT_NAME_STRING) { + if (replyType == "TQStringList") { TQStringList sqlResult; reply >> sqlResult; @@ -179,7 +179,7 @@ void AmarokCatalog::queryChanged() newStatus = 0; } else { TQDataStream reply(replyData, IO_ReadOnly); - if (replyType == TQSTRINGLIST_OBJECT_NAME_STRING) { + if (replyType == "TQStringList") { TQStringList sqlResult; reply >> sqlResult; @@ -281,7 +281,7 @@ void AmarokCatalog::checkCollectionType() else { TQDataStream reply(replyData, IO_ReadOnly); - if (replyType == TQSTRINGLIST_OBJECT_NAME_STRING) + if (replyType == "TQStringList") { TQStringList sqlResult; reply >> sqlResult; @@ -322,7 +322,7 @@ TQWidget * AmarokCatalog::configure() AmarokCatalogSettings *settings = new AmarokCatalogSettings(); settings->minQueryLen->setValue(_minQueryLen); - connect(settings->minQueryLen, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(minQueryLenChanged(int))); + connect(settings->minQueryLen, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(minQueryLenChanged(int))); return settings; } diff --git a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h index 888fb57..86f7e2e 100644 --- a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h +++ b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h @@ -33,7 +33,7 @@ class TQString; */ class AmarokCatalog : public KatapultCatalog { - Q_OBJECT + TQ_OBJECT public: AmarokCatalog(TQObject*, const char*, const TQStringList&); diff --git a/katapult/plugins/catalogs/amarokcatalog/coverimage.cpp b/katapult/plugins/catalogs/amarokcatalog/coverimage.cpp index 174d492..03a918e 100644 --- a/katapult/plugins/catalogs/amarokcatalog/coverimage.cpp +++ b/katapult/plugins/catalogs/amarokcatalog/coverimage.cpp @@ -64,7 +64,7 @@ TQImage CoverImage::load(int size) const if ( !image.isNull() ) { TQString savepath(_cachefolder); savepath.append(TQString::number ( size )).append("@").append(md5sum.hexDigest()); - image = image.smoothScale(size, size, TQ_ScaleMin); + image = image.smoothScale(size, size, TQImage::ScaleMin); if ( !url().isEmpty() ) { image.save( savepath, TQImage::imageFormat ( url() )); } else { diff --git a/katapult/plugins/catalogs/amarokcatalog/song.h b/katapult/plugins/catalogs/amarokcatalog/song.h index 567337a..fbde630 100644 --- a/katapult/plugins/catalogs/amarokcatalog/song.h +++ b/katapult/plugins/catalogs/amarokcatalog/song.h @@ -31,7 +31,7 @@ */ class Song : public KatapultItem { - Q_OBJECT + TQ_OBJECT public: Song(const TQString&); diff --git a/katapult/plugins/catalogs/bookmarkcatalog/bookmark.h b/katapult/plugins/catalogs/bookmarkcatalog/bookmark.h index f0bf8c8..1c31507 100644 --- a/katapult/plugins/catalogs/bookmarkcatalog/bookmark.h +++ b/katapult/plugins/catalogs/bookmarkcatalog/bookmark.h @@ -29,7 +29,7 @@ */ class Bookmark : public KatapultItem { - Q_OBJECT + TQ_OBJECT public: Bookmark(KBookmark); diff --git a/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.cpp b/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.cpp index 9977e19..b41dcc3 100644 --- a/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.cpp +++ b/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.cpp @@ -165,18 +165,18 @@ TQWidget * BookmarkCatalog::configure() settings = new BookmarkCatalogSettings(); settings->minQueryLen->setValue(_minQueryLen); - connect(settings->minQueryLen, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(minQueryLenChanged(int))); + connect(settings->minQueryLen, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(minQueryLenChanged(int))); settings->mozEnabled->setChecked(_mozEnabled); - connect(settings->mozEnabled, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(toggleMozEnabled(bool))); + connect(settings->mozEnabled, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(toggleMozEnabled(bool))); settings->mozAuto->setChecked(_mozAuto); - connect(settings->mozAuto, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(toggleMozAuto(bool))); + connect(settings->mozAuto, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(toggleMozAuto(bool))); settings->mozManual->setChecked(!_mozAuto); settings->mozFile->setURL(_mozFile); - connect(settings->mozFile, TQT_SIGNAL(urlSelected(const TQString &)), this, TQT_SLOT(changeMozFile(const TQString &))); + connect(settings->mozFile, TQ_SIGNAL(urlSelected(const TQString &)), this, TQ_SLOT(changeMozFile(const TQString &))); settings->mozAuto->setEnabled(_mozEnabled); settings->mozManual->setEnabled(_mozEnabled); diff --git a/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.h b/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.h index 05739f4..36fb96d 100644 --- a/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.h +++ b/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.h @@ -37,7 +37,7 @@ class BookmarkCatalogSettings; */ class BookmarkCatalog : public CachedCatalog { - Q_OBJECT + TQ_OBJECT public: BookmarkCatalog(TQObject *, const char *, const TQStringList&); diff --git a/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.h b/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.h index 23876d4..e45e722 100644 --- a/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.h +++ b/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.h @@ -29,7 +29,7 @@ */ class MozillaBookmark : public KatapultItem { - Q_OBJECT + TQ_OBJECT public: MozillaBookmark(TQString, TQString, TQPixmap); diff --git a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp index dab3295..45d2ec6 100644 --- a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp +++ b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp @@ -279,21 +279,21 @@ TQWidget * CalculatorCatalog::configure() CalculatorCatalogSettings* settings = new CalculatorCatalogSettings(); settings->fracDigits->setValue(_fracDigits); - connect(settings->fracDigits, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(fracDigitsChanged(int))); + connect(settings->fracDigits, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(fracDigitsChanged(int))); settings->normal->setChecked(!scientific()); settings->scientific->setChecked(scientific()); - connect(settings->scientific, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(scientificChanged(bool))); + connect(settings->scientific, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(scientificChanged(bool))); settings->radians->setChecked(!degrees()); settings->degrees->setChecked(degrees()); - connect(settings->degrees, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(degreesChanged(bool))); + connect(settings->degrees, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(degreesChanged(bool))); settings->clipboard->setChecked(clipboard()); - connect(settings->clipboard, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(clipboardChanged(bool))); + connect(settings->clipboard, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(clipboardChanged(bool))); settings->formatString->setText(formatString()); - connect(settings->formatString, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(formatStringChanged(const TQString&))); + connect(settings->formatString, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(formatStringChanged(const TQString&))); return settings; } diff --git a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.h b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.h index 6e951a2..39ee9cb 100644 --- a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.h +++ b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.h @@ -42,7 +42,7 @@ typedef double (*FunPtr)(double); */ class CalculatorCatalog : public KatapultCatalog { - Q_OBJECT + TQ_OBJECT public: diff --git a/katapult/plugins/catalogs/calculatorcatalog/expression.h b/katapult/plugins/catalogs/calculatorcatalog/expression.h index d950b76..c5c976e 100644 --- a/katapult/plugins/catalogs/calculatorcatalog/expression.h +++ b/katapult/plugins/catalogs/calculatorcatalog/expression.h @@ -32,7 +32,7 @@ class CalculatorCatalog; */ class Expression : public KatapultItem { - Q_OBJECT + TQ_OBJECT public: Expression(CalculatorCatalog*, const TQString&); diff --git a/katapult/plugins/catalogs/documentcatalog/directory.h b/katapult/plugins/catalogs/documentcatalog/directory.h index 0a6d44b..47246aa 100644 --- a/katapult/plugins/catalogs/documentcatalog/directory.h +++ b/katapult/plugins/catalogs/documentcatalog/directory.h @@ -27,7 +27,7 @@ */ class Directory : public Document { -Q_OBJECT +TQ_OBJECT public: Directory(TQString, TQString); diff --git a/katapult/plugins/catalogs/documentcatalog/document.cpp b/katapult/plugins/catalogs/documentcatalog/document.cpp index 8643264..ee87f4c 100644 --- a/katapult/plugins/catalogs/documentcatalog/document.cpp +++ b/katapult/plugins/catalogs/documentcatalog/document.cpp @@ -50,8 +50,8 @@ TQPixmap Document::icon(int size) const { doc=TDEIO::filePreview(u,size); - connect(doc, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), - TQT_SLOT(gotPreview(const KFileItem*, const TQPixmap&))); + connect(doc, TQ_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), + TQ_SLOT(gotPreview(const KFileItem*, const TQPixmap&))); if(this->_gotpix)return this->_pix; return KMimeType::pixmapForURL(u,0, TDEIcon::NoGroup, size, TDEIcon::DefaultState, 0L); diff --git a/katapult/plugins/catalogs/documentcatalog/document.h b/katapult/plugins/catalogs/documentcatalog/document.h index b36661c..9631e2f 100644 --- a/katapult/plugins/catalogs/documentcatalog/document.h +++ b/katapult/plugins/catalogs/documentcatalog/document.h @@ -28,7 +28,7 @@ */ class Document : public KatapultItem { - Q_OBJECT + TQ_OBJECT public: Document(TQString, TQString, bool); diff --git a/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp b/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp index b8a45aa..39ccc80 100644 --- a/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp +++ b/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp @@ -208,10 +208,10 @@ TQWidget * DocumentCatalog::configure() DocumentCatalogSettings *settings = new DocumentCatalogSettings(); settings->minQueryLen->setValue(_minQueryLen); - connect(settings->minQueryLen, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(minQueryLenChanged(int))); + connect(settings->minQueryLen, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(minQueryLenChanged(int))); settings->showPreview->setChecked(_showPreview); - connect(settings->showPreview, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(toggleshowPreview(bool))); + connect(settings->showPreview, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(toggleshowPreview(bool))); return settings; } diff --git a/katapult/plugins/catalogs/documentcatalog/documentcatalog.h b/katapult/plugins/catalogs/documentcatalog/documentcatalog.h index 20133a6..04eb1cc 100644 --- a/katapult/plugins/catalogs/documentcatalog/documentcatalog.h +++ b/katapult/plugins/catalogs/documentcatalog/documentcatalog.h @@ -37,7 +37,7 @@ class Document; */ class DocumentCatalog : public KatapultCatalog { - Q_OBJECT + TQ_OBJECT public: DocumentCatalog(TQObject *, const char *, const TQStringList&); diff --git a/katapult/plugins/catalogs/execcatalog/command.h b/katapult/plugins/catalogs/execcatalog/command.h index 4ed1ef9..bd6ed73 100644 --- a/katapult/plugins/catalogs/execcatalog/command.h +++ b/katapult/plugins/catalogs/execcatalog/command.h @@ -37,7 +37,7 @@ class ExecCatalog; */ class Command : public KatapultItem { - Q_OBJECT + TQ_OBJECT public: Command(ExecCatalog*, const TQString&); diff --git a/katapult/plugins/catalogs/execcatalog/execcatalog.cpp b/katapult/plugins/catalogs/execcatalog/execcatalog.cpp index 05cab17..6f93d95 100644 --- a/katapult/plugins/catalogs/execcatalog/execcatalog.cpp +++ b/katapult/plugins/catalogs/execcatalog/execcatalog.cpp @@ -97,7 +97,7 @@ TQWidget * ExecCatalog::configure() ExecCatalogSettings* settings = new ExecCatalogSettings(); settings->triggerWordLE->setText(_triggerWord); - connect(settings->triggerWordLE, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(triggerWordChanged(const TQString&))); + connect(settings->triggerWordLE, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(triggerWordChanged(const TQString&))); settings->introLabel->setText(i18n("Use with \"%1 exec query\"").arg(_triggerWord)); diff --git a/katapult/plugins/catalogs/execcatalog/execcatalog.h b/katapult/plugins/catalogs/execcatalog/execcatalog.h index 4049a83..bc8c1ae 100644 --- a/katapult/plugins/catalogs/execcatalog/execcatalog.h +++ b/katapult/plugins/catalogs/execcatalog/execcatalog.h @@ -43,7 +43,7 @@ class TQWidget; */ class ExecCatalog : public KatapultCatalog { - Q_OBJECT + TQ_OBJECT public: diff --git a/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp b/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp index 8346b1a..773c43e 100644 --- a/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp +++ b/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp @@ -97,7 +97,7 @@ TQWidget * GoogleCatalog::configure() GoogleCatalogSettings* settings = new GoogleCatalogSettings(); settings->triggerWordLE->setText(_triggerWord); - connect(settings->triggerWordLE, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(triggerWordChanged(const TQString&))); + connect(settings->triggerWordLE, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(triggerWordChanged(const TQString&))); settings->introLabel->setText(i18n("Use with \"%1 search query\"").arg(_triggerWord)); diff --git a/katapult/plugins/catalogs/googlecatalog/googlecatalog.h b/katapult/plugins/catalogs/googlecatalog/googlecatalog.h index bd5562c..50816df 100644 --- a/katapult/plugins/catalogs/googlecatalog/googlecatalog.h +++ b/katapult/plugins/catalogs/googlecatalog/googlecatalog.h @@ -43,7 +43,7 @@ class TQWidget; */ class GoogleCatalog : public KatapultCatalog { - Q_OBJECT + TQ_OBJECT public: diff --git a/katapult/plugins/catalogs/googlecatalog/query.h b/katapult/plugins/catalogs/googlecatalog/query.h index db5a5b5..e32fe75 100644 --- a/katapult/plugins/catalogs/googlecatalog/query.h +++ b/katapult/plugins/catalogs/googlecatalog/query.h @@ -37,7 +37,7 @@ class GoogleCatalog; */ class SearchQuery : public KatapultItem { - Q_OBJECT + TQ_OBJECT public: SearchQuery(GoogleCatalog*, const TQString&); diff --git a/katapult/plugins/catalogs/programcatalog/program.h b/katapult/plugins/catalogs/programcatalog/program.h index 64c1b57..cb2d718 100644 --- a/katapult/plugins/catalogs/programcatalog/program.h +++ b/katapult/plugins/catalogs/programcatalog/program.h @@ -29,7 +29,7 @@ */ class Program : public KatapultItem { - Q_OBJECT + TQ_OBJECT public: diff --git a/katapult/plugins/catalogs/programcatalog/programcatalog.cpp b/katapult/plugins/catalogs/programcatalog/programcatalog.cpp index bd7f581..a328042 100644 --- a/katapult/plugins/catalogs/programcatalog/programcatalog.cpp +++ b/katapult/plugins/catalogs/programcatalog/programcatalog.cpp @@ -116,16 +116,16 @@ TQWidget * ProgramCatalog::configure() ProgramCatalogSettings *settings = new ProgramCatalogSettings(); settings->minQueryLen->setValue(_minQueryLen); - connect(settings->minQueryLen, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(minQueryLenChanged(int))); + connect(settings->minQueryLen, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(minQueryLenChanged(int))); settings->ignoreIconless->setChecked(_ignoreIconless); - connect(settings->ignoreIconless, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(toggleIgnoreIconless(bool))); + connect(settings->ignoreIconless, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(toggleIgnoreIconless(bool))); settings->useExecName->setChecked(_useExecName); - connect(settings->useExecName, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(toggleUseExecName(bool))); + connect(settings->useExecName, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(toggleUseExecName(bool))); settings->ignoreTerminal->setChecked(_ignoreTerminal); - connect(settings->ignoreTerminal, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(toggleIgnoreTerminal(bool))); + connect(settings->ignoreTerminal, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(toggleIgnoreTerminal(bool))); return settings; } diff --git a/katapult/plugins/catalogs/programcatalog/programcatalog.h b/katapult/plugins/catalogs/programcatalog/programcatalog.h index 842cba6..8a102a8 100644 --- a/katapult/plugins/catalogs/programcatalog/programcatalog.h +++ b/katapult/plugins/catalogs/programcatalog/programcatalog.h @@ -34,7 +34,7 @@ class TQWidget; */ class ProgramCatalog : public CachedCatalog { - Q_OBJECT + TQ_OBJECT public: ProgramCatalog(TQObject *, const char *, const TQStringList&); diff --git a/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp b/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp index 941781b..fa4d7f4 100644 --- a/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp +++ b/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp @@ -97,7 +97,7 @@ TQWidget * SpellCatalog::configure() SpellCatalogSettings* settings = new SpellCatalogSettings(); settings->triggerWordLE->setText(_triggerWord); - connect(settings->triggerWordLE, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(triggerWordChanged(const TQString&))); + connect(settings->triggerWordLE, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(triggerWordChanged(const TQString&))); settings->introLabel->setText(i18n("Use with \"%1 myword\"").arg(_triggerWord)); diff --git a/katapult/plugins/catalogs/spellcatalog/spellcatalog.h b/katapult/plugins/catalogs/spellcatalog/spellcatalog.h index b4ed036..73fdad1 100644 --- a/katapult/plugins/catalogs/spellcatalog/spellcatalog.h +++ b/katapult/plugins/catalogs/spellcatalog/spellcatalog.h @@ -40,7 +40,7 @@ class TQWidget; */ class SpellCatalog : public KatapultCatalog { - Q_OBJECT + TQ_OBJECT public: diff --git a/katapult/plugins/catalogs/spellcatalog/spelling.cpp b/katapult/plugins/catalogs/spellcatalog/spelling.cpp index 99309ce..6a1c4af 100644 --- a/katapult/plugins/catalogs/spellcatalog/spelling.cpp +++ b/katapult/plugins/catalogs/spellcatalog/spelling.cpp @@ -34,13 +34,13 @@ Spelling::Spelling(SpellCatalog* catalog, const TQString& text): KatapultItem(), _catalog(catalog), _text(text) { - spellChecker = new KSpell( 0, "caption", this, TQT_SLOT(spellCheckerReady()) ); + spellChecker = new KSpell( 0, "caption", this, TQ_SLOT(spellCheckerReady()) ); - connect( spellChecker, TQT_SIGNAL(misspelling(const TQString&, const TQStringList&, unsigned int)), - this, TQT_SLOT(spellCheckerMisspelling(const TQString&, const TQStringList&, unsigned int)) ); + connect( spellChecker, TQ_SIGNAL(misspelling(const TQString&, const TQStringList&, unsigned int)), + this, TQ_SLOT(spellCheckerMisspelling(const TQString&, const TQStringList&, unsigned int)) ); - connect( spellChecker, TQT_SIGNAL(corrected(const TQString&, const TQString&, unsigned int)), - this, TQT_SLOT(spellCheckerCorrected(const TQString&, const TQString&, unsigned int)) ); + connect( spellChecker, TQ_SIGNAL(corrected(const TQString&, const TQString&, unsigned int)), + this, TQ_SLOT(spellCheckerCorrected(const TQString&, const TQString&, unsigned int)) ); evaluate(); } diff --git a/katapult/plugins/catalogs/spellcatalog/spelling.h b/katapult/plugins/catalogs/spellcatalog/spelling.h index 17fa298..d502224 100644 --- a/katapult/plugins/catalogs/spellcatalog/spelling.h +++ b/katapult/plugins/catalogs/spellcatalog/spelling.h @@ -34,7 +34,7 @@ class SpellCatalog; */ class Spelling : public KatapultItem { - Q_OBJECT + TQ_OBJECT public: Spelling(SpellCatalog*, const TQString&); diff --git a/katapult/plugins/display/glassdisplay/glassdisplay.cpp b/katapult/plugins/display/glassdisplay/glassdisplay.cpp index 0848a27..e89fbb8 100644 --- a/katapult/plugins/display/glassdisplay/glassdisplay.cpp +++ b/katapult/plugins/display/glassdisplay/glassdisplay.cpp @@ -39,7 +39,7 @@ K_EXPORT_COMPONENT_FACTORY( katapult_glassdisplay, #define BOTTOMMARGIN 8 GlassDisplay::GlassDisplay(TQWidget *parent, const char *name, const TQStringList& list) - : ImageDisplay(TQT_TQOBJECT(parent), name, list) + : ImageDisplay(parent, name, list) { setSingleBG(new TQPixmap(qembed_findImage("singlebg"))); setDoubleBG(new TQPixmap(qembed_findImage("doublebg"))); diff --git a/katapult/plugins/display/glassdisplay/glassdisplay.h b/katapult/plugins/display/glassdisplay/glassdisplay.h index 5df6591..c03eadf 100644 --- a/katapult/plugins/display/glassdisplay/glassdisplay.h +++ b/katapult/plugins/display/glassdisplay/glassdisplay.h @@ -27,7 +27,7 @@ */ class GlassDisplay : public ImageDisplay { - Q_OBJECT + TQ_OBJECT public: GlassDisplay(TQWidget *, const char *, const TQStringList&); diff --git a/katapult/plugins/display/o2display/o2display.cpp b/katapult/plugins/display/o2display/o2display.cpp index d041298..ce88a73 100644 --- a/katapult/plugins/display/o2display/o2display.cpp +++ b/katapult/plugins/display/o2display/o2display.cpp @@ -42,7 +42,7 @@ K_EXPORT_COMPONENT_FACTORY( katapult_o2display, #define BOTTOMMARGIN 40 o2Display::o2Display(TQWidget *parent, const char *name, const TQStringList& list) - : ImageDisplay(TQT_TQOBJECT(parent), name, list) + : ImageDisplay(parent, name, list) { setSingleBG(new TQPixmap(qembed_findImage("singlebg"))); setDoubleBG(new TQPixmap(qembed_findImage("doublebg"))); diff --git a/katapult/plugins/display/o2display/o2display.h b/katapult/plugins/display/o2display/o2display.h index 57af74a..c635277 100644 --- a/katapult/plugins/display/o2display/o2display.h +++ b/katapult/plugins/display/o2display/o2display.h @@ -27,7 +27,7 @@ */ class o2Display : public ImageDisplay { - Q_OBJECT + TQ_OBJECT public: o2Display(TQWidget *, const char *, const TQStringList&); diff --git a/katapult/plugins/display/puredisplay/puredisplay.cpp b/katapult/plugins/display/puredisplay/puredisplay.cpp index 02ca858..43c576f 100644 --- a/katapult/plugins/display/puredisplay/puredisplay.cpp +++ b/katapult/plugins/display/puredisplay/puredisplay.cpp @@ -42,7 +42,7 @@ K_EXPORT_COMPONENT_FACTORY( katapult_puredisplay, #define BOTTOMMARGIN 40 PureDisplay::PureDisplay(TQWidget *parent, const char *name, const TQStringList& list) - : ImageDisplay(TQT_TQOBJECT(parent), name, list) + : ImageDisplay(parent, name, list) { setSingleBG(new TQPixmap(qembed_findImage("singlebg"))); setDoubleBG(new TQPixmap(qembed_findImage("doublebg"))); diff --git a/katapult/plugins/display/puredisplay/puredisplay.h b/katapult/plugins/display/puredisplay/puredisplay.h index 8a9da3d..99f3abb 100644 --- a/katapult/plugins/display/puredisplay/puredisplay.h +++ b/katapult/plugins/display/puredisplay/puredisplay.h @@ -27,7 +27,7 @@ */ class PureDisplay : public ImageDisplay { - Q_OBJECT + TQ_OBJECT public: PureDisplay(TQWidget *, const char *, const TQStringList&); |