summaryrefslogtreecommitdiffstats
path: root/katapult
diff options
context:
space:
mode:
Diffstat (limited to 'katapult')
-rw-r--r--katapult/CMakeL10n.txt21
-rw-r--r--katapult/COPYING-DOCS397
-rw-r--r--katapult/Doxyfile248
-rw-r--r--katapult/Makefile.am5
-rw-r--r--katapult/NEWS1
-rw-r--r--katapult/common/CMakeLists.txt11
-rw-r--r--katapult/common/Makefile.am19
-rw-r--r--katapult/common/actionregistry.h2
-rw-r--r--katapult/common/cachedcatalog.h4
-rw-r--r--katapult/common/imagedisplay.cpp12
-rw-r--r--katapult/common/imagedisplay.h4
-rw-r--r--katapult/common/katapultaction.h2
-rw-r--r--katapult/common/katapultcatalog.desktop19
-rw-r--r--katapult/common/katapultcatalog.h4
-rw-r--r--katapult/common/katapultdisplay.desktop18
-rw-r--r--katapult/common/katapultdisplay.h4
-rw-r--r--katapult/common/katapultitem.h4
-rw-r--r--katapult/common/match.h2
-rw-r--r--katapult/configure.files2
-rw-r--r--katapult/configure.in.in6
-rw-r--r--katapult/katapult.kdevses33
-rw-r--r--katapult/katapult.tdevelop221
-rw-r--r--katapult/katapult/CMakeLists.txt5
-rw-r--r--katapult/katapult/Makefile.am23
-rw-r--r--katapult/katapult/katapult.cpp42
-rw-r--r--katapult/katapult/katapult.desktop21
-rw-r--r--katapult/katapult/katapult.h2
-rw-r--r--katapult/katapult/katapultconfigdlg.cpp10
-rw-r--r--katapult/katapult/katapultconfigdlg.h2
-rw-r--r--katapult/katapult/katapultiface.h2
-rw-r--r--katapult/katapult/katapultsettings.h2
-rw-r--r--katapult/katapult/settings.cpp8
-rw-r--r--katapult/plugins/Makefile.am1
-rw-r--r--katapult/plugins/catalogs/Makefile.am1
-rw-r--r--katapult/plugins/catalogs/amarokcatalog/CMakeLists.txt5
-rw-r--r--katapult/plugins/catalogs/amarokcatalog/Makefile.am15
-rw-r--r--katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp8
-rw-r--r--katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h2
-rw-r--r--katapult/plugins/catalogs/amarokcatalog/coverimage.cpp2
-rw-r--r--katapult/plugins/catalogs/amarokcatalog/katapult_amarokcatalog.desktop37
-rw-r--r--katapult/plugins/catalogs/amarokcatalog/song.h2
-rw-r--r--katapult/plugins/catalogs/bookmarkcatalog/CMakeLists.txt5
-rw-r--r--katapult/plugins/catalogs/bookmarkcatalog/Makefile.am17
-rw-r--r--katapult/plugins/catalogs/bookmarkcatalog/bookmark.h2
-rw-r--r--katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.cpp8
-rw-r--r--katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.h2
-rw-r--r--katapult/plugins/catalogs/bookmarkcatalog/katapult_bookmarkcatalog.desktop37
-rw-r--r--katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.h2
-rw-r--r--katapult/plugins/catalogs/calculatorcatalog/CMakeLists.txt5
-rw-r--r--katapult/plugins/catalogs/calculatorcatalog/Makefile.am20
-rw-r--r--katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp10
-rw-r--r--katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.h2
-rw-r--r--katapult/plugins/catalogs/calculatorcatalog/expression.h2
-rw-r--r--katapult/plugins/catalogs/calculatorcatalog/katapult_calculatorcatalog.desktop36
-rw-r--r--katapult/plugins/catalogs/calculatorcatalog/parser.cpp16
-rw-r--r--katapult/plugins/catalogs/documentcatalog/CMakeLists.txt5
-rw-r--r--katapult/plugins/catalogs/documentcatalog/Makefile.am16
-rw-r--r--katapult/plugins/catalogs/documentcatalog/directory.h2
-rw-r--r--katapult/plugins/catalogs/documentcatalog/document.cpp4
-rw-r--r--katapult/plugins/catalogs/documentcatalog/document.h2
-rw-r--r--katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp4
-rw-r--r--katapult/plugins/catalogs/documentcatalog/documentcatalog.h2
-rw-r--r--katapult/plugins/catalogs/documentcatalog/katapult_documentcatalog.desktop37
-rw-r--r--katapult/plugins/catalogs/execcatalog/CMakeLists.txt5
-rw-r--r--katapult/plugins/catalogs/execcatalog/Makefile.am20
-rw-r--r--katapult/plugins/catalogs/execcatalog/command.h2
-rw-r--r--katapult/plugins/catalogs/execcatalog/execcatalog.cpp2
-rw-r--r--katapult/plugins/catalogs/execcatalog/execcatalog.h2
-rw-r--r--katapult/plugins/catalogs/googlecatalog/CMakeLists.txt5
-rw-r--r--katapult/plugins/catalogs/googlecatalog/Makefile.am20
-rw-r--r--katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp2
-rw-r--r--katapult/plugins/catalogs/googlecatalog/googlecatalog.h2
-rw-r--r--katapult/plugins/catalogs/googlecatalog/query.h2
-rw-r--r--katapult/plugins/catalogs/programcatalog/CMakeLists.txt5
-rw-r--r--katapult/plugins/catalogs/programcatalog/Makefile.am15
-rw-r--r--katapult/plugins/catalogs/programcatalog/katapult_programcatalog.desktop36
-rw-r--r--katapult/plugins/catalogs/programcatalog/program.h2
-rw-r--r--katapult/plugins/catalogs/programcatalog/programcatalog.cpp8
-rw-r--r--katapult/plugins/catalogs/programcatalog/programcatalog.h2
-rw-r--r--katapult/plugins/catalogs/spellcatalog/CMakeLists.txt5
-rw-r--r--katapult/plugins/catalogs/spellcatalog/Makefile.am19
-rw-r--r--katapult/plugins/catalogs/spellcatalog/katapult_spellcatalog.desktop35
-rw-r--r--katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp2
-rw-r--r--katapult/plugins/catalogs/spellcatalog/spellcatalog.h2
-rw-r--r--katapult/plugins/catalogs/spellcatalog/spelling.cpp10
-rw-r--r--katapult/plugins/catalogs/spellcatalog/spelling.h2
-rw-r--r--katapult/plugins/display/Makefile.am1
-rw-r--r--katapult/plugins/display/glassdisplay/CMakeLists.txt5
-rw-r--r--katapult/plugins/display/glassdisplay/Makefile.am15
-rw-r--r--katapult/plugins/display/glassdisplay/glassdisplay.cpp2
-rw-r--r--katapult/plugins/display/glassdisplay/glassdisplay.h2
-rw-r--r--katapult/plugins/display/glassdisplay/katapult_glassdisplay.desktop35
-rw-r--r--katapult/plugins/display/o2display/CMakeLists.txt5
-rw-r--r--katapult/plugins/display/o2display/Makefile.am15
-rw-r--r--katapult/plugins/display/o2display/katapult_o2display.desktop8
-rw-r--r--katapult/plugins/display/o2display/o2display.cpp2
-rw-r--r--katapult/plugins/display/o2display/o2display.h2
-rw-r--r--katapult/plugins/display/puredisplay/CMakeLists.txt5
-rw-r--r--katapult/plugins/display/puredisplay/Makefile.am15
-rw-r--r--katapult/plugins/display/puredisplay/katapult_puredisplay.desktop34
-rw-r--r--katapult/plugins/display/puredisplay/puredisplay.cpp2
-rw-r--r--katapult/plugins/display/puredisplay/puredisplay.h2
102 files changed, 177 insertions, 1643 deletions
diff --git a/katapult/CMakeL10n.txt b/katapult/CMakeL10n.txt
index fb2b528..64f3924 100644
--- a/katapult/CMakeL10n.txt
+++ b/katapult/CMakeL10n.txt
@@ -1,3 +1,22 @@
##### create translation templates ##############
-tde_l10n_create_template( "katapult" )
+tde_l10n_create_template( "messages/katapult" )
+
+tde_l10n_create_template(
+ CATALOG "desktop_files/katapult.desktop/"
+ SOURCES katapult/katapult.desktop
+)
+
+tde_l10n_create_template(
+ CATALOG "desktop_files/katapult-catalogs/"
+ SOURCES
+ common/katapultcatalog.desktop
+ plugins/catalogs/*.desktop
+)
+
+tde_l10n_create_template(
+ CATALOG "desktop_files/katapult-displays/"
+ SOURCES
+ common/katapultdisplay.desktop
+ plugins/display/*.desktop
+)
diff --git a/katapult/COPYING-DOCS b/katapult/COPYING-DOCS
deleted file mode 100644
index 4a0fe1c..0000000
--- a/katapult/COPYING-DOCS
+++ /dev/null
@@ -1,397 +0,0 @@
- GNU Free Documentation License
- Version 1.2, November 2002
-
-
- Copyright (C) 2000,2001,2002 Free Software Foundation, Inc.
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-0. PREAMBLE
-
-The purpose of this License is to make a manual, textbook, or other
-functional and useful document "free" in the sense of freedom: to
-assure everyone the effective freedom to copy and redistribute it,
-with or without modifying it, either commercially or noncommercially.
-Secondarily, this License preserves for the author and publisher a way
-to get credit for their work, while not being considered responsible
-for modifications made by others.
-
-This License is a kind of "copyleft", which means that derivative
-works of the document must themselves be free in the same sense. It
-complements the GNU General Public License, which is a copyleft
-license designed for free software.
-
-We have designed this License in order to use it for manuals for free
-software, because free software needs free documentation: a free
-program should come with manuals providing the same freedoms that the
-software does. But this License is not limited to software manuals;
-it can be used for any textual work, regardless of subject matter or
-whether it is published as a printed book. We recommend this License
-principally for works whose purpose is instruction or reference.
-
-
-1. APPLICABILITY AND DEFINITIONS
-
-This License applies to any manual or other work, in any medium, that
-contains a notice placed by the copyright holder saying it can be
-distributed under the terms of this License. Such a notice grants a
-world-wide, royalty-free license, unlimited in duration, to use that
-work under the conditions stated herein. The "Document", below,
-refers to any such manual or work. Any member of the public is a
-licensee, and is addressed as "you". You accept the license if you
-copy, modify or distribute the work in a way requiring permission
-under copyright law.
-
-A "Modified Version" of the Document means any work containing the
-Document or a portion of it, either copied verbatim, or with
-modifications and/or translated into another language.
-
-A "Secondary Section" is a named appendix or a front-matter section of
-the Document that deals exclusively with the relationship of the
-publishers or authors of the Document to the Document's overall subject
-(or to related matters) and contains nothing that could fall directly
-within that overall subject. (Thus, if the Document is in part a
-textbook of mathematics, a Secondary Section may not explain any
-mathematics.) The relationship could be a matter of historical
-connection with the subject or with related matters, or of legal,
-commercial, philosophical, ethical or political position regarding
-them.
-
-The "Invariant Sections" are certain Secondary Sections whose titles
-are designated, as being those of Invariant Sections, in the notice
-that says that the Document is released under this License. If a
-section does not fit the above definition of Secondary then it is not
-allowed to be designated as Invariant. The Document may contain zero
-Invariant Sections. If the Document does not identify any Invariant
-Sections then there are none.
-
-The "Cover Texts" are certain short passages of text that are listed,
-as Front-Cover Texts or Back-Cover Texts, in the notice that says that
-the Document is released under this License. A Front-Cover Text may
-be at most 5 words, and a Back-Cover Text may be at most 25 words.
-
-A "Transparent" copy of the Document means a machine-readable copy,
-represented in a format whose specification is available to the
-general public, that is suitable for revising the document
-straightforwardly with generic text editors or (for images composed of
-pixels) generic paint programs or (for drawings) some widely available
-drawing editor, and that is suitable for input to text formatters or
-for automatic translation to a variety of formats suitable for input
-to text formatters. A copy made in an otherwise Transparent file
-format whose markup, or absence of markup, has been arranged to thwart
-or discourage subsequent modification by readers is not Transparent.
-An image format is not Transparent if used for any substantial amount
-of text. A copy that is not "Transparent" is called "Opaque".
-
-Examples of suitable formats for Transparent copies include plain
-ASCII without markup, Texinfo input format, LaTeX input format, SGML
-or XML using a publicly available DTD, and standard-conforming simple
-HTML, PostScript or PDF designed for human modification. Examples of
-transparent image formats include PNG, XCF and JPG. Opaque formats
-include proprietary formats that can be read and edited only by
-proprietary word processors, SGML or XML for which the DTD and/or
-processing tools are not generally available, and the
-machine-generated HTML, PostScript or PDF produced by some word
-processors for output purposes only.
-
-The "Title Page" means, for a printed book, the title page itself,
-plus such following pages as are needed to hold, legibly, the material
-this License requires to appear in the title page. For works in
-formats which do not have any title page as such, "Title Page" means
-the text near the most prominent appearance of the work's title,
-preceding the beginning of the body of the text.
-
-A section "Entitled XYZ" means a named subunit of the Document whose
-title either is precisely XYZ or contains XYZ in parentheses following
-text that translates XYZ in another language. (Here XYZ stands for a
-specific section name mentioned below, such as "Acknowledgements",
-"Dedications", "Endorsements", or "History".) To "Preserve the Title"
-of such a section when you modify the Document means that it remains a
-section "Entitled XYZ" according to this definition.
-
-The Document may include Warranty Disclaimers next to the notice which
-states that this License applies to the Document. These Warranty
-Disclaimers are considered to be included by reference in this
-License, but only as regards disclaiming warranties: any other
-implication that these Warranty Disclaimers may have is void and has
-no effect on the meaning of this License.
-
-
-2. VERBATIM COPYING
-
-You may copy and distribute the Document in any medium, either
-commercially or noncommercially, provided that this License, the
-copyright notices, and the license notice saying this License applies
-to the Document are reproduced in all copies, and that you add no other
-conditions whatsoever to those of this License. You may not use
-technical measures to obstruct or control the reading or further
-copying of the copies you make or distribute. However, you may accept
-compensation in exchange for copies. If you distribute a large enough
-number of copies you must also follow the conditions in section 3.
-
-You may also lend copies, under the same conditions stated above, and
-you may publicly display copies.
-
-
-3. COPYING IN QUANTITY
-
-If you publish printed copies (or copies in media that commonly have
-printed covers) of the Document, numbering more than 100, and the
-Document's license notice requires Cover Texts, you must enclose the
-copies in covers that carry, clearly and legibly, all these Cover
-Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
-the back cover. Both covers must also clearly and legibly identify
-you as the publisher of these copies. The front cover must present
-the full title with all words of the title equally prominent and
-visible. You may add other material on the covers in addition.
-Copying with changes limited to the covers, as long as they preserve
-the title of the Document and satisfy these conditions, can be treated
-as verbatim copying in other respects.
-
-If the required texts for either cover are too voluminous to fit
-legibly, you should put the first ones listed (as many as fit
-reasonably) on the actual cover, and continue the rest onto adjacent
-pages.
-
-If you publish or distribute Opaque copies of the Document numbering
-more than 100, you must either include a machine-readable Transparent
-copy along with each Opaque copy, or state in or with each Opaque copy
-a computer-network location from which the general network-using
-public has access to download using public-standard network protocols
-a complete Transparent copy of the Document, free of added material.
-If you use the latter option, you must take reasonably prudent steps,
-when you begin distribution of Opaque copies in quantity, to ensure
-that this Transparent copy will remain thus accessible at the stated
-location until at least one year after the last time you distribute an
-Opaque copy (directly or through your agents or retailers) of that
-edition to the public.
-
-It is requested, but not required, that you contact the authors of the
-Document well before redistributing any large number of copies, to give
-them a chance to provide you with an updated version of the Document.
-
-
-4. MODIFICATIONS
-
-You may copy and distribute a Modified Version of the Document under
-the conditions of sections 2 and 3 above, provided that you release
-the Modified Version under precisely this License, with the Modified
-Version filling the role of the Document, thus licensing distribution
-and modification of the Modified Version to whoever possesses a copy
-of it. In addition, you must do these things in the Modified Version:
-
-A. Use in the Title Page (and on the covers, if any) a title distinct
- from that of the Document, and from those of previous versions
- (which should, if there were any, be listed in the History section
- of the Document). You may use the same title as a previous version
- if the original publisher of that version gives permission.
-B. List on the Title Page, as authors, one or more persons or entities
- responsible for authorship of the modifications in the Modified
- Version, together with at least five of the principal authors of the
- Document (all of its principal authors, if it has fewer than five),
- unless they release you from this requirement.
-C. State on the Title page the name of the publisher of the
- Modified Version, as the publisher.
-D. Preserve all the copyright notices of the Document.
-E. Add an appropriate copyright notice for your modifications
- adjacent to the other copyright notices.
-F. Include, immediately after the copyright notices, a license notice
- giving the public permission to use the Modified Version under the
- terms of this License, in the form shown in the Addendum below.
-G. Preserve in that license notice the full lists of Invariant Sections
- and required Cover Texts given in the Document's license notice.
-H. Include an unaltered copy of this License.
-I. Preserve the section Entitled "History", Preserve its Title, and add
- to it an item stating at least the title, year, new authors, and
- publisher of the Modified Version as given on the Title Page. If
- there is no section Entitled "History" in the Document, create one
- stating the title, year, authors, and publisher of the Document as
- given on its Title Page, then add an item describing the Modified
- Version as stated in the previous sentence.
-J. Preserve the network location, if any, given in the Document for
- public access to a Transparent copy of the Document, and likewise
- the network locations given in the Document for previous versions
- it was based on. These may be placed in the "History" section.
- You may omit a network location for a work that was published at
- least four years before the Document itself, or if the original
- publisher of the version it refers to gives permission.
-K. For any section Entitled "Acknowledgements" or "Dedications",
- Preserve the Title of the section, and preserve in the section all
- the substance and tone of each of the contributor acknowledgements
- and/or dedications given therein.
-L. Preserve all the Invariant Sections of the Document,
- unaltered in their text and in their titles. Section numbers
- or the equivalent are not considered part of the section titles.
-M. Delete any section Entitled "Endorsements". Such a section
- may not be included in the Modified Version.
-N. Do not retitle any existing section to be Entitled "Endorsements"
- or to conflict in title with any Invariant Section.
-O. Preserve any Warranty Disclaimers.
-
-If the Modified Version includes new front-matter sections or
-appendices that qualify as Secondary Sections and contain no material
-copied from the Document, you may at your option designate some or all
-of these sections as invariant. To do this, add their titles to the
-list of Invariant Sections in the Modified Version's license notice.
-These titles must be distinct from any other section titles.
-
-You may add a section Entitled "Endorsements", provided it contains
-nothing but endorsements of your Modified Version by various
-parties--for example, statements of peer review or that the text has
-been approved by an organization as the authoritative definition of a
-standard.
-
-You may add a passage of up to five words as a Front-Cover Text, and a
-passage of up to 25 words as a Back-Cover Text, to the end of the list
-of Cover Texts in the Modified Version. Only one passage of
-Front-Cover Text and one of Back-Cover Text may be added by (or
-through arrangements made by) any one entity. If the Document already
-includes a cover text for the same cover, previously added by you or
-by arrangement made by the same entity you are acting on behalf of,
-you may not add another; but you may replace the old one, on explicit
-permission from the previous publisher that added the old one.
-
-The author(s) and publisher(s) of the Document do not by this License
-give permission to use their names for publicity for or to assert or
-imply endorsement of any Modified Version.
-
-
-5. COMBINING DOCUMENTS
-
-You may combine the Document with other documents released under this
-License, under the terms defined in section 4 above for modified
-versions, provided that you include in the combination all of the
-Invariant Sections of all of the original documents, unmodified, and
-list them all as Invariant Sections of your combined work in its
-license notice, and that you preserve all their Warranty Disclaimers.
-
-The combined work need only contain one copy of this License, and
-multiple identical Invariant Sections may be replaced with a single
-copy. If there are multiple Invariant Sections with the same name but
-different contents, make the title of each such section unique by
-adding at the end of it, in parentheses, the name of the original
-author or publisher of that section if known, or else a unique number.
-Make the same adjustment to the section titles in the list of
-Invariant Sections in the license notice of the combined work.
-
-In the combination, you must combine any sections Entitled "History"
-in the various original documents, forming one section Entitled
-"History"; likewise combine any sections Entitled "Acknowledgements",
-and any sections Entitled "Dedications". You must delete all sections
-Entitled "Endorsements".
-
-
-6. COLLECTIONS OF DOCUMENTS
-
-You may make a collection consisting of the Document and other documents
-released under this License, and replace the individual copies of this
-License in the various documents with a single copy that is included in
-the collection, provided that you follow the rules of this License for
-verbatim copying of each of the documents in all other respects.
-
-You may extract a single document from such a collection, and distribute
-it individually under this License, provided you insert a copy of this
-License into the extracted document, and follow this License in all
-other respects regarding verbatim copying of that document.
-
-
-7. AGGREGATION WITH INDEPENDENT WORKS
-
-A compilation of the Document or its derivatives with other separate
-and independent documents or works, in or on a volume of a storage or
-distribution medium, is called an "aggregate" if the copyright
-resulting from the compilation is not used to limit the legal rights
-of the compilation's users beyond what the individual works permit.
-When the Document is included in an aggregate, this License does not
-apply to the other works in the aggregate which are not themselves
-derivative works of the Document.
-
-If the Cover Text requirement of section 3 is applicable to these
-copies of the Document, then if the Document is less than one half of
-the entire aggregate, the Document's Cover Texts may be placed on
-covers that bracket the Document within the aggregate, or the
-electronic equivalent of covers if the Document is in electronic form.
-Otherwise they must appear on printed covers that bracket the whole
-aggregate.
-
-
-8. TRANSLATION
-
-Translation is considered a kind of modification, so you may
-distribute translations of the Document under the terms of section 4.
-Replacing Invariant Sections with translations requires special
-permission from their copyright holders, but you may include
-translations of some or all Invariant Sections in addition to the
-original versions of these Invariant Sections. You may include a
-translation of this License, and all the license notices in the
-Document, and any Warranty Disclaimers, provided that you also include
-the original English version of this License and the original versions
-of those notices and disclaimers. In case of a disagreement between
-the translation and the original version of this License or a notice
-or disclaimer, the original version will prevail.
-
-If a section in the Document is Entitled "Acknowledgements",
-"Dedications", or "History", the requirement (section 4) to Preserve
-its Title (section 1) will typically require changing the actual
-title.
-
-
-9. TERMINATION
-
-You may not copy, modify, sublicense, or distribute the Document except
-as expressly provided for under this License. Any other attempt to
-copy, modify, sublicense or distribute the Document is void, and will
-automatically terminate your rights under this License. However,
-parties who have received copies, or rights, from you under this
-License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-
-10. FUTURE REVISIONS OF THIS LICENSE
-
-The Free Software Foundation may publish new, revised versions
-of the GNU Free Documentation License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns. See
-http://www.gnu.org/copyleft/.
-
-Each version of the License is given a distinguishing version number.
-If the Document specifies that a particular numbered version of this
-License "or any later version" applies to it, you have the option of
-following the terms and conditions either of that specified version or
-of any later version that has been published (not as a draft) by the
-Free Software Foundation. If the Document does not specify a version
-number of this License, you may choose any version ever published (not
-as a draft) by the Free Software Foundation.
-
-
-ADDENDUM: How to use this License for your documents
-
-To use this License in a document you have written, include a copy of
-the License in the document and put the following copyright and
-license notices just after the title page:
-
- Copyright (c) YEAR YOUR NAME.
- Permission is granted to copy, distribute and/or modify this document
- under the terms of the GNU Free Documentation License, Version 1.2
- or any later version published by the Free Software Foundation;
- with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
- A copy of the license is included in the section entitled "GNU
- Free Documentation License".
-
-If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
-replace the "with...Texts." line with this:
-
- with the Invariant Sections being LIST THEIR TITLES, with the
- Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
-
-If you have Invariant Sections without Cover Texts, or some other
-combination of the three, merge those two alternatives to suit the
-situation.
-
-If your document contains nontrivial examples of program code, we
-recommend releasing these examples in parallel under your choice of
-free software license, such as the GNU General Public License,
-to permit their use in free software.
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/Makefile.am b/katapult/Makefile.am
deleted file mode 100644
index 4a01686..0000000
--- a/katapult/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIRS = common plugins katapult
-
-messages: rc.cpp
- $(EXTRACTRC) `find . -name "*.ui"` >> ./rc.cpp
- $(XGETTEXT) `find . -name "*.cpp"` -o $(podir)/katapult.pot
diff --git a/katapult/NEWS b/katapult/NEWS
deleted file mode 100644
index 8d1c8b6..0000000
--- a/katapult/NEWS
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/katapult/common/CMakeLists.txt b/katapult/common/CMakeLists.txt
index b57fc60..3df88b5 100644
--- a/katapult/common/CMakeLists.txt
+++ b/katapult/common/CMakeLists.txt
@@ -37,7 +37,14 @@ tde_add_library( ${PROJECT_NAME} SHARED AUTOMOC
##### other data
-install(
- FILES katapultcatalog.desktop katapultdisplay.desktop
+tde_create_translated_desktop(
+ SOURCE katapultcatalog.desktop
DESTINATION ${SERVICETYPES_INSTALL_DIR}
+ PO_DIR katapult-catalogs
+)
+
+tde_create_translated_desktop(
+ SOURCE katapultdisplay.desktop
+ DESTINATION ${SERVICETYPES_INSTALL_DIR}
+ PO_DIR katapult-displays
)
diff --git a/katapult/common/Makefile.am b/katapult/common/Makefile.am
deleted file mode 100644
index e93ce6d..0000000
--- a/katapult/common/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-# set the include path for X, qt and KDE
-INCLUDES = $(all_includes)
-
-# these are the headers for your project
-noinst_HEADERS = status.h katapultdisplay.h katapultcatalog.h katapultaction.h \
- katapultitem.h cachedcatalog.h actionregistry.h match.h imagedisplay.h
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-lib_LTLIBRARIES = libkatapult.la
-
-# common library
-libkatapult_la_SOURCES = katapultitem.cpp katapultaction.cpp actionregistry.cpp katapultcatalog.cpp cachedcatalog.cpp match.cpp katapultdisplay.cpp imagedisplay.cpp imagedisplaysettings.ui
-libkatapult_la_LDFLAGS = $(all_libraries) -version-info 2:0:0
-libkatapult_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) -lDCOP -ltdefx $(LIB_TDEUI)
-
-# this is where the service type files will go
-kde_servicetypes_DATA = katapultdisplay.desktop katapultcatalog.desktop
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.desktop b/katapult/common/katapultcatalog.desktop
index 88343f1..b12bbad 100644
--- a/katapult/common/katapultcatalog.desktop
+++ b/katapult/common/katapultcatalog.desktop
@@ -2,23 +2,4 @@
Type=ServiceType
X-TDE-ServiceType=Katapult/Catalog
Comment=A Katapult catalog plugin
-Comment[ar]=بريمج مستعرض Katapult
-Comment[bg]=Приставка за каталог на Katapult
-Comment[br]=Ul lugent katalog evit Katapult
-Comment[da]=Et mappe-plugin for Katapult
-Comment[de]=Ein Katapult-Katalog-Modul
-Comment[el]=Ένα πρόσθετο καταλόγου Katapult
-Comment[es]=Una extensión del catálogo Katapult
-Comment[et]=Katapulti kataloogiplugin
-Comment[fr]=Un module externe de catalogue pour Katapult
-Comment[gl]=Plugin de catálogo de Katapult
-Comment[it]=Un plugin per i cataloghi di Katapult
-Comment[ja]=Katapult カタログプラグイン
-Comment[nb]=Et programtillegg for Katapult-katalog
-Comment[nl]=Een Katapult-catalogusplugin
-Comment[pt]=Um 'plugin' de catálogo do Katapult
-Comment[pt_BR]=Um 'plugin' de catálogo do Katapult
-Comment[sv]=Ett katalogiseringsinsticksprogram för Katapult
-Comment[tr]=Bir Katapult katalog eklentisi
-Comment[uk]=Втулок каталогів для Катапульти
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.desktop b/katapult/common/katapultdisplay.desktop
index 3ee7d18..3fe43cc 100644
--- a/katapult/common/katapultdisplay.desktop
+++ b/katapult/common/katapultdisplay.desktop
@@ -2,22 +2,4 @@
Type=ServiceType
X-TDE-ServiceType=Katapult/Display
Comment=A Katapult display plugin
-Comment[ar]=بريمج عارض Katapult
-Comment[bg]=Приставка за показване на Katapult
-Comment[da]=Et visningsplugin for Katapult
-Comment[de]=Ein Katapult-Anzeige-Modul
-Comment[el]=Ένα πρόσθετο εμφάνισης Katapult
-Comment[es]=Una extensión para mostrar Katapult
-Comment[et]=Katapulti vaateplugin
-Comment[fr]=Un module externe d'affichage pour Katapult
-Comment[gl]=Plugin de visión de Katapult
-Comment[it]=Un plugin per i display di Katapult
-Comment[ja]=Katapult 表示プラグイン
-Comment[nb]=Et Katapult-programtillegg for visning
-Comment[nl]=Een Katapult-displayplugin
-Comment[pt]=Um 'plugin' de visualização do Katapult
-Comment[pt_BR]=Um 'plugin' de visualização do Katapult
-Comment[sv]=Ett visningsinsticksprogram för Katapult
-Comment[tr]=Bir Katapult gösterim eklentisi
-Comment[uk]=Втулок дисплея для Катапульти
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/configure.files b/katapult/configure.files
deleted file mode 100644
index 030bce8..0000000
--- a/katapult/configure.files
+++ /dev/null
@@ -1,2 +0,0 @@
-./admin/configure.in.min
-configure.in.in
diff --git a/katapult/configure.in.in b/katapult/configure.in.in
deleted file mode 100644
index 37132ff..0000000
--- a/katapult/configure.in.in
+++ /dev/null
@@ -1,6 +0,0 @@
-#MIN_CONFIG(3.0.0)
-
-AM_INIT_AUTOMAKE(katapult, 0.1)
-AC_C_BIGENDIAN
-AC_CHECK_KDEMAXPATHLEN
-
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/CMakeLists.txt b/katapult/katapult/CMakeLists.txt
index 7a98783..20bf76b 100644
--- a/katapult/katapult/CMakeLists.txt
+++ b/katapult/katapult/CMakeLists.txt
@@ -43,7 +43,4 @@ tde_install_icons( ${PROJECT_NAME} )
##### other data
-install(
- FILES ${PROJECT_NAME}.desktop
- DESTINATION ${XDG_APPS_INSTALL_DIR}
-)
+tde_create_translated_desktop( ${PROJECT_NAME}.desktop )
diff --git a/katapult/katapult/Makefile.am b/katapult/katapult/Makefile.am
deleted file mode 100644
index f4b63e8..0000000
--- a/katapult/katapult/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-# set the include path for X, qt and KDE
-INCLUDES = -I$(top_srcdir)/katapult/common $(all_includes)
-
-# these are the headers for your project
-noinst_HEADERS = katapult.h katapultsettings.h katapultconfigdlg.h \
- katapultiface.h
-
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-KDE_ICON = katapult
-
-bin_PROGRAMS = katapult
-
-# the application source, library search path, and link libraries
-katapult_SOURCES = confgeneral.ui confcatalogs.ui confdisplay.ui main.cpp \
- katapult.cpp katapultsettings.cpp katapultconfigdlg.cpp katapultiface.skel
-katapult_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-katapult_LDADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la
-
-# this is where the desktop file will go
-xdg_apps_DATA = katapult.desktop
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.desktop b/katapult/katapult/katapult.desktop
index 1e2bf11..8ad244f 100644
--- a/katapult/katapult/katapult.desktop
+++ b/katapult/katapult/katapult.desktop
@@ -1,30 +1,9 @@
[Desktop Entry]
Encoding=UTF-8
Name=Katapult
-Name[uk]=Катапульта
Exec=katapult
Icon=katapult
GenericName=TDE Launcher
-GenericName[ar]=مقلع TDE
-GenericName[bg]=Стартиране на TDE
-GenericName[br]=Loc'her TDE
-GenericName[da]=TDE-startværktøj
-GenericName[de]=TDE-Starter
-GenericName[el]=Εκτελεστής του TDE
-GenericName[es]=Iniciador TDE
-GenericName[et]=TDE käivitaja
-GenericName[fr]=Lanceur pour TDE
-GenericName[ga]=Tosaitheoir TDE
-GenericName[gl]=Iniciador de aplicazóns para TDE
-GenericName[it]=Avviatore per TDE
-GenericName[ja]=TDE ランチャー
-GenericName[nb]=TDE oppstarter
-GenericName[nl]=TDE-starter
-GenericName[pt]=Lançador do TDE
-GenericName[pt_BR]=Lançador do TDE
-GenericName[sv]=TDE-startverktyg
-GenericName[tr]=TDE Başlatıcısı
-GenericName[uk]=TDE пускач
Terminal=false
Type=Application
Categories=Qt;TDE;System;
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/katapultiface.h b/katapult/katapult/katapultiface.h
index 9a49702..f0665e8 100644
--- a/katapult/katapult/katapultiface.h
+++ b/katapult/katapult/katapultiface.h
@@ -17,8 +17,6 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-// -*- c++ -*-
-
#ifndef KATAPULTDCOPIFACE_H
#define KATAPULTDCOPIFACE_H
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/Makefile.am b/katapult/plugins/Makefile.am
deleted file mode 100644
index 5c96c18..0000000
--- a/katapult/plugins/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = catalogs display
diff --git a/katapult/plugins/catalogs/Makefile.am b/katapult/plugins/catalogs/Makefile.am
deleted file mode 100644
index 575538f..0000000
--- a/katapult/plugins/catalogs/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = programcatalog bookmarkcatalog documentcatalog calculatorcatalog amarokcatalog spellcatalog googlecatalog execcatalog
diff --git a/katapult/plugins/catalogs/amarokcatalog/CMakeLists.txt b/katapult/plugins/catalogs/amarokcatalog/CMakeLists.txt
index 88333aa..f1619ca 100644
--- a/katapult/plugins/catalogs/amarokcatalog/CMakeLists.txt
+++ b/katapult/plugins/catalogs/amarokcatalog/CMakeLists.txt
@@ -35,7 +35,8 @@ tde_add_kpart( katapult_amarokcatalog AUTOMOC
##### other data
-install(
- FILES katapult_amarokcatalog.desktop
+tde_create_translated_desktop(
+ SOURCE katapult_amarokcatalog.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
+ PO_DIR katapult-catalogs
)
diff --git a/katapult/plugins/catalogs/amarokcatalog/Makefile.am b/katapult/plugins/catalogs/amarokcatalog/Makefile.am
deleted file mode 100644
index f0d83b4..0000000
--- a/katapult/plugins/catalogs/amarokcatalog/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-# set the include path for X, qt and KDE
-INCLUDES = -I$(top_srcdir)/katapult/common $(all_includes)
-
-# header files
-noinst_HEADERS = coverimage.h song.h amarokcatalog.h actionplaysong.h
-
-# use automoc
-METASOURCES = AUTO
-
-# our plugin
-kde_module_LTLIBRARIES = katapult_amarokcatalog.la
-katapult_amarokcatalog_la_SOURCES = settings.ui amarokcatalog.cpp coverimage.cpp song.cpp actionplaysong.cpp
-katapult_amarokcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)
-katapult_amarokcatalog_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la
-kde_services_DATA = katapult_amarokcatalog.desktop
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/katapult_amarokcatalog.desktop b/katapult/plugins/catalogs/amarokcatalog/katapult_amarokcatalog.desktop
index a26dc93..0b1f1e8 100644
--- a/katapult/plugins/catalogs/amarokcatalog/katapult_amarokcatalog.desktop
+++ b/katapult/plugins/catalogs/amarokcatalog/katapult_amarokcatalog.desktop
@@ -1,43 +1,6 @@
[Desktop Entry]
Name=Amarok Catalog
-Name[ar]=مستعرض ( Catalog ) Amarok
-Name[bg]=Каталог на Amarok
-Name[br]=Katalog Amarok
-Name[da]=Katalogisér Amarok
-Name[de]=amaroK-Katalog
-Name[el]=Κατάλογος Amarok
-Name[es]=Catálogo Amarok
-Name[et]=Amaroki kataloog
-Name[fr]=Catalogue Amarok
-Name[ga]=Catalóg Amarok
-Name[gl]=Catálogo de Amarok
-Name[it]=Catalogo Amarok
-Name[ja]=Amarok カタログ
-Name[nb]=Amarok-katalog
-Name[nl]=Amarok-catalogus
-Name[pt]=Catálogo do Amarok
-Name[pt_BR]=Catálogo do Amarok
-Name[sv]=Katalogisera Amarok
-Name[tr]=Amarok Kataloğu
-Name[uk]=Каталог Amarok
Comment=Catalogs your TDE programs for easy launching through Katapult
-Comment[ar]=يستعرض برامجك كي دي أي ( TDE ) كي تستطيع اقلاعها بسهولة مستخدما Katapult
-Comment[bg]=Каталогизира с Katapult програмите в TDE за лесно стартиране
-Comment[da]=Katalogiserer dine TDE-programmer for nem start via Katapult
-Comment[de]=Katalogisiert Ihre TDE-Programme, um sie bequem mit Katapult zu starten
-Comment[el]=Δημιουργεί κατάλογο των προγραμμάτων σας του TDE για την εύκολη εκτέλεσή τους μέσω του Katapult
-Comment[es]=Cataloga sus programas de TDE para iniciarlos con facilidad a través de Katapult
-Comment[et]=Kataloogib sinu TDE programmid hõlpsaks käivitamiseks Katapultiga
-Comment[fr]=Cataloguer vos programmes TDE pour un lancement facile via Katapult
-Comment[gl]=Cataloga os seus programas de TDE para seren iniciados mediante Katapult
-Comment[it]=Cataloga in tuoi programmi TDE per avviarli facilmente attraverso Katapult
-Comment[ja]=Katapult から簡単に起動できるように TDE のプログラムをカタログ化
-Comment[nb]=Katalogiserer TDE-programmene for lettvint oppstart med Katapult
-Comment[nl]=Catalogiseert uw TDE-programma's voor eenvoudige opstart via Katapult
-Comment[pt]=Cataloga os seus programas do TDE para lançá-los facilmente através do Katapult
-Comment[pt_BR]=Cataloga os seus programas do TDE para lançá-los facilmente através do Katapult
-Comment[sv]=Katalogiserar dina TDE-program för enkel start via Katapult
-Comment[uk]=Робить каталог з програм TDE для легкого запуску через Катапульту
X-TDE-ServiceTypes=Katapult/Catalog
Type=Service
X-TDE-Library=katapult_amarokcatalog
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/CMakeLists.txt b/katapult/plugins/catalogs/bookmarkcatalog/CMakeLists.txt
index 125473d..05ea498 100644
--- a/katapult/plugins/catalogs/bookmarkcatalog/CMakeLists.txt
+++ b/katapult/plugins/catalogs/bookmarkcatalog/CMakeLists.txt
@@ -35,7 +35,8 @@ tde_add_kpart( katapult_bookmarkcatalog AUTOMOC
##### other data
-install(
- FILES katapult_bookmarkcatalog.desktop
+tde_create_translated_desktop(
+ SOURCE katapult_bookmarkcatalog.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
+ PO_DIR katapult-catalogs
)
diff --git a/katapult/plugins/catalogs/bookmarkcatalog/Makefile.am b/katapult/plugins/catalogs/bookmarkcatalog/Makefile.am
deleted file mode 100644
index b05912a..0000000
--- a/katapult/plugins/catalogs/bookmarkcatalog/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-# set the include path for X, qt and KDE
-INCLUDES = -I$(top_srcdir)/katapult/common $(all_includes)
-
-# header files
-noinst_HEADERS = bookmarkcatalog.h bookmark.h actionopenbookmark.h \
- mozillabookmark.h
-
-# use automoc
-METASOURCES = AUTO
-
-# our plugin
-kde_module_LTLIBRARIES = katapult_bookmarkcatalog.la
-katapult_bookmarkcatalog_la_SOURCES = settings.ui bookmarkcatalog.cpp \
- bookmark.cpp actionopenbookmark.cpp mozillabookmark.cpp
-katapult_bookmarkcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)
-katapult_bookmarkcatalog_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la
-kde_services_DATA = katapult_bookmarkcatalog.desktop
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/katapult_bookmarkcatalog.desktop b/katapult/plugins/catalogs/bookmarkcatalog/katapult_bookmarkcatalog.desktop
index 342bae3..a653439 100644
--- a/katapult/plugins/catalogs/bookmarkcatalog/katapult_bookmarkcatalog.desktop
+++ b/katapult/plugins/catalogs/bookmarkcatalog/katapult_bookmarkcatalog.desktop
@@ -1,43 +1,6 @@
[Desktop Entry]
Name=Bookmark Catalog
-Name[ar]=مستغرض علامات المواقع ( Bookmark Catalog )
-Name[bg]=Каталог с отметки
-Name[br]=Katalog sined
-Name[da]=Katalogisér bogmærker
-Name[de]=Lesezeichen-Katalog
-Name[el]=Κατάλογος σελιδοδεικτών
-Name[es]=Catálogo de marcadores
-Name[et]=Järjehoidjakataloog
-Name[fr]=Catalogue de signets
-Name[ga]=Catalóg Leabharmharcanna
-Name[gl]=Catálogo de Favoritos
-Name[it]=Catologo segnalibri
-Name[ja]=ブックマークカタログ
-Name[nb]=Bokmerke-katalog
-Name[nl]=Bladwijzercatalogus
-Name[pt]=Catálogo de Favoritos
-Name[pt_BR]=Catálogo de Favoritos
-Name[sv]=Katalogisera bokmärken
-Name[tr]=Yer imi Kataloğu
-Name[uk]=Каталог закладок
Comment=Catalogs your TDE bookmarks for easy launching through Katapult
-Comment[ar]=يستعرض علامات مواقعك كي دي أي ( TDE ) كي تستطيع اقلاعها عن طريق Katapult
-Comment[bg]=Каталогизира с Katapult отметките на TDE за лесно стартиране
-Comment[da]=Katalogiserer dine TDE-bogmærker for nem start via Katapult
-Comment[de]=Katalogisiert Ihre TDE-Lesezeichen, um sie bequem mit Katapult aufzurufen
-Comment[el]=Δημιουργεί κατάλογο με τους σελιδοδείκτες σας του TDE για την εύκολη εκτέλεσή τους μέσω του Katapult
-Comment[es]=Cataloga sus marcadores de TDE para iniciarlos con facilidad a través de Katapult
-Comment[et]=Kataloogib sinu TDE järjehoidjad hõlpsaks käivitamiseks Katapultiga
-Comment[fr]=Cataloguer vos signets TDE pour un lancement facile via Katapult
-Comment[gl]=Cataloga os seus favoritos de TDE para seren iniciados mediante Katapult
-Comment[it]=Cataloga i tuoi segnalibri di TDE per aprirli facilmente attraverso Katapult
-Comment[ja]=Katapult から簡単に開けるように TDE のブックマークをカタログ化
-Comment[nb]=Katalogiserer TDE-bokmerkene for lettvint oppstart med Katapult
-Comment[nl]=Catalogiseert uw TDE-bladwijzers voor eenvoudige opstart via Katapult
-Comment[pt]=Cataloga os seus favoritos do TDE para lançá-los facilmente através do Katapult
-Comment[pt_BR]=Cataloga os seus favoritos do TDE para lançá-los facilmente através do Katapult
-Comment[sv]=Katalogiserar dina TDE-bokmärken för enkel start via Katapult
-Comment[uk]=Робить каталог закладок TDE для легкого запуску через Катапульту
X-TDE-ServiceTypes=Katapult/Catalog
Type=Service
X-TDE-Library=katapult_bookmarkcatalog
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/CMakeLists.txt b/katapult/plugins/catalogs/calculatorcatalog/CMakeLists.txt
index d0111ca..2037f6e 100644
--- a/katapult/plugins/catalogs/calculatorcatalog/CMakeLists.txt
+++ b/katapult/plugins/catalogs/calculatorcatalog/CMakeLists.txt
@@ -40,7 +40,8 @@ tde_install_icons( xcalc checkmark no )
##### other data
-install(
- FILES katapult_calculatorcatalog.desktop
+tde_create_translated_desktop(
+ SOURCE katapult_calculatorcatalog.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
+ PO_DIR katapult-catalogs
)
diff --git a/katapult/plugins/catalogs/calculatorcatalog/Makefile.am b/katapult/plugins/catalogs/calculatorcatalog/Makefile.am
deleted file mode 100644
index 2439bd2..0000000
--- a/katapult/plugins/catalogs/calculatorcatalog/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2005 Tobi Vollebregt
-
-# set the include path for X, qt and KDE
-INCLUDES = -I$(top_srcdir)/katapult/common $(all_includes)
-
-# header files
-noinst_HEADERS = calculatorcatalog.h expression.h actionevalexpr.h
-
-# use automoc
-METASOURCES = AUTO
-
-# install xcalc icon
-KDE_ICON = xcalc checkmark no
-
-# our plugin
-kde_module_LTLIBRARIES = katapult_calculatorcatalog.la
-katapult_calculatorcatalog_la_SOURCES = settings.ui calculatorcatalog.cpp expression.cpp actionevalexpr.cpp parser.cpp
-katapult_calculatorcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)
-katapult_calculatorcatalog_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la
-kde_services_DATA = katapult_calculatorcatalog.desktop
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/calculatorcatalog/katapult_calculatorcatalog.desktop b/katapult/plugins/catalogs/calculatorcatalog/katapult_calculatorcatalog.desktop
index 5a3dd61..7ab12a7 100644
--- a/katapult/plugins/catalogs/calculatorcatalog/katapult_calculatorcatalog.desktop
+++ b/katapult/plugins/catalogs/calculatorcatalog/katapult_calculatorcatalog.desktop
@@ -1,43 +1,7 @@
# Copyright (C) 2005 Tobi Vollebregt
[Desktop Entry]
Name=Calculator Catalog
-Name[ar]=مستعرض الآلة الحاسبة ( Calculator Catalog )
-Name[bg]=Каталог на калкулатора
-Name[br]=Katalog jederez
-Name[da]=Katalogisér beregninger
-Name[de]=Rechner-Katalog
-Name[el]=Κατάλογος υπολογισμών
-Name[es]=Catalogador de calculadora
-Name[et]=Kalkulaatorikataloog
-Name[fr]=Catalogue calculatrice
-Name[gl]=Catálogo de Calculadora
-Name[it]=Catalogo calcolatrice
-Name[ja]=計算機カタログ
-Name[nb]=Kalkulatorkatalog
-Name[nl]=Rekenmachinecatalogus
-Name[pt]=Catálogo da Calculadora
-Name[pt_BR]=Catálogo da Calculadora
-Name[sv]=Katalogisera beräkningar
-Name[tr]=Hesap Makinesi Kataloğu
-Name[uk]=Каталог калькулятора
Comment=Catalogs the set of real numbers for easy calculation through katapult.
-Comment[ar]=يستعرض مجموعة ارقامك الحقيقية لعملية الحساب عن طريق katapult.
-Comment[bg]=Каталогизира с Katapult набора от числа с цел лесно пресмятане.
-Comment[da]=Katalogiserer mængden af reelle tal for nem beregning via Katapult.
-Comment[de]=Katalogisiert den Satz reeller Zahlen für einfaches Rechnen mit Katapult
-Comment[el]=Δημιουργεί κατάλογο με πραγματικούς αριθμούς για εύκολους υπολογισμούς μέσω του katapult.
-Comment[es]=Cataloga un conjunto de números reales para realizar con facilidad cálculos a través de katapult.
-Comment[et]=Kataloogib reaalarvud hõlpsaks arvutamiseks Katapulti abil.
-Comment[fr]=Cataloguer un ensemble de valeurs pour un calcul facile via Katapult
-Comment[gl]=Cataloga os números reais para seren calculados mediante katapult.
-Comment[it]=Cataloga l'insieme dei numeri reali per effettuare calcoli facilmente attraverso Katapult.
-Comment[ja]=Katapult から簡単に計算できるように実数のセットをカタログ化
-Comment[nb]=Katalogiserer mengden av reelle tall for enkel beregning via Katapult.
-Comment[nl]=Catalogiseert een set echte getallen voor eenvoudige berekening via katapult.
-Comment[pt]=Cataloga o conjunto de números reais para um cálculo simples através do Katapult.
-Comment[pt_BR]=Cataloga o conjunto de números reais para um cálculo simples através do Katapult.
-Comment[sv]=Katalogiserar mängden reella tal för enkel beräkning via Katapult.
-Comment[uk]=Робить каталог простих чисел для легких підрахунків через Катапульту.
X-TDE-ServiceTypes=Katapult/Catalog
Type=Service
X-TDE-Library=katapult_calculatorcatalog
diff --git a/katapult/plugins/catalogs/calculatorcatalog/parser.cpp b/katapult/plugins/catalogs/calculatorcatalog/parser.cpp
index 390785e..81f1b6f 100644
--- a/katapult/plugins/catalogs/calculatorcatalog/parser.cpp
+++ b/katapult/plugins/catalogs/calculatorcatalog/parser.cpp
@@ -183,7 +183,7 @@ union yyalloc
# define YYCOPY(To, From, Count) \
do \
{ \
- register YYSIZE_T yyi; \
+ YYSIZE_T yyi; \
for (yyi = 0; yyi < (Count); yyi++) \
(To)[yyi] = (From)[yyi]; \
} \
@@ -625,7 +625,7 @@ yystrlen (yystr)
const char *yystr;
# endif
{
- register const char *yys = yystr;
+ const char *yys = yystr;
while (*yys++ != '\0')
continue;
@@ -650,8 +650,8 @@ yystpcpy (yydest, yysrc)
const char *yysrc;
# endif
{
- register char *yyd = yydest;
- register const char *yys = yysrc;
+ char *yyd = yydest;
+ const char *yys = yysrc;
while ((*yyd++ = *yys++) != '\0')
continue;
@@ -786,8 +786,8 @@ YYSTYPE yylval;
/* Number of syntax errors so far. */
int yynerrs;
- register int yystate;
- register int yyn;
+ int yystate;
+ int yyn;
int yyresult;
/* Number of tokens to shift before error messages enabled. */
int yyerrstatus;
@@ -805,12 +805,12 @@ int yynerrs;
/* The state stack. */
short int yyssa[YYINITDEPTH];
short int *yyss = yyssa;
- register short int *yyssp;
+ short int *yyssp;
/* The semantic value stack. */
YYSTYPE yyvsa[YYINITDEPTH];
YYSTYPE *yyvs = yyvsa;
- register YYSTYPE *yyvsp;
+ YYSTYPE *yyvsp;
diff --git a/katapult/plugins/catalogs/documentcatalog/CMakeLists.txt b/katapult/plugins/catalogs/documentcatalog/CMakeLists.txt
index 7687e03..735ee7c 100644
--- a/katapult/plugins/catalogs/documentcatalog/CMakeLists.txt
+++ b/katapult/plugins/catalogs/documentcatalog/CMakeLists.txt
@@ -35,7 +35,8 @@ tde_add_kpart( katapult_documentcatalog AUTOMOC
##### other data
-install(
- FILES katapult_documentcatalog.desktop
+tde_create_translated_desktop(
+ SOURCE katapult_documentcatalog.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
+ PO_DIR katapult-catalogs
)
diff --git a/katapult/plugins/catalogs/documentcatalog/Makefile.am b/katapult/plugins/catalogs/documentcatalog/Makefile.am
deleted file mode 100644
index 93eafc1..0000000
--- a/katapult/plugins/catalogs/documentcatalog/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-# set the include path for X, qt and KDE
-INCLUDES = -I$(top_srcdir)/katapult/common $(all_includes)
-
-# header files
-noinst_HEADERS = documentcatalog.h directory.h document.h actionopendocument.h
-
-# use automoc
-METASOURCES = AUTO
-
-# our plugin
-kde_module_LTLIBRARIES = katapult_documentcatalog.la
-katapult_documentcatalog_la_SOURCES = settings.ui documentcatalog.cpp \
- directory.cpp document.cpp actionopendocument.cpp
-katapult_documentcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)
-katapult_documentcatalog_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la
-kde_services_DATA = katapult_documentcatalog.desktop
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/documentcatalog/katapult_documentcatalog.desktop b/katapult/plugins/catalogs/documentcatalog/katapult_documentcatalog.desktop
index 6bab3f2..d295fac 100644
--- a/katapult/plugins/catalogs/documentcatalog/katapult_documentcatalog.desktop
+++ b/katapult/plugins/catalogs/documentcatalog/katapult_documentcatalog.desktop
@@ -1,43 +1,6 @@
[Desktop Entry]
Name=Document Catalog
-Name[ar]=مستعرض المستندات ( Document Catalog)
-Name[bg]=Каталог с документи
-Name[br]=Katalog teul
-Name[da]=Katalogisér dokument
-Name[de]=Dokumenten-Katalog
-Name[el]=Κατάλογος εγγράφων
-Name[es]=Catalogador de documentos
-Name[et]=Dokumendikataloog
-Name[fr]=Catalogue des documents
-Name[ga]=Catalóg Cáipéisí
-Name[gl]=Catálogo de Documentos
-Name[it]=Catalogo documenti
-Name[ja]=ドキュメントカタログ
-Name[nb]=Dokumentkatalog
-Name[nl]=Documentcatalogus
-Name[pt]=Catálogo de Documentos
-Name[pt_BR]=Catálogo de Documentos
-Name[sv]=Katalogisera dokument
-Name[tr]=Belge Kataloğu
-Name[uk]=Каталог документів
Comment=Catalogs your documents for easy launching through Katapult
-Comment[ar]=يستعرض مستنداتك كي تستطيع اقلاعها بسهولة عن طريق Katapult
-Comment[bg]=Каталогизира с Katapult документите с цел лесно стартиране
-Comment[da]=Katalogiserer dine dokumenter for nem start via Katapult
-Comment[de]=Katalogisiert Ihre Dokumente, um sie bequem mit Katapult aufzurufen
-Comment[el]=Δημιουργεί κατάλογο των εγγράφων σας για την εύκολη εκτέλεσή τους μέσω του Katapult
-Comment[es]=Cataloga sus documentos para iniciarlos con facilidad a través de Katapult
-Comment[et]=Kataloogib sinu dokumendid hõlpsaks käivitamiseks Katapultiga
-Comment[fr]=Cataloguer vos documents pour une ouverture facile via Katapult
-Comment[gl]=Cataloga os seus documentos para seren iniciados mediante Katapult
-Comment[it]=Cataloga i tuoi documenti per aprirli facilmente attraverso Katapult
-Comment[ja]=Katapult から簡単に開けるようにドキュメントをカタログ化
-Comment[nb]=Katalogiserer dine dokumenter for lett oppstart via Katapult
-Comment[nl]=Catalogiseert uw documenten voor eenvoudige opstart via Katapult
-Comment[pt]=Cataloga os seus documentos para lançá-los facilmente através do Katapult
-Comment[pt_BR]=Cataloga os seus documentos para lançá-los facilmente através do Katapult
-Comment[sv]=Katalogiserar dina dokument för enkel start via Katapult
-Comment[uk]=Робить каталог документів для простого запуску через Катапульту
X-TDE-ServiceTypes=Katapult/Catalog
Type=Service
X-TDE-Library=katapult_documentcatalog
diff --git a/katapult/plugins/catalogs/execcatalog/CMakeLists.txt b/katapult/plugins/catalogs/execcatalog/CMakeLists.txt
index b35b345..9dd856a 100644
--- a/katapult/plugins/catalogs/execcatalog/CMakeLists.txt
+++ b/katapult/plugins/catalogs/execcatalog/CMakeLists.txt
@@ -39,7 +39,8 @@ tde_install_icons( )
##### other data
-install(
- FILES katapult_execcatalog.desktop
+tde_create_translated_desktop(
+ SOURCE katapult_execcatalog.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
+ PO_DIR katapult-catalogs
)
diff --git a/katapult/plugins/catalogs/execcatalog/Makefile.am b/katapult/plugins/catalogs/execcatalog/Makefile.am
deleted file mode 100644
index acfcf86..0000000
--- a/katapult/plugins/catalogs/execcatalog/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2007 Martin Meredith
-# Copyright (C) 2006 Jonathan Riddell
-
-# set the include path for X, qt and KDE
-INCLUDES = -I$(top_srcdir)/katapult/common $(all_includes)
-
-# header files
-noinst_HEADERS = actionrun.h execcatalog.h command.h
-
-# use automoc
-METASOURCES = AUTO
-
-KDE_ICON = AUTO
-
-# our plugin
-kde_module_LTLIBRARIES = katapult_execcatalog.la
-katapult_execcatalog_la_SOURCES = settings.ui execcatalog.cpp command.cpp actionrun.cpp
-katapult_execcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)
-katapult_execcatalog_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la
-kde_services_DATA = katapult_execcatalog.desktop
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/CMakeLists.txt b/katapult/plugins/catalogs/googlecatalog/CMakeLists.txt
index 32c5bb5..7551a32 100644
--- a/katapult/plugins/catalogs/googlecatalog/CMakeLists.txt
+++ b/katapult/plugins/catalogs/googlecatalog/CMakeLists.txt
@@ -39,7 +39,8 @@ tde_install_icons( )
##### other data
-install(
- FILES katapult_googlecatalog.desktop
+tde_create_translated_desktop(
+ SOURCE katapult_googlecatalog.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
+ PO_DIR katapult-catalogs
)
diff --git a/katapult/plugins/catalogs/googlecatalog/Makefile.am b/katapult/plugins/catalogs/googlecatalog/Makefile.am
deleted file mode 100644
index af34cb0..0000000
--- a/katapult/plugins/catalogs/googlecatalog/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2007 Martin Meredith
-# Copyright (C) 2006 Jonathan Riddell
-
-# set the include path for X, qt and KDE
-INCLUDES = -I$(top_srcdir)/katapult/common $(all_includes)
-
-# header files
-noinst_HEADERS = actionsearch.h googlecatalog.h query.h
-
-# use automoc
-METASOURCES = AUTO
-
-KDE_ICON = AUTO
-
-# our plugin
-kde_module_LTLIBRARIES = katapult_googlecatalog.la
-katapult_googlecatalog_la_SOURCES = settings.ui googlecatalog.cpp query.cpp actionsearch.cpp
-katapult_googlecatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)
-katapult_googlecatalog_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la
-kde_services_DATA = katapult_googlecatalog.desktop
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/CMakeLists.txt b/katapult/plugins/catalogs/programcatalog/CMakeLists.txt
index 3addcd3..8a7f243 100644
--- a/katapult/plugins/catalogs/programcatalog/CMakeLists.txt
+++ b/katapult/plugins/catalogs/programcatalog/CMakeLists.txt
@@ -34,7 +34,8 @@ tde_add_kpart( katapult_programcatalog AUTOMOC
##### other data
-install(
- FILES katapult_programcatalog.desktop
+tde_create_translated_desktop(
+ SOURCE katapult_programcatalog.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
+ PO_DIR katapult-catalogs
)
diff --git a/katapult/plugins/catalogs/programcatalog/Makefile.am b/katapult/plugins/catalogs/programcatalog/Makefile.am
deleted file mode 100644
index 4ec9ab8..0000000
--- a/katapult/plugins/catalogs/programcatalog/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-# set the include path for X, qt and KDE
-INCLUDES = -I$(top_srcdir)/katapult/common $(all_includes)
-
-# header files
-noinst_HEADERS = programcatalog.h program.h actionrunprogram.h
-
-# our plugin
-kde_module_LTLIBRARIES = katapult_programcatalog.la
-katapult_programcatalog_la_SOURCES = settings.ui programcatalog.cpp program.cpp actionrunprogram.cpp
-katapult_programcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)
-katapult_programcatalog_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la
-kde_services_DATA = katapult_programcatalog.desktop
-
-# use automoc
-METASOURCES = AUTO
diff --git a/katapult/plugins/catalogs/programcatalog/katapult_programcatalog.desktop b/katapult/plugins/catalogs/programcatalog/katapult_programcatalog.desktop
index 8abba9b..2da35e9 100644
--- a/katapult/plugins/catalogs/programcatalog/katapult_programcatalog.desktop
+++ b/katapult/plugins/catalogs/programcatalog/katapult_programcatalog.desktop
@@ -1,42 +1,6 @@
[Desktop Entry]
Name=Program Catalog
-Name[ar]=مستعرض البرامج ( Program Catalog )
-Name[bg]=Каталог с програми
-Name[br]=Katalog program
-Name[da]=Katalogisér program
-Name[de]=Programm-Katalog
-Name[el]=Κατάλογος προγραμμάτων
-Name[es]=Catalogador de programas
-Name[et]=Programmikataloog
-Name[fr]=Catalogue des programmes
-Name[gl]=Catálogo de Programas
-Name[it]=Catalogo programmi
-Name[ja]=プログラムカタログ
-Name[nb]=Programkatalog
-Name[nl]=Programmacatalogus
-Name[pt]=Catálogo do Programa
-Name[pt_BR]=Catálogo de Programa
-Name[sv]=Katalogisera program
-Name[tr]=Program Kataloğu
-Name[uk]=Каталог програм
Comment=Catalogs your TDE programs for easy launching through Katapult
-Comment[ar]=يستعرض برامجك كي دي أي ( TDE ) كي تستطيع اقلاعها بسهولة مستخدما Katapult
-Comment[bg]=Каталогизира с Katapult програмите в TDE за лесно стартиране
-Comment[da]=Katalogiserer dine TDE-programmer for nem start via Katapult
-Comment[de]=Katalogisiert Ihre TDE-Programme, um sie bequem mit Katapult zu starten
-Comment[el]=Δημιουργεί κατάλογο των προγραμμάτων σας του TDE για την εύκολη εκτέλεσή τους μέσω του Katapult
-Comment[es]=Cataloga sus programas de TDE para iniciarlos con facilidad a través de Katapult
-Comment[et]=Kataloogib sinu TDE programmid hõlpsaks käivitamiseks Katapultiga
-Comment[fr]=Cataloguer vos programmes TDE pour un lancement facile via Katapult
-Comment[gl]=Cataloga os seus programas de TDE para seren iniciados mediante Katapult
-Comment[it]=Cataloga in tuoi programmi TDE per avviarli facilmente attraverso Katapult
-Comment[ja]=Katapult から簡単に起動できるように TDE のプログラムをカタログ化
-Comment[nb]=Katalogiserer TDE-programmene for lettvint oppstart med Katapult
-Comment[nl]=Catalogiseert uw TDE-programma's voor eenvoudige opstart via Katapult
-Comment[pt]=Cataloga os seus programas do TDE para lançá-los facilmente através do Katapult
-Comment[pt_BR]=Cataloga os seus programas do TDE para lançá-los facilmente através do Katapult
-Comment[sv]=Katalogiserar dina TDE-program för enkel start via Katapult
-Comment[uk]=Робить каталог з програм TDE для легкого запуску через Катапульту
X-TDE-ServiceTypes=Katapult/Catalog
Type=Service
X-TDE-Library=katapult_programcatalog
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/CMakeLists.txt b/katapult/plugins/catalogs/spellcatalog/CMakeLists.txt
index 692fea9..5e4aaf3 100644
--- a/katapult/plugins/catalogs/spellcatalog/CMakeLists.txt
+++ b/katapult/plugins/catalogs/spellcatalog/CMakeLists.txt
@@ -39,7 +39,8 @@ tde_install_icons( )
##### other data
-install(
- FILES katapult_spellcatalog.desktop
+tde_create_translated_desktop(
+ SOURCE katapult_spellcatalog.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
+ PO_DIR katapult-catalogs
)
diff --git a/katapult/plugins/catalogs/spellcatalog/Makefile.am b/katapult/plugins/catalogs/spellcatalog/Makefile.am
deleted file mode 100644
index 7dc8aba..0000000
--- a/katapult/plugins/catalogs/spellcatalog/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (C) 2006 Jonathan Riddell
-
-# set the include path for X, qt and KDE
-INCLUDES = -I$(top_srcdir)/katapult/common $(all_includes)
-
-# header files
-noinst_HEADERS = actioncopyspelling.h spellcatalog.h spelling.h
-
-# use automoc
-METASOURCES = AUTO
-
-KDE_ICON = AUTO
-
-# our plugin
-kde_module_LTLIBRARIES = katapult_spellcatalog.la
-katapult_spellcatalog_la_SOURCES = settings.ui spellcatalog.cpp spelling.cpp actioncopyspelling.cpp
-katapult_spellcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)
-katapult_spellcatalog_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la
-kde_services_DATA = katapult_spellcatalog.desktop
diff --git a/katapult/plugins/catalogs/spellcatalog/katapult_spellcatalog.desktop b/katapult/plugins/catalogs/spellcatalog/katapult_spellcatalog.desktop
index 63a57d0..a16ce9c 100644
--- a/katapult/plugins/catalogs/spellcatalog/katapult_spellcatalog.desktop
+++ b/katapult/plugins/catalogs/spellcatalog/katapult_spellcatalog.desktop
@@ -1,42 +1,7 @@
# Copyright (C) 2006 Jonathan Riddell
[Desktop Entry]
Name=Spell Catalog
-Name[ar]=مستعرض التدقيق الأملائي ( Spell Catalog )
-Name[bg]=Каталог за проверка на правописа
-Name[da]=Katalogisér stavning
-Name[de]=Rechtschreibung-Katalog
-Name[el]=Κατάλογος ορθογραφίας
-Name[es]=Catalogador de ortografía
-Name[et]=Õigekirjakataloog
-Name[fr]=Catalogue orthographique
-Name[ga]=Catalóg Litrithe
-Name[gl]=Catálogo de Ortografia
-Name[it]=Catalogo controllo ortografico
-Name[ja]=スペルカタログ
-Name[nb]=Stavekatalog
-Name[nl]=Spelcatalogus
-Name[pt]=Catálogo de Ortografia
-Name[pt_BR]=Catálogo de Ortografia
-Name[sv]=Stavningskatalog
-Name[uk]=Каталог правопису
Comment=Check the spelling of a word
-Comment[ar]=دقًق املائيا في الكلمة
-Comment[bg]=Проверка правописа на дума
-Comment[da]=Tjek stavning af et ord
-Comment[de]=Die Schreibweise eines Wortes überprüfen
-Comment[el]=Ορθογραφικός έλεγχος μιας λέξης
-Comment[es]=Comprueba la ortografía de una palabra
-Comment[et]=Sõna õigekirja kontroll
-Comment[fr]=Vérifier l'orthographe d'un mot
-Comment[gl]=Verifica a ortografia dunha palabra
-Comment[it]=Controllo ortografico di una parola
-Comment[ja]=単語のスペルをチェック
-Comment[nb]=Sjekk skrivemåten for et ord
-Comment[nl]=Controleert de spelling van een woord
-Comment[pt]=Verificar a ortografia de uma palavra
-Comment[pt_BR]=Verificar a ortografia de uma palavra
-Comment[sv]=Kontrollera stavningen av ett ord
-Comment[uk]=Перевірити правопис слова
X-TDE-ServiceTypes=Katapult/Catalog
Type=Service
X-TDE-Library=katapult_spellcatalog
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/Makefile.am b/katapult/plugins/display/Makefile.am
deleted file mode 100644
index 45328c4..0000000
--- a/katapult/plugins/display/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = glassdisplay puredisplay o2display
diff --git a/katapult/plugins/display/glassdisplay/CMakeLists.txt b/katapult/plugins/display/glassdisplay/CMakeLists.txt
index d5fe0e0..dc3bd39 100644
--- a/katapult/plugins/display/glassdisplay/CMakeLists.txt
+++ b/katapult/plugins/display/glassdisplay/CMakeLists.txt
@@ -30,7 +30,8 @@ tde_add_kpart( katapult_glassdisplay AUTOMOC
##### other data
-install(
- FILES katapult_glassdisplay.desktop
+tde_create_translated_desktop(
+ SOURCE katapult_glassdisplay.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
+ PO_DIR katapult-displays
)
diff --git a/katapult/plugins/display/glassdisplay/Makefile.am b/katapult/plugins/display/glassdisplay/Makefile.am
deleted file mode 100644
index e26a971..0000000
--- a/katapult/plugins/display/glassdisplay/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-# set the include path for X, qt and KDE
-INCLUDES = -I$(top_srcdir)/katapult/common $(all_includes)
-
-# header files
-noinst_HEADERS = glassdisplay.h
-
-# use automoc
-METASOURCES = AUTO
-
-# our plugin
-kde_module_LTLIBRARIES = katapult_glassdisplay.la
-katapult_glassdisplay_la_SOURCES = glassdisplay.cpp
-katapult_glassdisplay_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)
-katapult_glassdisplay_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(top_builddir)/katapult/common/libkatapult.la
-kde_services_DATA = katapult_glassdisplay.desktop
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/glassdisplay/katapult_glassdisplay.desktop b/katapult/plugins/display/glassdisplay/katapult_glassdisplay.desktop
index c28bf1b..1e86a4d 100644
--- a/katapult/plugins/display/glassdisplay/katapult_glassdisplay.desktop
+++ b/katapult/plugins/display/glassdisplay/katapult_glassdisplay.desktop
@@ -1,41 +1,6 @@
[Desktop Entry]
Name=Glass Display
-Name[ar]=عرض بلًوري ( Glass Display )
-Name[bg]=Стъклен изглед
-Name[da]=Glasskærm
-Name[de]=Glas-Anzeige
-Name[el]=Γυάλινη εμφάνιση
-Name[es]=Mostrar cristal
-Name[et]=Klaasivaade
-Name[fr]=Affichage Glass
-Name[gl]=Pantalla Cristal
-Name[ja]=半透明表示
-Name[nb]=Glass-visning
-Name[nl]=Glass-display
-Name[pt]=Visualização por Vidro
-Name[pt_BR]=Visualização Vitrificada
-Name[sv]=Glasskärm
-Name[tr]=Cam Gösterimi
-Name[uk]=Скляний дисплей
Comment=Glass display plugin for Katapult
-Comment[ar]=بريمج عرض بلًوري ل- Katapult
-Comment[bg]=Приставка за стъклен изглед в Katapult
-Comment[da]=Plugin med glasskærm for Katapult
-Comment[de]=Glas-Anzeige-Modul für Katapult
-Comment[el]=Πρόσθετο γυάλινης εμφάνισης για το Katapult
-Comment[es]=Extensión para mostrar cristal para Katapult
-Comment[et]=Katapulti klaasivaate plugin
-Comment[fr]=Module externe d'affichage Glass pour Katapult
-Comment[gl]=Plugin Glass display para Katapult
-Comment[it]=Plugin Glass display per Katapult
-Comment[ja]=Katapult のための半透明表示プラグイン
-Comment[nb]=Programttillegg for Glassvisning i Katapult
-Comment[nl]=Glass-display-plugin voor Katapult
-Comment[pt]=Um 'plugin' de visualização por vidro para o Katapult
-Comment[pt_BR]=Um 'plugin' de visualização vitrificada para o Katapult
-Comment[sv]=Insticksprogram med glasskärm för Katapult
-Comment[tr]=Katapult için Cam gösterimi eklentisi
-Comment[uk]=Втулок скляного дисплея для Катапульти
X-TDE-ServiceTypes=Katapult/Display
Type=Service
X-TDE-Library=katapult_glassdisplay
diff --git a/katapult/plugins/display/o2display/CMakeLists.txt b/katapult/plugins/display/o2display/CMakeLists.txt
index 4729d48..352fe99 100644
--- a/katapult/plugins/display/o2display/CMakeLists.txt
+++ b/katapult/plugins/display/o2display/CMakeLists.txt
@@ -30,7 +30,8 @@ tde_add_kpart( katapult_o2display AUTOMOC
##### other data
-install(
- FILES katapult_o2display.desktop
+tde_create_translated_desktop(
+ SOURCE katapult_o2display.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
+ PO_DIR katapult-displays
)
diff --git a/katapult/plugins/display/o2display/Makefile.am b/katapult/plugins/display/o2display/Makefile.am
deleted file mode 100644
index 93a67b7..0000000
--- a/katapult/plugins/display/o2display/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-# set the include path for X, qt and KDE
-INCLUDES = -I$(top_srcdir)/katapult/common $(all_includes)
-
-# header files
-noinst_HEADERS = o2display.h
-
-# use automoc
-METASOURCES = AUTO
-
-# our plugin
-kde_module_LTLIBRARIES = katapult_o2display.la
-katapult_o2display_la_SOURCES = o2display.cpp
-katapult_o2display_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)
-katapult_o2display_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(top_builddir)/katapult/common/libkatapult.la
-kde_services_DATA = katapult_o2display.desktop
diff --git a/katapult/plugins/display/o2display/katapult_o2display.desktop b/katapult/plugins/display/o2display/katapult_o2display.desktop
index 04c3f99..e5e938a 100644
--- a/katapult/plugins/display/o2display/katapult_o2display.desktop
+++ b/katapult/plugins/display/o2display/katapult_o2display.desktop
@@ -1,13 +1,5 @@
[Desktop Entry]
Name=o2 Display
-Name[bg]=Показване на o2
-Name[da]=o2-skærm
-Name[de]=o2-Anzeige
-Name[es]=Mostrar o2
-Name[nl]=o2-display
-Name[pt]=Visualização o2
-Name[pt_BR]=Visualização o2
-Name[sv]=o2-skärm
X-TDE-ServiceTypes=Katapult/Display
Type=Service
X-TDE-Library=katapult_o2display
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/CMakeLists.txt b/katapult/plugins/display/puredisplay/CMakeLists.txt
index 114fa46..7091cea 100644
--- a/katapult/plugins/display/puredisplay/CMakeLists.txt
+++ b/katapult/plugins/display/puredisplay/CMakeLists.txt
@@ -30,7 +30,8 @@ tde_add_kpart( katapult_puredisplay AUTOMOC
##### other data
-install(
- FILES katapult_puredisplay.desktop
+tde_create_translated_desktop(
+ SOURCE katapult_puredisplay.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
+ PO_DIR katapult-displays
)
diff --git a/katapult/plugins/display/puredisplay/Makefile.am b/katapult/plugins/display/puredisplay/Makefile.am
deleted file mode 100644
index 019b810..0000000
--- a/katapult/plugins/display/puredisplay/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-# set the include path for X, qt and KDE
-INCLUDES = -I$(top_srcdir)/katapult/common $(all_includes)
-
-# header files
-noinst_HEADERS = puredisplay.h
-
-# use automoc
-METASOURCES = AUTO
-
-# our plugin
-kde_module_LTLIBRARIES = katapult_puredisplay.la
-katapult_puredisplay_la_SOURCES = puredisplay.cpp
-katapult_puredisplay_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)
-katapult_puredisplay_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(top_builddir)/katapult/common/libkatapult.la
-kde_services_DATA = katapult_puredisplay.desktop
diff --git a/katapult/plugins/display/puredisplay/katapult_puredisplay.desktop b/katapult/plugins/display/puredisplay/katapult_puredisplay.desktop
index 3d49b59..f7592dc 100644
--- a/katapult/plugins/display/puredisplay/katapult_puredisplay.desktop
+++ b/katapult/plugins/display/puredisplay/katapult_puredisplay.desktop
@@ -1,40 +1,6 @@
[Desktop Entry]
Name=Pure Display
-Name[ar]=عرض صافي ( Pure Display )
-Name[bg]=Пълно показване
-Name[da]=Enkel skærm
-Name[de]=Pure Anzeige
-Name[el]=Καθαρή εμφάνιση
-Name[es]=Mostrar puro
-Name[et]=Puhasvaade
-Name[fr]=Affichage Pure
-Name[ja]=純正表示
-Name[nb]=Ren visning
-Name[nl]=Pure-display
-Name[pt]=Visualização Pura
-Name[pt_BR]=Visualização Pura
-Name[sv]=Enkel skärm
-Name[tr]=Saf Gösterim
-Name[uk]=Чистий дисплей
Comment=Pure display plugin for Katapult
-Comment[ar]=بريمج عرض صافي ل- Katapult
-Comment[bg]=Приставка за пълно показване в Katapult
-Comment[da]=Plugin med enkel skærm for Katapult
-Comment[de]=Pure-Anzeige-Modul für Katapult
-Comment[el]=Πρόσθετο καθαρής εμφάνισης για το Katapult
-Comment[es]=Extensión para mostrar puro para Katapult
-Comment[et]=Katapulti puhta vaate plugin
-Comment[fr]=Module externe d'affichage Pure pour Katapult
-Comment[gl]=Plugin Pure display para Katapult
-Comment[it]=Plugin Pure display per Katapult
-Comment[ja]=Katapult のための純正表示プラグイン
-Comment[nb]=Programtillegg for Ren visning i Katapult
-Comment[nl]=Pure-display-plugin voor Katapult
-Comment[pt]=Um 'plugin' de visualização pura para o Katapult
-Comment[pt_BR]=Um 'plugin' de visualização pura para o Katapult
-Comment[sv]=Insticksprogram med enkel skärm för Katapult
-Comment[tr]=Katapult için Saf gösterim eklentisi
-Comment[uk]=Втулок чистого дисплея для Катапульти
X-TDE-ServiceTypes=Katapult/Display
Type=Service
X-TDE-Library=katapult_puredisplay
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&);