11 files changed, 36 insertions, 194 deletions
diff --git a/kcontrol/tdefontinst/viewpart/CMakeLists.txt b/kcontrol/tdefontinst/viewpart/CMakeLists.txt
index 5dd3ddc63..7aa960dda 100644
--- a/kcontrol/tdefontinst/viewpart/CMakeLists.txt
+++ b/kcontrol/tdefontinst/viewpart/CMakeLists.txt
@@ -24,8 +24,17 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdefontviewpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdefontview.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+tde_create_translated_desktop(
+  SOURCE tdefontviewpart.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
+  PO_DIR kcontrol-desktops
+)
+
+tde_create_translated_desktop(
+  SOURCE tdefontview.desktop
+  PO_DIR kcontrol-desktops
+)
+
 install( FILES tdefontviewpart.rc tdefontviewui.rc DESTINATION ${DATA_INSTALL_DIR}/tdefontview )
 
 
diff --git a/kcontrol/tdefontinst/viewpart/FontPreview.cpp b/kcontrol/tdefontinst/viewpart/FontPreview.cpp
index 41367d586..7b5a7a5bf 100644
--- a/kcontrol/tdefontinst/viewpart/FontPreview.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontPreview.cpp
@@ -65,7 +65,7 @@ void CFontPreview::showFont()
     if(!itsCurrentUrl.isEmpty() &&
        itsEngine.draw(itsCurrentUrl, itsLastWidth, itsLastHeight, itsPixmap, itsCurrentFace-1, false))
     {
-        setEraseColor(Qt::white);
+        setEraseColor(TQt::white);
         update();
         emit status(true);
     }
@@ -88,7 +88,7 @@ void CFontPreview::paintEvent(TQPaintEvent *)
     {
         if(!itsCurrentUrl.isEmpty())
         {
-            paint.setPen(kapp->palette().active().text());
+            paint.setPen(tdeApp->palette().active().text());
             paint.drawText(rect(), AlignCenter, i18n(" No preview available"));
         }
     }
diff --git a/kcontrol/tdefontinst/viewpart/FontPreview.h b/kcontrol/tdefontinst/viewpart/FontPreview.h
index 71916479e..f6ebd8dbd 100644
--- a/kcontrol/tdefontinst/viewpart/FontPreview.h
+++ b/kcontrol/tdefontinst/viewpart/FontPreview.h
@@ -42,7 +42,7 @@ namespace KFI
 
 class CFontPreview : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
 
diff --git a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
index e31510ad3..b3f3b1c94 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
@@ -45,7 +45,7 @@
 #include <tqstringlist.h>
 #include <tqtimer.h>
 #include <tdeio/netaccess.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <knuminput.h>
 #include <kstdaction.h>
@@ -81,7 +81,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name)
     TQHBoxLayout *toolsLayout=new TQHBoxLayout(itsToolsFrame, 0, KDialog::spacingHint());
 
     itsFrame->setFrameShape(TQFrame::NoFrame);
-    itsFrame->setFocusPolicy(TQ_ClickFocus);
+    itsFrame->setFocusPolicy(TQWidget::ClickFocus);
     itsToolsFrame->setFrameShape(TQFrame::NoFrame);
     previewFrame->setFrameShadow(kcm ? TQFrame::Sunken : TQFrame::Raised);
     previewFrame->setFrameShape(TQFrame::Panel);
@@ -103,14 +103,14 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name)
     toolsLayout->addItem(new TQSpacerItem(5, 5, TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum));
     toolsLayout->addWidget(itsInstallButton);
     itsToolsFrame->hide();
-    connect(itsPreview, TQT_SIGNAL(status(bool)), TQT_SLOT(previewStatus(bool)));
-    connect(itsInstallButton, TQT_SIGNAL(clicked()), TQT_SLOT(install()));
-    connect(itsFaceSelector, TQT_SIGNAL(valueChanged(int)), itsPreview, TQT_SLOT(showFace(int)));
+    connect(itsPreview, TQ_SIGNAL(status(bool)), TQ_SLOT(previewStatus(bool)));
+    connect(itsInstallButton, TQ_SIGNAL(clicked()), TQ_SLOT(install()));
+    connect(itsFaceSelector, TQ_SIGNAL(valueChanged(int)), itsPreview, TQ_SLOT(showFace(int)));
 
     itsChangeTextAction=new TDEAction(i18n("Change Text..."), "text", TDEShortcut(),
-                                    this, TQT_SLOT(changeText()), actionCollection(), "changeText");
+                                    this, TQ_SLOT(changeText()), actionCollection(), "changeText");
     itsChangeTextAction->setEnabled(false);
-    itsPrintAction=KStdAction::print(this, TQT_SLOT(print()), actionCollection(), "print");
+    itsPrintAction=KStdAction::print(this, TQ_SLOT(print()), actionCollection(), "print");
     itsPrintAction->setEnabled(false);
 
     setXMLFile("tdefontviewpart.rc");
@@ -143,7 +143,7 @@ bool CFontViewPart::openFile()
 {
     // NOTE: Cant do the real open here, as dont seem to be able to use TDEIO::NetAccess functions during initial start-up.
     // Bug report 111535 indicates that calling "konqueror <font>" crashes.
-    TQTimer::singleShot(0, this, TQT_SLOT(timeout()));
+    TQTimer::singleShot(0, this, TQ_SLOT(timeout()));
     return true;
 }
 
diff --git a/kcontrol/tdefontinst/viewpart/FontViewPart.h b/kcontrol/tdefontinst/viewpart/FontViewPart.h
index 24f6d8d8b..62a380f85 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewPart.h
+++ b/kcontrol/tdefontinst/viewpart/FontViewPart.h
@@ -45,7 +45,7 @@ class CFontPreview;
 
 class CFontViewPart : public KParts::ReadOnlyPart
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
 
diff --git a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp
index a43f9d1d2..a2ea58602 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp
@@ -30,12 +30,12 @@
 #include "FontViewPart.h"
 #include <kdebug.h>
 #include <tdeaboutdata.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <assert.h>
 
 extern "C"
 {
-    KDE_EXPORT void* init_libtdefontviewpart()
+    TDE_EXPORT void* init_libtdefontviewpart()
     {
         TDEGlobal::locale()->insertCatalogue("tdefontinst");
         return new KFI::CFontViewPartFactory;
diff --git a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.h b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.h
index 7ac96e9c8..a584d0888 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.h
+++ b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.h
@@ -39,13 +39,13 @@ namespace KFI
 
 class CFontViewPartFactory : public KLibFactory
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
 
     CFontViewPartFactory();
     virtual ~CFontViewPartFactory();
-    virtual TQObject *createObject(TQObject *parent = 0, const char *name = 0, const char *classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList());
+    virtual TQObject *createObject(TQObject *parent = 0, const char *name = 0, const char *classname = "TQObject", const TQStringList &args = TQStringList());
 
     static TDEInstance * instance();
 
diff --git a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
index df1fa92d2..057b54831 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
@@ -49,10 +49,10 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow()
 
     if(factory)
     {
-        KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());
-        KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
+        KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());
+        KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection());
 
-        itsPreview=(KParts::ReadOnlyPart *)factory->create(TQT_TQOBJECT(this), "fontvier", "KParts::ReadOnlyPart");
+        itsPreview=(KParts::ReadOnlyPart *)factory->create(this, "fontvier", "KParts::ReadOnlyPart");
 
         TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
         KURL         openURL;
@@ -72,9 +72,9 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow()
             itsPreview->openURL(openURL);
 
         TQSize             defSize(450, 380);
-        TDEConfigGroupSaver saver(kapp->config(), CFG_GROUP);
+        TDEConfigGroupSaver saver(tdeApp->config(), CFG_GROUP);
 
-        resize(kapp->config()->readSizeEntry(CFG_SIZE_KEY, &defSize));
+        resize(tdeApp->config()->readSizeEntry(CFG_SIZE_KEY, &defSize));
         show();
     }
     else
@@ -83,9 +83,9 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow()
 
 CFontViewerAppMainWindow::~CFontViewerAppMainWindow()
 {
-    TDEConfigGroupSaver saver(kapp->config(), CFG_GROUP);
-    kapp->config()->writeEntry(CFG_SIZE_KEY, size());
-    kapp->config()->sync();
+    TDEConfigGroupSaver saver(tdeApp->config(), CFG_GROUP);
+    tdeApp->config()->writeEntry(CFG_SIZE_KEY, size());
+    tdeApp->config()->sync();
 }
 
 void CFontViewerAppMainWindow::fileOpen()
diff --git a/kcontrol/tdefontinst/viewpart/FontViewerApp.h b/kcontrol/tdefontinst/viewpart/FontViewerApp.h
index cc9a5981b..3b297a197 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewerApp.h
+++ b/kcontrol/tdefontinst/viewpart/FontViewerApp.h
@@ -38,7 +38,7 @@ namespace KFI
 
 class CFontViewerAppMainWindow : public KParts::MainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
 
diff --git a/kcontrol/tdefontinst/viewpart/tdefontview.desktop b/kcontrol/tdefontinst/viewpart/tdefontview.desktop
index 91121be2f..f253145b0 100644
--- a/kcontrol/tdefontinst/viewpart/tdefontview.desktop
+++ b/kcontrol/tdefontinst/viewpart/tdefontview.desktop
@@ -1,100 +1,11 @@
 [Desktop Entry]
 Name=TDEFontView
-Name[be]=Прагляд шрыфтоў
-Name[bn]=কে-ফন্ট-ভিউ
-Name[cs]=Prohlížeč písem
-Name[eo]=Tiparorigardilo
-Name[eu]=TDEFontWiew
-Name[he]=מציג גופנים
-Name[hi]=के-फ़ॉन्ट-व्यू
-Name[mk]=КФонтПреглед
-Name[nb]=Skriftviser
-Name[nds]=Schriftoortkieker
-Name[ne]=K फन्ट दृश्य
-Name[nn]=Skriftvisar
-Name[rw]=K-IgaragazaImyandikire
-Name[se]=Fontačájeheaddji
-Name[sk]=Prehliadač písiem
-Name[sv]=Kfontview
-Name[tg]=Намоишгари КҲарф
-Name[vi]=Trình xem phông chữ TDE
-Name[wa]=Håyneu di fontes (TDEFontView)
-Name[zh_CN]=字体预览
 Exec=tdefontview %i %u
 Icon=font-x-generic
 X-TDE-StartupNotify=true
 Type=Application
 MimeType=application/x-font-ttf;application/x-font-type1;application/x-font-otf;application/x-font-ttc;application/x-font-pcf;application/x-font-bdf;application/vnd.tde.fontspackage
 GenericName=Font Viewer
-GenericName[af]=Skriftipe Besigter
-GenericName[ar]=معاين المحرف
-GenericName[be]=Праглядальнік шрыфтоў
-GenericName[bg]=Преглед на шрифтове
-GenericName[bn]=ফন্ট প্রদর্শক
-GenericName[br]=Gweler Nodrezhoù
-GenericName[bs]=Preglednik fontova
-GenericName[ca]=Visor de lletres
-GenericName[cs]=Prohlížeč písem
-GenericName[csb]=Przezérnik fòntów
-GenericName[cy]=Gwelydd Wynebfathau
-GenericName[da]=Skrifttype-fremviser
-GenericName[de]=Schriftartenbetrachter
-GenericName[el]=Προβολέας γραμματοσειρών
-GenericName[eo]=Tipara rigardilo
-GenericName[es]=Visor de tipos de letra
-GenericName[et]=Fontide vaataja
-GenericName[eu]=Letra-tipoen ikusgailua
-GenericName[fa]=مشاهده‌گر قلم
-GenericName[fi]=Kirjasinten näytin
-GenericName[fr]=Afficheur de polices
-GenericName[fy]=Lettertypewerjefte
-GenericName[ga]=Amharcán Clófhoirne
-GenericName[gl]=Visor de Fontes
-GenericName[he]=מציג גופנים
-GenericName[hr]=Preglednik fontova
-GenericName[hu]=Betűtípusböngésző
-GenericName[id]=Penampil Font
-GenericName[is]=Leturskoðari
-GenericName[it]=Visualizzatore di caratteri
-GenericName[ja]=フォントビューア
-GenericName[ka]=პროგრამა ფონტების სანახავად
-GenericName[kk]=Қаріпті қарап-шығу
-GenericName[km]=កម្មវិធីមើលពុម្ពអក្សរ
-GenericName[ko]=글꼴 뷰어
-GenericName[lt]=Šriftų žiūryklė
-GenericName[lv]=Fontu Skatītājs
-GenericName[mk]=Прегледувач на фонтови
-GenericName[ms]=Pemapar Fon
-GenericName[mt]=Werrej tal-fonts
-GenericName[nb]=Skrifttypeviser
-GenericName[nds]=Schriftoortkieker
-GenericName[ne]=फन्ट दर्शक
-GenericName[nl]=Lettertypeweergave
-GenericName[nn]=Skriftvisar
-GenericName[pa]=ਫੋਂਟ ਦਰਸ਼ਕ
-GenericName[pl]=Przeglądarka czcionek
-GenericName[pt]=Visualizador de Tipos de Letra
-GenericName[pt_BR]=Visualizador de fontes
-GenericName[ro]=Vizualizor de fonturi
-GenericName[ru]=Программа просмотра шрифтов
-GenericName[rw]=Ikigaragaza Imyandikire
-GenericName[se]=Fontačájeheaddji
-GenericName[sk]=Prehliadač písiem
-GenericName[sl]=Pregledovalnik pisav
-GenericName[sr]=Приказивач фонтова
-GenericName[sr@Latn]=Prikazivač fontova
-GenericName[sv]=Teckensnittsvisning
-GenericName[tg]=Намоишгари ҳарфҳо
-GenericName[th]=โปรแกรมดูแบบอักษร
-GenericName[tr]=Yazıtipi Görüntüleyici
-GenericName[tt]=Yazu Kürsätkeç
-GenericName[uk]=Переглядач шрифтів
-GenericName[uz]=Shrift koʻruvchi
-GenericName[uz@cyrillic]=Шрифт кўрувчи
-GenericName[vi]=Trình xem Phông chữ
-GenericName[wa]=Håyneu di fontes
-GenericName[zh_CN]=字体查看器
-GenericName[zh_TW]=字型檢視器
 Terminal=false
 X-TDE-InitialPreference=1
 Categories=Qt;TDE;Graphics;
diff --git a/kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop b/kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop
index cdb11f1c9..a0f8dbecb 100644
--- a/kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop
+++ b/kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop
@@ -1,83 +1,5 @@
 [Desktop Entry]
 Name=Font Viewer
-Name[af]=Skriftipe Besigter
-Name[ar]=معاين المحرف
-Name[az]=Yazı Növü Nümayişçisi
-Name[be]=Праглядальнік шрыфтоў
-Name[bg]=Преглед на шрифт
-Name[bn]=ফন্ট প্রদর্শক
-Name[br]=Gweler Nodrezhoù
-Name[bs]=Preglednik fontova
-Name[ca]=Visor de lletres
-Name[cs]=Prohlížeč písem
-Name[csb]=Przezérnik fòntów
-Name[cy]=Gwelydd Ffont
-Name[da]=Skrifttypevisning
-Name[de]=Schriftartenbetrachter
-Name[el]=Προβολέας γραμματοσειρών
-Name[eo]=Tiparorigardilo
-Name[es]=Visor de tipos de letra
-Name[et]=Fontide vaataja
-Name[eu]=Letra-tipo ikustailea
-Name[fa]=مشاهده‌گر قلم
-Name[fi]=Kirjasinten näytin
-Name[fr]=Afficheur de polices
-Name[fy]=Lettertypewerjefteprogramma
-Name[ga]=Amharcán Clófhoirne
-Name[gl]=Visor de Fontes
-Name[he]=מציג גופנים
-Name[hi]=फ़ॉन्ट प्रदर्शक
-Name[hr]=Preglednik fontova
-Name[hu]=A betűtípusok áttekintése
-Name[id]=Penampil Font
-Name[is]=Leturskoðari
-Name[it]=Vista caratteri
-Name[ja]=フォントビューア
-Name[ka]=პროგრამა ფონტების სანახავად
-Name[kk]=Қаріпті қарап-шығу
-Name[km]=កម្មវិធីមើលពុម្ពអក្សរ
-Name[ko]=글꼴 뷰어
-Name[lo]=ມຸມມອງແບບໄອຄອນ
-Name[lt]=Šrifto žiūriklis
-Name[lv]=Fontu Skatītājs
-Name[mk]=Прегледувач на фонтови
-Name[mn]=Бичиг харагч
-Name[ms]=Pemapar Fon
-Name[mt]=Werrej tal-fonts
-Name[nb]=Skrifttypeviser
-Name[nds]=Schriftoortkieker
-Name[ne]=फन्ट दर्शक
-Name[nl]=Lettertypeweergaveprogramma
-Name[nn]=Skriftvisar
-Name[nso]=Molebeledi wa Fonto
-Name[pa]=ਫੋਂਟ ਦਰਸ਼ਕ
-Name[pl]=Przeglądarka czcionek
-Name[pt]=Visualizador do Tipo de Letra
-Name[pt_BR]=Visualizador de Fontes
-Name[ro]=Vizualizor de fonturi
-Name[ru]=Просмотр шрифтов
-Name[rw]=Ikigaragaza Imyandikire
-Name[se]=Fontačájeheaddji
-Name[sk]=Prehliadač písiem
-Name[sl]=Prikazovalnik pisav
-Name[sr]=Приказивач фонтова
-Name[sr@Latn]=Prikazivač fontova
-Name[sv]=Teckensnittsvisning
-Name[ta]=எழுத்துரு காட்சி
-Name[tg]=Намоишгари ҳарф
-Name[th]=โปรแกรมดูแบบอักษร
-Name[tr]=Yazıtipi İzleyici
-Name[tt]=Yazu Kürsätkeç
-Name[uk]=Переглядач шрифтів
-Name[uz]=Shrift koʻruvchi
-Name[uz@cyrillic]=Шрифт кўрувчи
-Name[ven]=Muvhoni wa Fontu
-Name[vi]=Trình xem Phông chữ
-Name[wa]=Håyneu di fontes
-Name[xh]=Imboniselo Yohlobo lwegama
-Name[zh_CN]=字体查看器
-Name[zh_TW]=字型檢視器
-Name[zu]=Umbukisi Wohlobo lwamagama
 MimeType=application/x-font-ttf;application/x-font-type1;application/x-font-otf;application/x-font-ttc;application/x-font-pcf;application/x-font-bdf;application/vnd.tde.fontspackage
 X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View
 X-TDE-Library=libtdefontviewpart