summaryrefslogtreecommitdiffstats
path: root/katapult/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'katapult/plugins')
-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
70 files changed, 95 insertions, 569 deletions
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&);