16 files changed, 63 insertions, 300 deletions

diff --git a/kview/kviewviewer/CMakeLists.txt b/kview/kviewviewer/CMakeLists.txt
index 78829f61..61e738fb 100644
--- a/kview/kviewviewer/CMakeLists.txt
+++ b/kview/kviewviewer/CMakeLists.txt
@@ -25,7 +25,12 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kviewviewer.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+tde_create_translated_desktop(
+  SOURCE kviewviewer.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
+  PO_DIR kview-desktops
+)
+
 install( FILES kviewviewer.rc kviewviewer_ro.rc kviewpopup.rc DESTINATION ${DATA_INSTALL_DIR}/kviewviewer )
 
 
diff --git a/kview/kviewviewer/ChangeLog b/kview/kviewviewer/ChangeLog
index e76a70cd..67951dda 100644
--- a/kview/kviewviewer/ChangeLog
+++ b/kview/kviewviewer/ChangeLog
@@ -64,5 +64,3 @@
 	* kviewviewer.{cpp,h,rc}, kviewviewer_ro.rc:
 		added "rotate clockwise" and changed icon of CCW (patch by
 		Adriaan de Groot)
-
-# vim: sw=4 ts=4 tw=80 noet
diff --git a/kview/kviewviewer/config/CMakeLists.txt b/kview/kviewviewer/config/CMakeLists.txt
index 10b5b05f..7ab9ee80 100644
--- a/kview/kviewviewer/config/CMakeLists.txt
+++ b/kview/kviewviewer/config/CMakeLists.txt
@@ -22,9 +22,11 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES
-    kviewviewerpluginsconfig.desktop
-  DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
+tde_create_translated_desktop(
+  SOURCE kviewviewerpluginsconfig.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog
+  PO_DIR kview-desktops
+)
 
 
 ##### kcm_kviewviewerpluginsconfig (module) #####
diff --git a/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp b/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp
index af444cdd..d6d9a2d6 100644
--- a/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp
+++ b/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp
@@ -42,7 +42,4 @@ KViewViewerPluginsConfig::~KViewViewerPluginsConfig()
 {
 	delete m_config;
 }
-
-// vim: sw=4 ts=4 noet
-
 #include "kviewviewerpluginsconfig.moc"
diff --git a/kview/kviewviewer/config/kviewviewerpluginsconfig.desktop b/kview/kviewviewer/config/kviewviewerpluginsconfig.desktop
index b53d17ec..f76996cd 100644
--- a/kview/kviewviewer/config/kviewviewerpluginsconfig.desktop
+++ b/kview/kviewviewer/config/kviewviewerpluginsconfig.desktop
@@ -12,107 +12,4 @@ X-TDE-Weight=2
 X-TDE-CfgDlgHierarchy=Viewer
 
 Name=Plugins
-Name[ar]=البرامج المساعدة
-Name[bg]=Приставки
-Name[br]=Lugantoù
-Name[bs]=Dodaci
-Name[ca]=Connectors
-Name[cs]=Moduly
-Name[cy]=Ategion
-Name[da]=Plugin
-Name[de]=Module
-Name[el]=Πρόσθετα
-Name[eo]=Kromaĵoj
-Name[es]=Extensiones
-Name[et]=Pluginad
-Name[eu]=Pluginak
-Name[fa]=وصله‌ها
-Name[fi]=Liitännäiset
-Name[fr]=Modules externes
-Name[ga]=Breiseáin
-Name[he]=תוספים
-Name[hi]=प्लगइन्स
-Name[hr]=Umetci
-Name[hu]=Bővítőmodulok
-Name[is]=Íforrit
-Name[it]=Plugin
-Name[ja]=プラグイン
-Name[kk]=Плагин модулі
-Name[km]=កម្មវិធី​ជំនួយ
-Name[lt]=Priedai
-Name[ms]=Plugin
-Name[nb]=Programtillegg
-Name[nds]=Modulen
-Name[ne]=प्लगइन
-Name[nn]=Programtillegg
-Name[pa]=ਪਲੱਗਿੰਨ
-Name[pl]=Wtyczki
-Name[pt]='Plugins'
-Name[ro]=Module
-Name[ru]=Модули
-Name[rw]=Amacomeka
-Name[se]=Lassemoduvllat
-Name[sk]=Moduly
-Name[sl]=Vstavki
-Name[sr]=Прикључци
-Name[sr@Latn]=Priključci
-Name[sv]=Insticksprogram
-Name[ta]=சொருகுப்பொருள்
-Name[tg]=Модулҳо
-Name[tr]=Eklentiler
-Name[uk]=Втулки
-Name[uz]=Plaginlar
-Name[uz@cyrillic]=Плагинлар
-Name[wa]=Tchôke-divins
-Name[zh_CN]=插件
-Name[zh_HK]=插件
-Name[zh_TW]=外掛程式
 Comment=Choose and Configure Your Plugins
-Comment[bg]=Избор и настройване на приставки
-Comment[br]=Dibabit ha kefluniut ho lugentoù
-Comment[bs]=Izaberite i podesite vaše dodatke
-Comment[ca]=Escolliu i configureu els connectors
-Comment[cs]=Zvolte a nastavte si moduly
-Comment[da]=Vælg og indstil dine plugin
-Comment[de]=Auswahl und Einrichtung der Module
-Comment[el]=Επιλέξτε και ρυθμίστε τα πρόσθετα σας
-Comment[eo]=Elektu kaj agordu viajn kromprogramojn
-Comment[es]=Seleccione y configure sus extensiones
-Comment[et]=Pluginate valimine ja seadistamine
-Comment[eu]=Aukeratu eta konfigurau zure pluginak
-Comment[fa]=وصله‌های خود را انتخاب و پیکربندی کنید
-Comment[fi]=Valitse ja muokkaa liitännäisten asetuksia
-Comment[fr]=Choisissez et configurez vos modules externes
-Comment[gl]=Elexir e Configurar as súas Extensións
-Comment[he]=בחר והגדר את התוספים שלך
-Comment[hu]=Bővítőmodulok kiválasztása, beállítása
-Comment[is]=Velja og stilla íforrit
-Comment[it]=Scegli e configura i tuoi plugin
-Comment[ja]=プラグインを選択して設定します
-Comment[kk]=Плагин модулін таңдап алып баптау
-Comment[km]=ជ្រើស និង​កំណត់​រចនាសម្ព័ន្ធ​កម្មវិធី​ជំនួយ​របស់​អ្នក
-Comment[lt]=Pasirinkite ir konfigūruokite priedus
-Comment[ms]=Pilih dan Konfigur Plugin Anda
-Comment[nb]=Velg og sett opp programtilleggene
-Comment[nds]=Dien Modulen utsöken un instellen
-Comment[ne]=तपाईँको प्लगइन रोज्नुहोस् र कन्फिगर गर्नुहोस्
-Comment[nl]=Kies uw plugins en stel ze in
-Comment[nn]=Vel og set opp programtillegga
-Comment[pl]=Wybór i konfiguracja wtyczek
-Comment[pt]=Escolha e Configure os 'Plugins'
-Comment[pt_BR]=Escolha e Configure os Seus Plugins
-Comment[ro]=Alegeţi şi configuraţi modulele dumneavoastră
-Comment[ru]=Выберите и настройте модули
-Comment[sk]=Vyberte a nastavte si moduly
-Comment[sl]=Izberite in nastavite vstavke
-Comment[sr]=Изаберите и подесите ваше прикључке
-Comment[sr@Latn]=Izaberite i podesite vaše priključke
-Comment[sv]=Välj och anpassa insticksprogram
-Comment[ta]=சொருகுப்பொருள்களைத் தேர்ந்தெடுத்து வடிவமைக்கவும்
-Comment[tr]=Eklentilerinizi Seçin ve Yapılandırın:
-Comment[uk]=Виберіть та налаштуйте ваші втулки
-Comment[uz]=Plaginlarni tanlash va moslash
-Comment[uz@cyrillic]=Плагинларни танлаш ва мослаш
-Comment[zh_CN]=选择并配置您的插件
-Comment[zh_HK]=選擇及設定你的插件
-Comment[zh_TW]=選擇並設定您的外掛程式
diff --git a/kview/kviewviewer/config/kviewviewerpluginsconfig.h b/kview/kviewviewer/config/kviewviewerpluginsconfig.h
index 08f95b52..6beff0df 100644
--- a/kview/kviewviewer/config/kviewviewerpluginsconfig.h
+++ b/kview/kviewviewer/config/kviewviewerpluginsconfig.h
@@ -25,7 +25,7 @@ class TDEConfig;
 
 class KViewViewerPluginsConfig : public KSettings::PluginPage
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 	public:
 		KViewViewerPluginsConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() );
@@ -33,7 +33,4 @@ class KViewViewerPluginsConfig : public KSettings::PluginPage
 	private:
 		TDEConfig * m_config;
 };
-
-// vim: sw=4 ts=4 noet
-
 #endif // KVIEWVIEWERPLUGINSCONFIG_H
diff --git a/kview/kviewviewer/imagesettings.cpp b/kview/kviewviewer/imagesettings.cpp
index 1cb82f58..5c13f2d3 100644
--- a/kview/kviewviewer/imagesettings.cpp
+++ b/kview/kviewviewer/imagesettings.cpp
@@ -69,5 +69,3 @@ bool ImageSettings::isValid( TQString & /*msg*/ )
 }
 
 #include "imagesettings.moc"
-
-// vim:sw=4:ts=4
diff --git a/kview/kviewviewer/imagesettings.h b/kview/kviewviewer/imagesettings.h
index fa5ed06c..9e48ff61 100644
--- a/kview/kviewviewer/imagesettings.h
+++ b/kview/kviewviewer/imagesettings.h
@@ -25,7 +25,7 @@ class TQCheckBox;
 
 class ImageSettings : public KPrintDialogPage
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 	public:
 		ImageSettings( TQWidget * parent = 0, const char * name = 0 );
@@ -39,8 +39,4 @@ class ImageSettings : public KPrintDialogPage
 		TQCheckBox * m_pFitImage;
 		TQCheckBox * m_pCenter;
 };
-
-// vim:sw=4:ts=4
-
 #endif // IMAGESETTINGS_H
-
diff --git a/kview/kviewviewer/kviewkonqextension.cpp b/kview/kviewviewer/kviewkonqextension.cpp
index 43f1fa5d..e87c214a 100644
--- a/kview/kviewviewer/kviewkonqextension.cpp
+++ b/kview/kviewviewer/kviewkonqextension.cpp
@@ -80,7 +80,7 @@ void KViewKonqExtension::print()
 
 	TQImage imagetoprint;
 	if( printer.option( "app-kviewviewer-fitimage" ) == "1" )
-		imagetoprint = m_pCanvas->image()->smoothScale( metrics.width(), metrics.height(), TQ_ScaleMin );
+		imagetoprint = m_pCanvas->image()->smoothScale( metrics.width(), metrics.height(), TQImage::ScaleMin );
 	else
 		imagetoprint = *m_pCanvas->image();
 
@@ -98,8 +98,4 @@ void KViewKonqExtension::del()
 {
 	m_pViewer->slotDel();
 }
-
-// vim:sw=4:ts=4
-
 #include "kviewkonqextension.moc"
-
diff --git a/kview/kviewviewer/kviewkonqextension.h b/kview/kviewviewer/kviewkonqextension.h
index e46e78f6..d73622aa 100644
--- a/kview/kviewviewer/kviewkonqextension.h
+++ b/kview/kviewviewer/kviewkonqextension.h
@@ -28,7 +28,7 @@ class KViewViewer;
 class KViewKonqExtension: public KParts::BrowserExtension
 {
 	friend class KViewViewer; // it can emit our signals
-	Q_OBJECT
+	TQ_OBJECT
   
 	public:
 		KViewKonqExtension( KImageViewer::Canvas *, KViewViewer *parent, const char *name = 0 );
@@ -47,7 +47,4 @@ class KViewKonqExtension: public KParts::BrowserExtension
 		KViewViewer * m_pViewer;
 		KImageViewer::Canvas * m_pCanvas;
 };
-
-// vim:sw=4:ts=4
-
 #endif
diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp
index 781dbc24..a51d29e3 100644
--- a/kview/kviewviewer/kviewviewer.cpp
+++ b/kview/kviewviewer/kviewviewer.cpp
@@ -69,7 +69,7 @@ KViewViewer::KViewViewer( TQWidget *parentWidget, const char * /*widgetName*/,
 	KImageIO::registerFormats();
 
 	TQWidget * widget =  KParts::ComponentFactory::createInstanceFromQuery<TQWidget>(
-			"KImageViewer/Canvas", TQString(), TQT_TQOBJECT(m_pParentWidget) );
+			"KImageViewer/Canvas", TQString(), m_pParentWidget );
 	m_pCanvas = static_cast<KImageViewer::Canvas *>( widget->tqt_cast( "KImageViewer::Canvas" ) );
 	kdDebug( 4610 ) << "KImageViewer::Canvas at " << m_pCanvas << endl;
 	if( ! ( widget && m_pCanvas ) )
@@ -104,21 +104,21 @@ KViewViewer::KViewViewer( TQWidget *parentWidget, const char * /*widgetName*/,
 		else
 			setXMLFile( "kviewviewer_ro.rc" );
 
-		connect( widget, TQT_SIGNAL( contextPress( const TQPoint & ) ),
-				this, TQT_SLOT( slotPopupMenu( const TQPoint & ) ) );
-		connect( widget, TQT_SIGNAL( zoomChanged( double ) ),
-				this, TQT_SLOT( zoomChanged( double ) ) );
-		connect( widget, TQT_SIGNAL( showingImageDone() ),
-				this, TQT_SLOT( switchBlendEffect() ) );
-		connect( widget, TQT_SIGNAL( hasImage( bool ) ),
-				this, TQT_SLOT( hasImage( bool ) ) );
-		connect( widget, TQT_SIGNAL( imageChanged() ),
-				this, TQT_SLOT( setModified() ) );
+		connect( widget, TQ_SIGNAL( contextPress( const TQPoint & ) ),
+				this, TQ_SLOT( slotPopupMenu( const TQPoint & ) ) );
+		connect( widget, TQ_SIGNAL( zoomChanged( double ) ),
+				this, TQ_SLOT( zoomChanged( double ) ) );
+		connect( widget, TQ_SIGNAL( showingImageDone() ),
+				this, TQ_SLOT( switchBlendEffect() ) );
+		connect( widget, TQ_SIGNAL( hasImage( bool ) ),
+				this, TQ_SLOT( hasImage( bool ) ) );
+		connect( widget, TQ_SIGNAL( imageChanged() ),
+				this, TQ_SLOT( setModified() ) );
 
-		connect( m_pFileWatch, TQT_SIGNAL( dirty( const TQString & ) ),
-				this, TQT_SLOT( slotFileDirty( const TQString & ) ) );
+		connect( m_pFileWatch, TQ_SIGNAL( dirty( const TQString & ) ),
+				this, TQ_SLOT( slotFileDirty( const TQString & ) ) );
 
-		KSettings::Dispatcher::self()->registerInstance( instance(), this, TQT_SLOT( readSettings() ) );
+		KSettings::Dispatcher::self()->registerInstance( instance(), this, TQ_SLOT( readSettings() ) );
 
 		// by default disable progress info (so it won't open the dialog in Konqueror)
 		setProgressInfoEnabled( false );
@@ -202,8 +202,8 @@ bool KViewViewer::saveAs( const KURL & kurl )
 
 		TDEIO::Job * job = TDEIO::copy( KURL( m_file ), kurl, isProgressInfoEnabled() );
 		emit started( job );
-		connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-				this, TQT_SLOT( slotResultSaveAs( TDEIO::Job * ) ) );
+		connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+				this, TQ_SLOT( slotResultSaveAs( TDEIO::Job * ) ) );
 		return true;
 	}
 	kdDebug( 4610 ) << "call KParts::ReadWritePart::saveAs( " << kurl.prettyURL() << " )" << endl;
@@ -268,8 +268,8 @@ bool KViewViewer::openURL( const KURL & url )
 
 		m_pJob = TDEIO::get( m_url, m_pExtension->urlArgs().reload, isProgressInfoEnabled() );
 		emit started( m_pJob );
-		connect( m_pJob, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( slotJobFinished ( TDEIO::Job * ) ) );
-		connect( m_pJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
+		connect( m_pJob, TQ_SIGNAL( result( TDEIO::Job * ) ), TQ_SLOT( slotJobFinished ( TDEIO::Job * ) ) );
+		connect( m_pJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
 		return true;
 	}
 }
@@ -466,33 +466,33 @@ bool KViewViewer::saveFile()
 void KViewViewer::setupActions()
 {
 	m_paZoomIn = new TDEAction( i18n( "Zoom In" ), "zoom-in", TDEStdAccel::shortcut( TDEStdAccel::ZoomIn ), this,
-			TQT_SLOT( slotZoomIn() ), actionCollection(), "zoomin" );
+			TQ_SLOT( slotZoomIn() ), actionCollection(), "zoomin" );
 	m_paZoomOut = new TDEAction( i18n( "Zoom Out" ), "zoom-out", TDEStdAccel::shortcut( TDEStdAccel::ZoomOut ), this,
-			TQT_SLOT( slotZoomOut() ), actionCollection(), "zoomout" );
+			TQ_SLOT( slotZoomOut() ), actionCollection(), "zoomout" );
 
 	m_paZoom = new TDESelectAction( i18n( "Zoom" ), "viewmag", 0, actionCollection(), "view_zoom" );
-	connect( m_paZoom, TQT_SIGNAL( activated( const TQString & ) ), this, TQT_SLOT( setZoom( const TQString & ) ) );
+	connect( m_paZoom, TQ_SIGNAL( activated( const TQString & ) ), this, TQ_SLOT( setZoom( const TQString & ) ) );
 	m_paZoom->setEditable( true );
 	m_paZoom->clear();
 	m_paZoom->setItems( TQStringList::split( '|', "20%|25%|33%|50%|75%|100%|125%|150%|200%|250%|300%|350%|400%|450%|500%" ) );
 	m_paZoom->setCurrentItem( 5 );
 
 	m_paFlipMenu = new TDEActionMenu( i18n( "&Flip" ), actionCollection(), "flip" );
-	m_paFlipV = new TDEAction( i18n( "&Vertical" ), Key_V, this, TQT_SLOT( slotFlipV() ), actionCollection(), "flip_vertical" );
-	m_paFlipH = new TDEAction( i18n( "&Horizontal" ), Key_H, this, TQT_SLOT( slotFlipH() ), actionCollection(), "flip_horizontal" );
+	m_paFlipV = new TDEAction( i18n( "&Vertical" ), Key_V, this, TQ_SLOT( slotFlipV() ), actionCollection(), "flip_vertical" );
+	m_paFlipH = new TDEAction( i18n( "&Horizontal" ), Key_H, this, TQ_SLOT( slotFlipH() ), actionCollection(), "flip_horizontal" );
 	m_paFlipMenu->insert( m_paFlipV );
 	m_paFlipMenu->insert( m_paFlipH );
 
 	m_paRotateCCW = new TDEAction( i18n( "Ro&tate Counter-Clockwise" ), "object-rotate-left", 0, this,
-			TQT_SLOT( slotRotateCCW() ), actionCollection(), "rotateCCW" );
+			TQ_SLOT( slotRotateCCW() ), actionCollection(), "rotateCCW" );
 	m_paRotateCW = new TDEAction( i18n( "Rotate Clockwise" ), "object-rotate-right", 0, this,
-			TQT_SLOT( slotRotateCW() ), actionCollection(), "rotateCW" );
-	m_paSave = KStdAction::save( this, TQT_SLOT( slotSave() ), actionCollection() );
+			TQ_SLOT( slotRotateCW() ), actionCollection(), "rotateCW" );
+	m_paSave = KStdAction::save( this, TQ_SLOT( slotSave() ), actionCollection() );
 	m_paSave->setEnabled( false );
-	m_paSaveAs = KStdAction::saveAs( this, TQT_SLOT( slotSaveAs() ), actionCollection() );
+	m_paSaveAs = KStdAction::saveAs( this, TQ_SLOT( slotSaveAs() ), actionCollection() );
 
 	m_paFitToWin = new TDEAction( i18n( "Fit Image to Window" ), 0, 0, this,
-			TQT_SLOT( slotFitToWin() ), actionCollection(), "fittowin" );
+			TQ_SLOT( slotFitToWin() ), actionCollection(), "fittowin" );
 	m_paZoomIn->setEnabled( false );
 	m_paZoomOut->setEnabled( false );
 	m_paZoom->setEnabled( false );
@@ -503,18 +503,18 @@ void KViewViewer::setupActions()
 	m_paFlipMenu->setEnabled( false );
 	m_paFlipV->setEnabled( false );
 	m_paFlipH->setEnabled( false );
-	connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paZoomIn, TQT_SLOT( setEnabled( bool ) ) );
-	connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paZoomOut, TQT_SLOT( setEnabled( bool ) ) );
-	connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paZoom, TQT_SLOT( setEnabled( bool ) ) );
-	connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paRotateCCW, TQT_SLOT( setEnabled( bool ) ) );
-	connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paRotateCW, TQT_SLOT( setEnabled( bool ) ) );
-	connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paSaveAs, TQT_SLOT( setEnabled( bool ) ) );
-	connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paFitToWin, TQT_SLOT( setEnabled( bool ) ) );
-	connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paFlipMenu, TQT_SLOT( setEnabled( bool ) ) );
-	connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paFlipV, TQT_SLOT( setEnabled( bool ) ) );
-	connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paFlipH, TQT_SLOT( setEnabled( bool ) ) );
-
-	m_paShowScrollbars = new TDEToggleAction( i18n( "Show Scrollbars" ), 0, this, TQT_SLOT( slotToggleScrollbars() ),
+	connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paZoomIn, TQ_SLOT( setEnabled( bool ) ) );
+	connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paZoomOut, TQ_SLOT( setEnabled( bool ) ) );
+	connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paZoom, TQ_SLOT( setEnabled( bool ) ) );
+	connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paRotateCCW, TQ_SLOT( setEnabled( bool ) ) );
+	connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paRotateCW, TQ_SLOT( setEnabled( bool ) ) );
+	connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paSaveAs, TQ_SLOT( setEnabled( bool ) ) );
+	connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paFitToWin, TQ_SLOT( setEnabled( bool ) ) );
+	connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paFlipMenu, TQ_SLOT( setEnabled( bool ) ) );
+	connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paFlipV, TQ_SLOT( setEnabled( bool ) ) );
+	connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paFlipH, TQ_SLOT( setEnabled( bool ) ) );
+
+	m_paShowScrollbars = new TDEToggleAction( i18n( "Show Scrollbars" ), 0, this, TQ_SLOT( slotToggleScrollbars() ),
 	 actionCollection(), "show_scrollbars" );
 	m_paShowScrollbars->setCheckedState(i18n("Hide Scrollbars"));
 }
@@ -754,7 +754,7 @@ void KViewViewer::slotPopupMenu( const TQPoint &pos )
 {
 	KXMLGUIClient *popupGUIClient = new PopupGUIClient( instance(), m_popupDoc );
 
-	(void) new TDEAction( i18n( "Save Image As..." ), 0, this, TQT_SLOT( slotSaveAs() ),
+	(void) new TDEAction( i18n( "Save Image As..." ), 0, this, TQ_SLOT( slotSaveAs() ),
 						popupGUIClient->actionCollection(), "saveimageas" );
 
 	// ### HACK treat the image as dir to get the back/fwd/reload buttons (Simon)
@@ -773,7 +773,7 @@ void KViewViewer::slotResultSaveAs( TDEIO::Job *job )
 	else
 	{
 		emit completed();
-		TDEIO::CopyJob * cjob = ::tqqt_cast<TDEIO::CopyJob*>( job );
+		TDEIO::CopyJob * cjob = ::tqt_cast<TDEIO::CopyJob*>( job );
 		if( cjob )
 		{
 			m_url = cjob->destURL();
@@ -818,9 +818,9 @@ void KViewViewer::slotFileDirty( const TQString & )
 		KPushButton * no = new KPushButton( i18n("Do Not Reload"), hb );
 		layout->addWidget( no );
 		layout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
-		connect( yes, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotReloadUnmodified() ) );
-		connect( yes, TQT_SIGNAL( clicked() ), pop, TQT_SLOT( hide() ) );
-		connect( no, TQT_SIGNAL( clicked() ), pop, TQT_SLOT( hide() ) );
+		connect( yes, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotReloadUnmodified() ) );
+		connect( yes, TQ_SIGNAL( clicked() ), pop, TQ_SLOT( hide() ) );
+		connect( no, TQ_SIGNAL( clicked() ), pop, TQ_SLOT( hide() ) );
 		pop->setView( vb );
 		pop->setTimeout( 0 );
 		pop->setAutoDelete( true );
@@ -876,8 +876,4 @@ void KViewViewer::hasImage( bool b )
 		emit setWindowCaption( m_sCaption );
 	}
 }
-
-// vim:sw=4:ts=4
-
 #include "kviewviewer.moc"
-
diff --git a/kview/kviewviewer/kviewviewer.desktop b/kview/kviewviewer/kviewviewer.desktop
index c78edc08..a5643d98 100644
--- a/kview/kviewviewer/kviewviewer.desktop
+++ b/kview/kviewviewer/kviewviewer.desktop
@@ -2,117 +2,8 @@
 Type=Service
 Icon=kview
 # Comment=TDE Image Viewer Part
-# Comment[af]=Kde Beeld Aansig Deel
-# Comment[ar]=عارض جزء الصور ل TDE
-# Comment[br]=Perzh gweler skeudennoù TDE
-# Comment[bs]=TDE Part - Preglednik slika
-# Comment[ca]=Peça de TDE visualitzadora d'imatges
-# Comment[cs]=Komponenta prohlížeče obrázků TDE
-# Comment[cy]=Rhan Gwelydd Delweddau TDE 
-# Comment[da]=TDE Billedviser-part
-# Comment[de]=TDE Bildbetrachter-Komponente (KPart)
-# Comment[el]=Part προβολέα εικόνων του TDE
-# Comment[eo]=TDE-bildorigardilo parto
-# Comment[es]=Parte de visor de imágenes de TDE
-# Comment[et]=TDE pildifailide näitaja komponent
-# Comment[eu]=TDE irudi ikustailearen zatia
-# Comment[fa]=جزء مشاهده‌گر تصویر TDE
-# Comment[fi]=TDE:n kuvannäyttökomponentti
-# Comment[fr]=Composant d'affichage d'images de TDE
-# Comment[gl]=Visor de imaxes integrado do TDE
-# Comment[he]=רכיב מציג תמונות ל־TDE
-# Comment[hi]=केडीई छवि प्रदर्शक पार्ट
-# Comment[hr]=TDE komponenta za pregledavanje slika
-# Comment[hu]=TDE képnézegető objektum
-# Comment[is]=Myndbirtir TDE
-# Comment[it]=Componente TDE per la visione di immagini
-# Comment[ja]=TDE 画像ビューアパート
-# Comment[kk]=TDE кескінді қарау құралының бөлшегі
-# Comment[km]=ផ្នែក​របស់​កម្មវិធី​មើល​រូបភាព TDE
-# Comment[lt]=TDE paveikslėlių žiūriklio dalis
-# Comment[ms]=Bahagian Pemapar Imej TDE
-# Comment[nb]=TDE-bildefremviserdel
-# Comment[nds]=Bildkieker-Komponent för TDE
-# Comment[ne]=TDE छवि दर्शक भाग
-# Comment[nl]=TDE's weergavecomponent (Part) voor afbeeldingen
-# Comment[nn]=Biletvisardel for TDE
-# Comment[nso]=Seripa sa Molebeledi wa Ponagalo sa TDE
-# Comment[pa]=TDE ਚਿੱਤਰ ਦਰਸ਼ਕ ਭਾਗ
-# Comment[pl]=Składnik do przeglądarka obrazków TDE
-# Comment[pt]=Componente de Visualização de Imagens do TDE
-# Comment[pt_BR]=Parte do Visualizador de Imagens do TDE
-# Comment[ro]=Componentă TDE de vizualizare imagini
-# Comment[ru]=Компонент TDE просмотра изображений
-# Comment[se]=TDE:a govvačájehanoassi
-# Comment[sk]=Part TDE Prehliadač obrázkov
-# Comment[sl]=Del pregledovalnika slik TDE
-# Comment[sr]=TDE-ов део за приказивање слика
-# Comment[sr@Latn]=TDE-ov deo za prikazivanje slika
-# Comment[sv]=TDE:s bildvisningsdel
-# Comment[ta]=கேடிஇ பகுதி பிம்பக் காட்சி
-# Comment[tg]=Қисмати TDE-и намоиши тасвирот
-# Comment[tr]=TDE Resim Göstericisi Kısmı
-# Comment[uk]=Складова TDE переглядача зображень
-# Comment[ven]=Tshipida tsha muvhoni wa tshifanyiso tsha TDE
-# Comment[xh]=Iqhekeza Lombonisi Womfanekiso we TDE
-# Comment[zh_CN]=TDE 图像查看器组件
-# Comment[zh_HK]=TDE 圖像檢視器組件
-# Comment[zh_TW]=TDE 影像檢視器組件
-# Comment[zu]=Ingxenye Yombukisi Wesithombe se-TDE
 MimeType=image/gif;image/x-xpm;image/x-xbm;image/jpeg;image/x-bmp;image/png;image/x-ico;image/x-portable-bitmap;image/x-portable-pixmap;image/x-portable-greymap;image/tiff;image/jp2
 Name=KView Image Viewer
-Name[ar]=عارض KView للصور
-Name[br]=Gweler skeudennoù KView
-Name[bs]=KView predglednik slika
-Name[ca]=Visualitzador d'imatges KView
-Name[cs]=Prohlížeč obrázků KView
-Name[cy]=Celfigyn Gwelydd Delweddau KGweld
-Name[da]=KView-billedfremviser
-Name[de]=Bildbetrachter KView
-Name[el]=Προβολέας εικόνων KView
-Name[eo]=KView-Bildrigardilo
-Name[es]=Visor de imágenes de KView
-Name[et]=KView pildifailide näitaja
-Name[eu]=KView irudi ikustailea
-Name[fa]=مشاهده‌گر تصویر KView
-Name[fi]=KView-kuvannäytin
-Name[fr]=Visualisateur d'images KView
-Name[gl]=Visor de imaxes KView
-Name[he]=מציג תמונות KView
-Name[hi]=के-व्यू छवि प्रदर्शक
-Name[hu]=KView képnézegető
-Name[is]=KView myndbirtirinn
-Name[it]=Visore di immagini KView
-Name[ja]=KView 画像ビューア
-Name[kk]=KView кескінді қарау құралы
-Name[km]=កម្មវិធី​មើល​រូបភាព KView
-Name[lt]=KView paveikslėlių žiūryklė
-Name[ms]=Pemapar Imej KView
-Name[nb]=Bildeviseren KView
-Name[nds]=Bildkieker KView
-Name[ne]=केडीई दृश्य छवि दर्शक
-Name[nl]=KView afbeeldingenweergave
-Name[nn]=Biletvisaren KView
-Name[pa]=KView ਚਿੱਤਰ ਦਰਸ਼ਕ
-Name[pl]=Przeglądarka obrazków KView
-Name[pt]=Visualizador de Imagens KView
-Name[pt_BR]=Visualizador de Imagens do KVisualização
-Name[ro]=Vizualizor imagini KView
-Name[ru]=Программа просмотра изображений KView
-Name[se]=KView govvačájeheaddji
-Name[sk]=Prehliadač obrázkov KView
-Name[sl]=Pregledovalnik slik KView
-Name[sr]=KView, приказивач слика
-Name[sr@Latn]=KView, prikazivač slika
-Name[sv]=Kview bildvisning
-Name[ta]=கேகாட்சி பிம்பக் காட்சி
-Name[tg]=Барномаи намоиши тасвироти KView
-Name[tr]=KView Resim Görüntüleyici
-Name[uk]=Переглядач зображень KView
-Name[wa]=KView Håyneu d' imådjes
-Name[zh_CN]=KView 图像查看器
-Name[zh_HK]=KView 圖像檢視器
-Name[zh_TW]=KView 影像檢視器
 X-TDE-ServiceTypes=KImageViewer/Viewer,KParts/ReadWritePart,Browser/View
 X-TDE-InitialPreference=3
 X-TDE-Library=libkviewviewer
diff --git a/kview/kviewviewer/kviewviewer.h b/kview/kviewviewer/kviewviewer.h
index 58cb1c1c..691b40c4 100644
--- a/kview/kviewviewer/kviewviewer.h
+++ b/kview/kviewviewer/kviewviewer.h
@@ -44,7 +44,7 @@ class TQCache;
 
 class KDE_EXPORT KViewViewer : public KImageViewer::Viewer, public KViewViewerIface
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 	friend class KViewKonqExtension;
 
@@ -140,7 +140,4 @@ class KDE_EXPORT KViewViewer : public KImageViewer::Viewer, public KViewViewerIf
 		
 		TQValueVector<unsigned int> m_vEffects;
 };
-
-// vim:sw=4:ts=4
-
 #endif
diff --git a/kview/kviewviewer/kviewvieweriface.h b/kview/kviewviewer/kviewvieweriface.h
index 19a56232..970d095b 100644
--- a/kview/kviewviewer/kviewvieweriface.h
+++ b/kview/kviewviewer/kviewvieweriface.h
@@ -26,5 +26,3 @@ class KViewViewerIface
 };
 
 #endif // KVIEWVIEWERIFACE_H
-
-// vim: sw=4 ts=4
diff --git a/kview/kviewviewer/printimagesettings.ui b/kview/kviewviewer/printimagesettings.ui
index b33b7798..36f07649 100644
--- a/kview/kviewviewer/printimagesettings.ui
+++ b/kview/kviewviewer/printimagesettings.ui
@@ -180,10 +180,8 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="global" impldecl="in implementation">knuminput.h</include>
+    <include location="global" impldecl="in implementation">tqwidget.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>tqwidget.h</includehint>
-</includehints>
 </UI>
diff --git a/kview/kviewviewer/test/test.h b/kview/kviewviewer/test/test.h
index 608ca4e9..189017bb 100644
--- a/kview/kviewviewer/test/test.h
+++ b/kview/kviewviewer/test/test.h
@@ -12,7 +12,7 @@ namespace KParts { class ReadWritePart; }
  
 class Test : public KParts::MainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     Test();