5 files changed, 26 insertions, 163 deletions
diff --git a/kicker/applets/swallow/prefwidget.h b/kicker/applets/swallow/prefwidget.h
index a23d6414b..03cde1399 100644
--- a/kicker/applets/swallow/prefwidget.h
+++ b/kicker/applets/swallow/prefwidget.h
@@ -23,7 +23,7 @@
 
 class PreferencesWidget : public PreferencesWidgetBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	PreferencesWidget( SwallowCommandList* swc, TQWidget* parent = 0 );
diff --git a/kicker/applets/swallow/prefwidgetbase.ui b/kicker/applets/swallow/prefwidgetbase.ui
index bd2673efa..13f8aa300 100644
--- a/kicker/applets/swallow/prefwidgetbase.ui
+++ b/kicker/applets/swallow/prefwidgetbase.ui
@@ -119,16 +119,13 @@
         </spacer>
     </grid>
 </widget>
-<includes>
-    <include location="local" impldecl="in implementation">kdialog.h</include>
-</includes>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>keditlistbox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">keditlistbox.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+    <include location="local"  impldecl="in implementation">kdialog.h</include>
+</includes>
 </UI>
diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp
index 1ac34cfec..a9eea202e 100644
--- a/kicker/applets/swallow/swallow.cpp
+++ b/kicker/applets/swallow/swallow.cpp
@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <kshell.h>
 #include <twin.h>
 #include <twinmodule.h>
@@ -53,7 +53,7 @@ SwallowApplet * SwallowApplet::self = 0L;
 
 extern "C"
 {
-    KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) {
+    TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) {
 	return new SwallowApplet(configFile, parent, "kswallow applet");
     }
 }
@@ -157,11 +157,11 @@ void SwallowApplet::createApps( SwallowCommandList* list )
     while ( (it.current()) ) {
 	app = new SwallowApp( it.current(), this );
 	app->hide();
-	connect( app, TQT_SIGNAL( embedded(SwallowApp *)),
-		 TQT_SLOT( embedded(SwallowApp *)));
+	connect( app, TQ_SIGNAL( embedded(SwallowApp *)),
+		 TQ_SLOT( embedded(SwallowApp *)));
 	appList->append( app );
 	++it;
-	kapp->processEvents();
+	tdeApp->processEvents();
     }
 
     m_layout->activate();
@@ -179,8 +179,8 @@ void SwallowApplet::embedded( SwallowApp *app )
     kdDebug() << "--> ratio: " << app->sizeRatio() << endl;
     kdDebug() << "**** " << app << " is embedded now, with (" << app->width() << ", " << app->height() << ")" << endl;
 
-    disconnect( app, TQT_SIGNAL( embedded(SwallowApp *)),
-		this, TQT_SLOT( embedded(SwallowApp *)));
+    disconnect( app, TQ_SIGNAL( embedded(SwallowApp *)),
+		this, TQ_SLOT( embedded(SwallowApp *)));
 
     embeddedList->append( app );
 
@@ -278,8 +278,8 @@ SwallowApp::SwallowApp(const SwallowCommand *swc, TQWidget* parent,
     QXEmbed::initialize();
 
     winTitle = swc->title;
-    connect(SwallowApplet::winModule(), TQT_SIGNAL(windowAdded(WId)),
-	    this, TQT_SLOT(windowAdded(WId)));
+    connect(SwallowApplet::winModule(), TQ_SIGNAL(windowAdded(WId)),
+	    this, TQ_SLOT(windowAdded(WId)));
 
     if (!swc->cmdline.isEmpty()) {
 	TDEProcess *process = new TDEProcess;
@@ -287,10 +287,10 @@ SwallowApp::SwallowApp(const SwallowCommand *swc, TQWidget* parent,
 
 	// move window out of sight
 	//	*process << "-geometry";
-	//	*process << TQString("32x32+%1+%2").arg(kapp->desktop()->width()).arg(kapp->desktop()->height());
+	//	*process << TQString("32x32+%1+%2").arg(tdeApp->desktop()->width()).arg(tdeApp->desktop()->height());
 
-	connect(process, TQT_SIGNAL(processExited(TDEProcess*)),
-		this, TQT_SLOT(processExited(TDEProcess*)));
+	connect(process, TQ_SIGNAL(processExited(TDEProcess*)),
+		this, TQ_SLOT(processExited(TDEProcess*)));
 
 	process->start();
     }
@@ -330,8 +330,8 @@ void SwallowApp::windowAdded(WId win)
 	embed(win);
 	XReparentWindow(tqt_xdisplay(), win, winId(), 0, 0);
 
-	disconnect(SwallowApplet::winModule(), TQT_SIGNAL(windowAdded(WId)),
-		   this, TQT_SLOT(windowAdded(WId)));
+	disconnect(SwallowApplet::winModule(), TQ_SIGNAL(windowAdded(WId)),
+		   this, TQ_SLOT(windowAdded(WId)));
 
 	emit embedded( this );
     }
diff --git a/kicker/applets/swallow/swallow.h b/kicker/applets/swallow/swallow.h
index b4be4f624..8bacc79f3 100644
--- a/kicker/applets/swallow/swallow.h
+++ b/kicker/applets/swallow/swallow.h
@@ -44,7 +44,7 @@ typedef TQPtrList<SwallowApp> SwallowAppList;
 
 class SwallowApplet : public KPanelApplet
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     SwallowApplet( const TQString& configFile, TQWidget *parent,
@@ -88,7 +88,7 @@ private:
 
 class SwallowApp : public QXEmbed
 {
-    Q_OBJECT
+    TQ_OBJECT
 	
 public:
     SwallowApp( const SwallowCommand * swc, TQWidget* parent = 0,
diff --git a/kicker/applets/swallow/swallowapplet.desktop b/kicker/applets/swallow/swallowapplet.desktop
index af0f43c56..370c9693c 100644
--- a/kicker/applets/swallow/swallowapplet.desktop
+++ b/kicker/applets/swallow/swallowapplet.desktop
@@ -1,142 +1,8 @@
 [Desktop Entry]
 Type=Plugin
 Name=Swallow Applet
-Name[af]=Sluk Miniprogram
-Name[ar]=بريمج Swallow
-Name[az]=Batıq Proqramcıq
-Name[be]=Аплет праглынання
-Name[bn]=সোয়্যালো অ্যাপলেট
-Name[bs]=Applet - gutač
-Name[ca]=Applet contenidor
-Name[cs]=Pohlcovací applet
-Name[csb]=Aplet do zanurzaniô jinszëch
-Name[cy]=Rhaglennig Llyncu
-Name[da]=Swallow-panelprogram
-Name[de]=Einbettungsprogramm
-Name[el]=Ενσωμάτωση μικροεφαρμογής
-Name[eo]=Sistemaplikaĵetejo
-Name[es]=Miniaplicación contenedora
-Name[et]=Põimimise aplett
-Name[eu]=Swallow appleta
-Name[fa]=برنامک Swallow
-Name[fi]=Upotussovelma
-Name[fr]=Applet englobante
-Name[fy]=Ynslúte applet
-Name[gl]=Applet Swallow
-Name[he]=יישומון מעגן
-Name[hi]=स्वालो ऐपलेट
-Name[hr]=Progutaj aplet
-Name[hu]=Elnyelő kisalkalmazás
-Name[is]=Gleypi smáforrit
-Name[it]=Applet che ingloba
-Name[ja]=Swallow アプレット
-Name[ka]=მშთანთქავი აპლეტი
-Name[kk]=Сіңіру апплеті
-Name[km]=អាប់ភ្លេត Swallow
-Name[lt]=Swallow priemonė
-Name[mk]=Аплет „Голтни“
-Name[mn]=Шигтгэгч-програм
-Name[ms]=Aplet Lelayang
-Name[mt]=Applet "Swallow"
-Name[nb]=Svelge-panelprogram
-Name[nds]=Lüttprogramm för't Inbetten
-Name[ne]=स्वालो एप्लेट
-Name[nl]=Inbeddingsapplet
-Name[nn]=Svelge-applet
-Name[nso]=Applet ya Mometso
-Name[pa]=ਸਵਾਲੋਓ ਐਪਲਿਟ
-Name[pl]=Programik do zanurzania innych
-Name[pt]='Applet' Swallow
-Name[pt_BR]=Mini-aplicativo de integração
-Name[ro]=Miniaplicație de înglobare
-Name[ru]=Аплет поглощения
-Name[rw]=Kwemera Apuleti
-Name[se]=Njeallan-prográmmaš
-Name[sk]=Pohlcovací applet
-Name[sl]=Vstavek z lastovko
-Name[sr]=Аплет за гутање
-Name[sr@Latn]=Aplet za gutanje
-Name[sv]=Uppslukande miniprogram
-Name[ta]=உள்வாங்கும் சிறுநிரல்
-Name[te]=స్వాలొ అప్లేట్
-Name[tg]=Барномаи қурт доданӣ
-Name[tr]=Batık Programcık
-Name[tt]=Yotu Applete
-Name[uk]=Аплет Swallow
-Name[ven]=Apulete ya Swallow
-Name[vi]=Tiểu ứng dụng Chim nhạn
-Name[wa]=Aplikete avaleuse
-Name[zh_CN]=Swallow 小程序
-Name[zh_TW]=Swallow 面板小程式
-Name[zu]=I-Applet yokugwinya
+
 Comment=The swallow panel applet
-Comment[af]=Die sluk paneel miniprogram
-Comment[az]=Batıq panel 
-Comment[be]=Аплет праглынання для панэлі
-Comment[bn]=সোয়্যালো প্যানেল অ্যাপলেট
-Comment[bs]=Applet koji "guta" aplikacije u panel
-Comment[ca]=L'applet contenidor del plafó
-Comment[cs]=Pohlcovací applet pro panel
-Comment[csb]=Aplet dlô panelu jaczi ùsôdzô òbéńdã do zanurzaniô jinszëch
-Comment[cy]=Rhaglennig llyncu i'r panel
-Comment[da]=Swallow-panelprogrammet
-Comment[de]=Leiste zum Einbetten von X-Anwendungen
-Comment[el]=Μικροεφαρμογή του πίνακα που "καταπίνει"
-Comment[eo]=La panelaplikaĵeto enhavanta la dokitajn programojn
-Comment[es]=La miniaplicación del panel contenedora
-Comment[et]=Paneelil töötav põimimise aplett
-Comment[eu]=Swallow paneleko appleta
-Comment[fa]=برنامک تابلوی Swallow
-Comment[fi]=Paneelin upotussovelma
-Comment[fr]=L'applet englobante du tableau de bord
-Comment[fy]=Applet foar it ynlúte fan X-toepassingen
-Comment[gl]=O applet swallow para o painel
-Comment[he]=יישומון מעגן עבור הלוח
-Comment[hi]=स्वालो फलक ऐपलेट
-Comment[hr]=Gutač apleta za ploču
-Comment[hu]=Egy elnyelő panel-kisalkalmazás
-Comment[id]=Aplet panel swallow
-Comment[is]=Gleypispjalds smáforritið
-Comment[it]=Applet per inglobare le applicazioni nel pannello
-Comment[ja]=swallow パネルアプレット
-Comment[ka]=პანელის მშთანთქავი აპლეტი
-Comment[kk]=Сіңіру панель апплеті
-Comment[km]=អាប់ភ្លេតបន្ទះ swallow
-Comment[lt]=Swallow pulto priemonė
-Comment[mk]=Аплетот „Голтни“ од панелот
-Comment[mn]=X-програмуудыг холбогч програм
-Comment[ms]=Aplet panel lelayang
-Comment[mt]=Applet għall-pannell "swallow"
-Comment[nb]=Et panelprogram som svelger andre panelprogrammer
-Comment[nds]=Paneel för't Inbetten vun X-Programmen
-Comment[ne]=स्वालो प्यानल एप्लेट
-Comment[nl]=Applet voor het inbedden van X-toepassingen
-Comment[nn]=Svelge-panelappleten
-Comment[nso]=Applet ya panel ya mometso
-Comment[pa]=ਸਵਾਲੋਓ ਪੈਨਲ ਐਪਲਿਟ
-Comment[pl]=Programik dla panelu tworzący przestrzeń do zanurzania innych
-Comment[pt]=A 'applet' do painel swallow
-Comment[pt_BR]=Mini-aplicativo de integração para o painel
-Comment[ro]=Miniaplicație de panou pentru înglobare altor programe
-Comment[ru]=Аплет панели поглощения
-Comment[rw]=Apuleti y'umwanya kumira
-Comment[se]=Njeallan-panelprográmmaš
-Comment[sk]=Pohlcovací applet pre panel
-Comment[sl]=Vstavek lastovke za na pult
-Comment[sr]=Аплет панела за гутање
-Comment[sr@Latn]=Aplet panela za gutanje
-Comment[sv]=Uppslukande miniprogram för panelen
-Comment[ta]=உள்வாங்கும் பலக சிறுநிரல்
-Comment[tg]=Барномаи қурт додани сафҳа
-Comment[th]=แอพเพล็ต swallow 
-Comment[tr]=Batık panel 
-Comment[tt]=Yotuçı taqta applete
-Comment[uk]=Аплет панелі swallow
-Comment[vi]=Tiểu ứng dụng chạy bảng điều khiển chim nhạn
-Comment[wa]=L' aplikete avaleuse do scriftôr
-Comment[xh]=I window eneenkcukacha ye swallow applet
-Comment[zh_CN]=Swallow 面板小程序
-Comment[zh_TW]=swallow 面板小程式
-Comment[zu]=I-applet lewindi lemininingwane lokugwinya
+
 X-TDE-Library=swallow_panelapplet
 X-TDE-UniqueApplet=true