14 files changed, 90 insertions, 321 deletions

diff --git a/kview/modules/presenter/CMakeLists.txt b/kview/modules/presenter/CMakeLists.txt
index aa21d851..c50266af 100644
--- a/kview/modules/presenter/CMakeLists.txt
+++ b/kview/modules/presenter/CMakeLists.txt
@@ -26,9 +26,17 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES
-    kviewpresenter.desktop kviewpresenter.rc
-  DESTINATION ${DATA_INSTALL_DIR}/kview/kpartplugins )
+tde_create_translated_desktop(
+  SOURCE kviewpresenter.desktop
+  DESTINATION ${DATA_INSTALL_DIR}/kview/kpartplugins
+  PO_DIR kview-desktops
+)
+
+install(
+  FILES
+    kviewpresenter.rc
+  DESTINATION ${DATA_INSTALL_DIR}/kview/kpartplugins
+)
 
 
 ##### kview_presenterplugin (module) ############
diff --git a/kview/modules/presenter/DESIGN b/kview/modules/presenter/DESIGN
index 3b187e78..034a3032 100644
--- a/kview/modules/presenter/DESIGN
+++ b/kview/modules/presenter/DESIGN
@@ -27,15 +27,15 @@ Presenter Plugin:
 			- keep local copy of downloaded files
 			- delete local copy on destruction
 			- API:
-				QImage * image();
+				TQImage * image();
 				KURL url();
-				QString file(); //returns local filename or QString::null
+				TQString file(); //returns local filename or TQString::null
 		- when loading an item from the playlist first ask for a
-		  QImage, if that's not available ask for a local file, if
+		  TQImage, if that's not available ask for a local file, if
 		  that's also not available take the url.
 		- API:
-			QImage * image();
-			QString file();
+			TQImage * image();
+			TQString file();
 			KURL url();
 			void setRandom(bool);
 			void randomizeList();
diff --git a/kview/modules/presenter/config/CMakeLists.txt b/kview/modules/presenter/config/CMakeLists.txt
index e359bee9..3432b3ed 100644
--- a/kview/modules/presenter/config/CMakeLists.txt
+++ b/kview/modules/presenter/config/CMakeLists.txt
@@ -22,9 +22,11 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES
-    kviewpresenterconfig.desktop
-  DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
+tde_create_translated_desktop(
+  SOURCE kviewpresenterconfig.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog
+  PO_DIR kview-desktops
+)
 
 
 ##### kcm_kviewpresenterconfig (module) #########
diff --git a/kview/modules/presenter/config/kviewpresenterconfig.cpp b/kview/modules/presenter/config/kviewpresenterconfig.cpp
index 5cda7ee0..1e1e091c 100644
--- a/kview/modules/presenter/config/kviewpresenterconfig.cpp
+++ b/kview/modules/presenter/config/kviewpresenterconfig.cpp
@@ -38,7 +38,7 @@ KViewPresenterConfig::KViewPresenterConfig( TQWidget * parent, const char *, con
 	layout->setAutoAdd( true );
 
 	m_pCheckBox = new TQCheckBox( "This is only for testing...", this );
-	connect( m_pCheckBox, TQT_SIGNAL( clicked() ), this, TQT_SLOT( checkChanged() ) );
+	connect( m_pCheckBox, TQ_SIGNAL( clicked() ), this, TQ_SLOT( checkChanged() ) );
 }
 
 KViewPresenterConfig::~KViewPresenterConfig()
@@ -66,7 +66,4 @@ void KViewPresenterConfig::save()
 void KViewPresenterConfig::defaults()
 {
 }
-
-// vim:sw=4:ts=4
-
 #include "kviewpresenterconfig.moc"
diff --git a/kview/modules/presenter/config/kviewpresenterconfig.desktop b/kview/modules/presenter/config/kviewpresenterconfig.desktop
index e6f4ca32..64e5c389 100644
--- a/kview/modules/presenter/config/kviewpresenterconfig.desktop
+++ b/kview/modules/presenter/config/kviewpresenterconfig.desktop
@@ -9,112 +9,4 @@ X-TDE-FactoryName=KViewPresenterConfigFactory
 X-TDE-ParentComponents=kviewpresenter
 
 Name=Name
-Name[ar]=اسم
-Name[bg]=Име
-Name[br]=Anv
-Name[bs]=Ime
-Name[ca]=Nom
-Name[cy]=Enw
-Name[da]=Navn
-Name[el]=Όνομα
-Name[eo]=Nomo
-Name[es]=Nombre
-Name[et]=Nimi
-Name[eu]=Izena
-Name[fa]=نام
-Name[fi]=Nimi
-Name[fr]=Nom
-Name[ga]=Ainm
-Name[gl]=Nome
-Name[he]=שם
-Name[hi]=नाम
-Name[hu]=Név
-Name[is]=Heiti
-Name[it]=Nome
-Name[ja]=名前
-Name[kk]=Атауы
-Name[km]=ឈ្មោះ
-Name[lt]=Pavadinimas
-Name[ms]=Nama
-Name[nb]=Navn
-Name[nds]=Naam
-Name[ne]=नाम
-Name[nl]=Naam
-Name[nn]=Namn
-Name[pa]=ਨਾਂ
-Name[pl]=Nazwa
-Name[pt]=Nome
-Name[pt_BR]=Nome
-Name[ro]=Nume
-Name[ru]=Имя
-Name[se]=Namma
-Name[sk]=Meno
-Name[sl]=Ime
-Name[sr]=Име
-Name[sr@Latn]=Ime
-Name[sv]=Namn
-Name[ta]=பெயர்
-Name[tg]=Ном
-Name[uk]=Назва
-Name[uz]=Nomi
-Name[uz@cyrillic]=Номи
-Name[wa]=No
-Name[zh_CN]=名称
-Name[zh_HK]=名稱
-Name[zh_TW]=名稱
 Comment=Comment
-Comment[ar]=تعليق
-Comment[bg]=Коментар
-Comment[br]=Askelenn
-Comment[bs]=Komentar
-Comment[ca]=Comentari
-Comment[cy]=Sylwad
-Comment[da]=Kommentar
-Comment[de]=Kommentar
-Comment[el]=Σχόλιο
-Comment[eo]=Komento
-Comment[es]=Comentario
-Comment[et]=Kommentaar
-Comment[eu]=Iruzkina
-Comment[fa]=توضیح
-Comment[fi]=Kommentti
-Comment[fr]=Commentaire
-Comment[ga]=Nóta
-Comment[gl]=Comentario
-Comment[he]=הערה
-Comment[hi]=टिप्पणी
-Comment[hu]=Megjegyzés
-Comment[is]=Athugasemd
-Comment[it]=Commento
-Comment[ja]=コメント
-Comment[kk]=Түсініктемесі
-Comment[km]=សេចក្ដី​អធិប្បាយ
-Comment[lt]=Komentaras
-Comment[ms]=Komen
-Comment[nb]=Kommentar
-Comment[nds]=Kommentar
-Comment[ne]=टिप्पणी
-Comment[nl]=Omschrijving
-Comment[nn]=Kommentar
-Comment[pa]=ਟਿੱਪਣੀ
-Comment[pl]=Komentarz
-Comment[pt]=Comentário
-Comment[pt_BR]=Comentário
-Comment[ro]=Comentariu
-Comment[ru]=Комментарий
-Comment[se]=Kommeanta
-Comment[sk]=Komentár
-Comment[sl]=Komentar
-Comment[sr]=Коментар
-Comment[sr@Latn]=Komentar
-Comment[sv]=Kommentar
-Comment[ta]=குறிப்பு
-Comment[tg]=Эзоҳ
-Comment[tr]=Açıklama
-Comment[uk]=Коментар
-Comment[uz]=Izoh
-Comment[uz@cyrillic]=Изоҳ
-Comment[wa]=Rawete
-Comment[zh_CN]=注释
-Comment[zh_HK]=註解
-Comment[zh_TW]=註解
diff --git a/kview/modules/presenter/config/kviewpresenterconfig.h b/kview/modules/presenter/config/kviewpresenterconfig.h
index 3ad25c2b..73742259 100644
--- a/kview/modules/presenter/config/kviewpresenterconfig.h
+++ b/kview/modules/presenter/config/kviewpresenterconfig.h
@@ -25,7 +25,7 @@ class TQCheckBox;
 
 class KViewPresenterConfig : public TDECModule
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 	public:
 		KViewPresenterConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() );
@@ -41,7 +41,4 @@ class KViewPresenterConfig : public TDECModule
 	private:
 		TQCheckBox * m_pCheckBox;
 };
-
-// vim:sw=4:ts=4
-
 #endif // KVIEWPRESENTERCONFIG_H
diff --git a/kview/modules/presenter/imagelistdialog.ui b/kview/modules/presenter/imagelistdialog.ui
index 547c0cf0..1f7a2435 100644
--- a/kview/modules/presenter/imagelistdialog.ui
+++ b/kview/modules/presenter/imagelistdialog.ui
@@ -254,31 +254,26 @@
 </connections>
 <includes>
     <include location="global" impldecl="in declaration">kdialog.h</include>
+    <include location="local"  impldecl="in implementation">imagelistdialog.ui.h</include>
+    <include location="local"  impldecl="in implementation">imagelistitem.h</include>
     <include location="global" impldecl="in implementation">kdebug.h</include>
     <include location="global" impldecl="in implementation">kimageviewer/viewer.h</include>
-    <include location="global" impldecl="in implementation">tdeio/netaccess.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
     <include location="global" impldecl="in implementation">kurl.h</include>
     <include location="global" impldecl="in implementation">tdefiledialog.h</include>
-    <include location="global" impldecl="in implementation">tqstring.h</include>
+    <include location="global" impldecl="in implementation">tdeio/netaccess.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
     <include location="global" impldecl="in implementation">tdemessagebox.h</include>
-    <include location="local" impldecl="in implementation">imagelistitem.h</include>
-    <include location="local" impldecl="in implementation">imagelistdialog.ui.h</include>
+    <include location="global" impldecl="in implementation">tqstring.h</include>
 </includes>
 <forwards>
     <forward>class KURL</forward>
 </forwards>
-<Q_SLOTS>
+<slots>
     <slot access="private" specifier="non virtual">init()</slot>
     <slot specifier="non virtual">noSort()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includes>
-    <include location="global" impldecl="in implementation">knuminput.h</include>
-    <include location="global" impldecl="in implementation">kpushbutton.h</include>
-</includes>
-<includehints>
-    <includehint>kdialog.h</includehint>
-    <includehint>tdelistview.h</includehint>
-</includehints>
 </UI>
diff --git a/kview/modules/presenter/imagelistitem.cpp b/kview/modules/presenter/imagelistitem.cpp
index 62ca6e90..d002023d 100644
--- a/kview/modules/presenter/imagelistitem.cpp
+++ b/kview/modules/presenter/imagelistitem.cpp
@@ -78,5 +78,3 @@ const KURL & ImageListItem::url() const
 {
 	return m_url;
 }
-
-// vim:sw=4:ts=4
diff --git a/kview/modules/presenter/imagelistitem.h b/kview/modules/presenter/imagelistitem.h
index 321dcf4d..b10e5cfa 100644
--- a/kview/modules/presenter/imagelistitem.h
+++ b/kview/modules/presenter/imagelistitem.h
@@ -44,6 +44,4 @@ class ImageListItem : public TDEListViewItem
 		TQString m_filename;
 		KURL m_url;
 };
-
-// vim:sw=4:ts=4
 #endif // IMAGELISTITEM_H
diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp
index c7405547..96b3abbb 100644
--- a/kview/modules/presenter/kviewpresenter.cpp
+++ b/kview/modules/presenter/kviewpresenter.cpp
@@ -60,7 +60,6 @@ KViewPresenter::KViewPresenter( TQObject* parent, const char* name, const TQStri
 	, m_pSlideshowTimer( new TQTimer( this ) )
 {
 	kdDebug( 4630 ) << k_funcinfo << endl;
-	m_imagelist.setAutoDelete( true );
 
 	TQObjectList * viewerList = parent->queryList( 0, "KImageViewer Part", false, false );
 	m_pViewer = static_cast<KImageViewer::Viewer *>( viewerList->getFirst() );
@@ -68,18 +67,18 @@ KViewPresenter::KViewPresenter( TQObject* parent, const char* name, const TQStri
 	if( m_pViewer )
 	{
 		( void ) new TDEAction( i18n( "&Image List..." ), 0, 0,
-							this, TQT_SLOT( slotImageList() ),
+							this, TQ_SLOT( slotImageList() ),
 							actionCollection(), "plugin_presenter_imageList" );
 		m_paSlideshow = new TDEToggleAction( i18n( "Start &Slideshow" ), Key_S, actionCollection(), "plugin_presenter_slideshow" );
 		( void ) new TDEAction( i18n( "&Previous Image in List" ), "go-previous", ALT+Key_Left,
-							  this, TQT_SLOT( prev() ),
+							  this, TQ_SLOT( prev() ),
 							  actionCollection(), "plugin_presenter_prev" );
 		( void ) new TDEAction( i18n( "&Next Image in List" ), "go-next", ALT+Key_Right,
-							  this, TQT_SLOT( next() ),
+							  this, TQ_SLOT( next() ),
 							  actionCollection(), "plugin_presenter_next" );
 
-		connect( m_paSlideshow, TQT_SIGNAL( toggled( bool ) ), m_pImageList->m_pSlideshow, TQT_SLOT( setOn( bool ) ) );
-		connect( m_pImageList->m_pSlideshow, TQT_SIGNAL( toggled( bool ) ), m_paSlideshow, TQT_SLOT( setChecked( bool ) ) );
+		connect( m_paSlideshow, TQ_SIGNAL( toggled( bool ) ), m_pImageList->m_pSlideshow, TQ_SLOT( setOn( bool ) ) );
+		connect( m_pImageList->m_pSlideshow, TQ_SIGNAL( toggled( bool ) ), m_paSlideshow, TQ_SLOT( setChecked( bool ) ) );
 
 		// search for file_open action
 		KXMLGUIClient * parentClient = static_cast<KXMLGUIClient*>( parent->tqt_cast( "KXMLGUIClient" ) );
@@ -89,48 +88,48 @@ KViewPresenter::KViewPresenter( TQObject* parent, const char* name, const TQStri
 			m_paFileClose = parentClient->actionCollection()->action( "file_close" );
 		}
 		if( m_paFileClose )
-			connect( m_paFileClose, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotClose() ) );
+			connect( m_paFileClose, TQ_SIGNAL( activated() ), this, TQ_SLOT( slotClose() ) );
 		if( m_paFileOpen )
 		{
-			disconnect( m_paFileOpen, TQT_SIGNAL( activated() ), parent, TQT_SLOT( slotOpenFile() ) );
-			connect( m_paFileOpen, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotOpenFiles() ) );
+			disconnect( m_paFileOpen, TQ_SIGNAL( activated() ), parent, TQ_SLOT( slotOpenFile() ) );
+			connect( m_paFileOpen, TQ_SIGNAL( activated() ), this, TQ_SLOT( slotOpenFiles() ) );
 		}
 		else
 		{
 			(void) new TDEAction( i18n( "Open &Multiple Files..." ), "queue", CTRL+SHIFT+Key_O,
-							this, TQT_SLOT( slotOpenFiles() ),
+							this, TQ_SLOT( slotOpenFiles() ),
 							actionCollection(), "plugin_presenter_openFiles" );
 		}
-		connect( m_pViewer, TQT_SIGNAL( imageOpened( const KURL & ) ),
-				TQT_SLOT( slotImageOpened( const KURL & ) ) );
+		connect( m_pViewer, TQ_SIGNAL( imageOpened( const KURL & ) ),
+				TQ_SLOT( slotImageOpened( const KURL & ) ) );
 	}
 	else
 		kdWarning( 4630 ) << "no KImageViewer interface found - the presenter plugin won't work" << endl;
 
 	//( void )new KViewPresenterConfModule( this );
 
-	connect( m_pImageList->m_pListView, TQT_SIGNAL( executed( TQListViewItem* ) ),
-			this, TQT_SLOT( changeItem( TQListViewItem* ) ) );
-	connect( m_pImageList->m_pPrevious, TQT_SIGNAL( clicked() ),
-			this, TQT_SLOT( prev() ) );
-	connect( m_pImageList->m_pNext, TQT_SIGNAL( clicked() ),
-			this, TQT_SLOT( next() ) );
-	connect( m_pImageList->m_pListView, TQT_SIGNAL( spacePressed( TQListViewItem* ) ),
-			this, TQT_SLOT( changeItem( TQListViewItem* ) ) );
-	connect( m_pImageList->m_pListView, TQT_SIGNAL( returnPressed( TQListViewItem* ) ),
-			this, TQT_SLOT( changeItem( TQListViewItem* ) ) );
-	connect( m_pImageList->m_pSlideshow, TQT_SIGNAL( toggled( bool ) ),
-			this, TQT_SLOT( slideshow( bool ) ) );
-	connect( m_pImageList->m_pInterval, TQT_SIGNAL( valueChanged( int ) ),
-			this, TQT_SLOT( setSlideshowInterval( int ) ) );
-	connect( m_pImageList->m_pShuffle, TQT_SIGNAL( clicked() ),
-			this, TQT_SLOT( shuffle() ) );
-	connect( m_pImageList->m_pLoad, TQT_SIGNAL( clicked() ),
-			this, TQT_SLOT( loadList() ) );
-	connect( m_pImageList->m_pSave, TQT_SIGNAL( clicked() ),
-			this, TQT_SLOT( saveList() ) );
-	connect( m_pImageList->m_pCloseAll, TQT_SIGNAL( clicked() ),
-			this, TQT_SLOT( closeAll() ) );
+	connect( m_pImageList->m_pListView, TQ_SIGNAL( executed( TQListViewItem* ) ),
+			this, TQ_SLOT( changeItem( TQListViewItem* ) ) );
+	connect( m_pImageList->m_pPrevious, TQ_SIGNAL( clicked() ),
+			this, TQ_SLOT( prev() ) );
+	connect( m_pImageList->m_pNext, TQ_SIGNAL( clicked() ),
+			this, TQ_SLOT( next() ) );
+	connect( m_pImageList->m_pListView, TQ_SIGNAL( spacePressed( TQListViewItem* ) ),
+			this, TQ_SLOT( changeItem( TQListViewItem* ) ) );
+	connect( m_pImageList->m_pListView, TQ_SIGNAL( returnPressed( TQListViewItem* ) ),
+			this, TQ_SLOT( changeItem( TQListViewItem* ) ) );
+	connect( m_pImageList->m_pSlideshow, TQ_SIGNAL( toggled( bool ) ),
+			this, TQ_SLOT( slideshow( bool ) ) );
+	connect( m_pImageList->m_pInterval, TQ_SIGNAL( valueChanged( int ) ),
+			this, TQ_SLOT( setSlideshowInterval( int ) ) );
+	connect( m_pImageList->m_pShuffle, TQ_SIGNAL( clicked() ),
+			this, TQ_SLOT( shuffle() ) );
+	connect( m_pImageList->m_pLoad, TQ_SIGNAL( clicked() ),
+			this, TQ_SLOT( loadList() ) );
+	connect( m_pImageList->m_pSave, TQ_SIGNAL( clicked() ),
+			this, TQ_SLOT( saveList() ) );
+	connect( m_pImageList->m_pCloseAll, TQ_SIGNAL( clicked() ),
+			this, TQ_SLOT( closeAll() ) );
 
 	// allow drop on the dialog
 	m_pImageList->installEventFilter( this );
@@ -140,8 +139,8 @@ KViewPresenter::KViewPresenter( TQObject* parent, const char* name, const TQStri
 	// grab drops on the main view
 	m_pViewer->widget()->installEventFilter( this );
 
-	connect( m_pSlideshowTimer, TQT_SIGNAL( timeout() ),
-			this, TQT_SLOT( next() ) );
+	connect( m_pSlideshowTimer, TQ_SIGNAL( timeout() ),
+			this, TQ_SLOT( next() ) );
 }
 
 KViewPresenter::~KViewPresenter()
@@ -149,19 +148,19 @@ KViewPresenter::~KViewPresenter()
 	kdDebug( 4630 ) << k_funcinfo << endl;
 	if( m_paFileOpen )
 	{
-		disconnect( m_paFileOpen, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotOpenFiles() ) );
+		disconnect( m_paFileOpen, TQ_SIGNAL( activated() ), this, TQ_SLOT( slotOpenFiles() ) );
 		// If the parent() doesn't exist we either leave the "File Open" action
 		// in an unusable state or KView was just shutting down and therefor we
 		// can ignore this. I've only seen the second one happening and to get
 		// rid of the TQObject::connect warning we do the parent() check.
 		if( parent() )
-			connect( m_paFileOpen, TQT_SIGNAL( activated() ), parent(), TQT_SLOT( slotOpenFile() ) );
+			connect( m_paFileOpen, TQ_SIGNAL( activated() ), parent(), TQ_SLOT( slotOpenFile() ) );
 	}
 }
 
 bool KViewPresenter::eventFilter( TQObject *obj, TQEvent *ev )
 {
-	if( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pImageList) || TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pImageList->m_pListView) || TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pImageList->m_pListView->viewport()) || TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pViewer->widget()) )
+	if( obj == m_pImageList || obj == m_pImageList->m_pListView || obj == m_pImageList->m_pListView->viewport() || obj == m_pViewer->widget() )
 	{
 		switch( ev->type() )
 		{
@@ -190,14 +189,12 @@ bool KViewPresenter::eventFilter( TQObject *obj, TQEvent *ev )
 				{
 					for( TQStringList::const_iterator it = l.begin(); it != l.end(); ++it )
 					{
-						ImageInfo * info = new ImageInfo( KURL( *it ) );
+						ImageInfo info = ImageInfo( KURL( *it ) );
 						if( ! m_imagelist.contains( info ) )
 						{
-							m_imagelist.inSort( info );
+							m_imagelist.append( info );
 							( void )new ImageListItem( m_pImageList->m_pListView, KURL( *it ) );
 						}
-						else
-							delete info;
 					}
 					return true;
 				}
@@ -217,15 +214,13 @@ void KViewPresenter::slotImageOpened( const KURL & url )
 	if( ! m_bDontAdd )
 	{
 		kdDebug( 4630 ) << k_funcinfo << "imagelist:" << endl;
-		ImageInfo * info = new ImageInfo( url );
+		ImageInfo info = ImageInfo( url );
 		if( ! m_imagelist.contains( info ) )
 		{
-			m_imagelist.inSort( info );
+			m_imagelist.append( info );
 			TQListViewItem * item = new ImageListItem( m_pImageList->m_pListView, url );
 			makeCurrent( item );
 		}
-		else
-			delete info;
 	}
 }
 
@@ -247,14 +242,12 @@ void KViewPresenter::slotOpenFiles()
 	m_pViewer->openURL( *it );
 	for( ++it; it != urls.end(); ++it )
 	{
-		ImageInfo * info = new ImageInfo( *it );
+		ImageInfo info = ImageInfo( *it );
 		if( ! m_imagelist.contains( info ) )
 		{
-			m_imagelist.inSort( info );
+			m_imagelist.append( info );
 			( void )new ImageListItem( m_pImageList->m_pListView, *it );
 		}
-		else
-			delete info;
 	}
 }
 
@@ -265,7 +258,7 @@ void KViewPresenter::slotClose()
 		next = 0;
 
 	ImageInfo info( m_pCurrentItem->url() );
-	m_imagelist.remove( &info );
+	m_imagelist.remove( info );
 	delete m_pCurrentItem;
 	m_pCurrentItem = 0;
 
@@ -285,7 +278,7 @@ void KViewPresenter::changeItem( TQListViewItem * qitem )
 			{
 				kdDebug( 4630 ) << "file doesn't exist. removed." << endl;
 				ImageInfo info( item->url() );
-				m_imagelist.remove( &info );
+				m_imagelist.remove( info );
 				if( m_pCurrentItem == item )
 				{
 					TQListViewItem * next = m_pCurrentItem->itemBelow() ? m_pCurrentItem->itemBelow() : m_pImageList->m_pListView->firstChild();
@@ -430,14 +423,12 @@ void KViewPresenter::loadList()
 			while( ! t.eof() )
 			{
 				KURL url ( t.readLine() );
-				ImageInfo * info = new ImageInfo( url );
+				ImageInfo info = ImageInfo( url );
 				if( ! m_imagelist.contains( info ) )
 				{
-					m_imagelist.inSort( info );
+					m_imagelist.append( info );
 					( void )new ImageListItem( m_pImageList->m_pListView, url );
 				}
-				else
-					delete info;
 			}
 		}
 		else
@@ -487,6 +478,4 @@ void KViewPresenter::saveList()
 		}
 	}
 }
-
-// vim:sw=4:ts=4
 #include "kviewpresenter.moc"
diff --git a/kview/modules/presenter/kviewpresenter.desktop b/kview/modules/presenter/kviewpresenter.desktop
index 672ff605..7d55f9ae 100644
--- a/kview/modules/presenter/kviewpresenter.desktop
+++ b/kview/modules/presenter/kviewpresenter.desktop
@@ -11,108 +11,4 @@ X-TDE-PluginInfo-License=GPL
 X-TDE-PluginInfo-EnabledByDefault=true
 
 Name=Presenter
-Name[ar]=المقدّم
-Name[bg]=Презентация
-Name[br]=Emginniger
-Name[bs]=Prezentator
-Name[ca]=Presentador
-Name[cs]=Prezentace
-Name[cy]=Cyflwynydd
-Name[de]=Präsentationsprogramm
-Name[el]=Παρουσιαστής
-Name[eo]=Prezentilo
-Name[et]=Esitleja
-Name[eu]=Aurkezlea
-Name[fa]=ارائه‌کننده
-Name[fi]=Esitysohjelma
-Name[fr]=Présentateur
-Name[ga]=Láithreoir
-Name[gl]=Escaparate
-Name[he]=מצגות
-Name[hi]=प्रस्तुतकर्ता
-Name[hr]=Prezentator
-Name[hu]=Bemutató
-Name[it]=Presentazione
-Name[ja]=プレゼンタ
-Name[kk]=Презентатор
-Name[km]=កម្មវិធី​បង្ហាញ
-Name[lt]=Pristatytojas
-Name[ms]=Penyampai
-Name[nds]=Präsentatschoonprogramm
-Name[ne]=प्रस्तोता
-Name[nl]=Presentatieprogramma
-Name[nso]=Mohlagisi
-Name[pa]=ਪੇਸ਼ਕਾਰ
-Name[pl]=Prezenter
-Name[pt]=Apresentador
-Name[pt_BR]=Apresentador
-Name[ro]=Prezentare
-Name[ru]=Презентатор
-Name[sk]=Vytvorenie prezentácie
-Name[sl]=Predstavitelj
-Name[sr]=Презентер
-Name[sr@Latn]=Prezenter
-Name[sv]=Presentationer
-Name[ta]=வழங்குபவர்
-Name[tg]=Презентатор
-Name[tr]=Sunum Aracı
-Name[ven]=Mulanguli
-Name[xh]=Umbonisi
-Name[zh_CN]=演示板
-Name[zh_HK]=簡報器
-Name[zh_TW]=簡報
-Name[zu]=Umnikeli
 Comment=Creates an imagelist and enables you to create a slideshow
-Comment[ar]=ينشئ قائمة صور ويمكنك من استعراض الصور تلقائيا
-Comment[bg]=Създаване на списък с изображения и слайдшоу от тях
-Comment[bs]=Pravi listu slika i omogućuje vam da napravite slide show
-Comment[ca]=Crea una llista d'imatges i us permet crear un passi de diapositives
-Comment[cs]=Vytvoří seznam obrázků a umožní vám z nich vytvořit slideshow.
-Comment[cy]=Creu rhestr delweddau ac alluogi i chi greu sioe haenluniau
-Comment[da]=Laver en billedliste og giver dig muligheden for at lave et diasshow
-Comment[de]=Erzeugt eine Bilderliste und ermöglicht das Erstellen von Diashows
-Comment[el]=Δημιουργεί μια λίστα εικόνων και σας επιτρέπει να δημιουργήσετε μια προβολή σλάιντ
-Comment[es]=Crea una lista de imágenes ofreciendole la posibilidad de crear una animación de diapositivas
-Comment[et]=Loob piltide nimekirja ja laseb selle põhjal luua slaidiseansi
-Comment[eu]=Irudi-zerrenda bat sortzen du eta diapositiba-aurkezpena egiten du
-Comment[fa]=یک فهرست تصویر ایجاد می‌کند و شما را قادر به ایجاد یک نمایش اسلاید می‌کند
-Comment[fi]=Luo kuvalistan ja mahdollistaa esityksen luomisen
-Comment[fr]=Crée une liste d'images et vous permet de créer un diaporama
-Comment[gl]=Crea unha lista de imaxes e permite crear unha moviola
-Comment[he]=יוצר רשימת תמונות ומאפשר לך ליצור מצגת שקופיות
-Comment[hi]=एक छवि-सूची बनाता है तथा आपको एक स्लाइड-शो तैयार करने में सक्षम बनाता है
-Comment[hu]=Képsorozat összeállítását és bemutatását teszi lehetővé
-Comment[is]=Býr til myndlista og gerir þér kleyft að búa til myndsýningu
-Comment[it]=Crea una lista di immagini e permette di creare una presentazione
-Comment[ja]=画像リストを作成し、スライドショーを作成します
-Comment[kk]=Слайд-шоу көрсетуге кескіндер тізімін дайындау
-Comment[km]=បង្កើត​បញ្ជី​រូបភាព ហើយ​អាច​ឲ្យ​អ្នក​បង្កើត​ជា​ការ​បញ្ចាំង​ស្លាយ
-Comment[lt]=Sukuria paveikslėlių sąrašą ir leidžia jums sukurti skaidrių peržiūrą
-Comment[ms]=Cipta senarai imej dan membolehkan anda mencipta tayangan slaid
-Comment[nb]=Oppretter en bildeliste og lar deg lage en lysbildeserie
-Comment[nds]=Stellt en Bildlist op un lett Di en Diaschau opstellen
-Comment[ne]=छवि सूची सिर्जना गर्दछ र तपाईँलाई स्लाइड प्रर्दशन सिर्जना गर्न सक्षम पार्दछ
-Comment[nl]=Maakt een afbeeldingenlijst waarmee u een diashow kunt maken
-Comment[nn]=Lagar ei biletliste du kan bruka til framvising
-Comment[nso]=Hlagisa palo ya ponagalo gape ego dumelela go hlagisa slidesshow
-Comment[pl]=Tworzy listę obrazków i umożliwia tworzenie z niej pokazu slajdów
-Comment[pt]=Cria uma lista de imagens e permite-lhe criar uma apresentação
-Comment[pt_BR]=Cria uma lista de imagens e habilita você a criar uma exibição de slides
-Comment[ro]=Creează o listă de imagini şi vă permite să reallizaţi o succesiune de imagini
-Comment[ru]=Создание галерей изображений и просмотр их в качестве слайдов
-Comment[se]=Ráhkada govvalisttu ja diktá du ráhkadit govvačájeheami
-Comment[sk]=Vytvorí zoznam obrázok a umožní z nich vytvoriť prezentáciu
-Comment[sl]=Ustvari seznam slik in vam omogoča ustvariti predstavitev
-Comment[sr]=Прави листу слика и омогућава вам да направите слајд-шоу
-Comment[sr@Latn]=Pravi listu slika i omogućava vam da napravite slajd-šou
-Comment[sv]=Skapar en bildlista och ger dig möjlighet att göra ett bildspel
-Comment[ta]=திரைக் காட்சிக்கான பிம்ப பட்டியலை உருவாக்கலாம்
-Comment[tg]=Эҷоди нигористони тасвирот ва намоиши онҳо ҳамчун слайд
-Comment[tr]=Bir resim listesi oluşturur ve slayt gösterisi yapmanıza olanak tanır
-Comment[uk]=Створює список зображень та дозволяє створювати презентацію слайдів
-Comment[ven]=Iita mutevhe wa tshifanyiso ya dovha yani tendela uita tsumbedzo ya tshilaidi
-Comment[xh]=Yenza uluhlu lwemifanekiso ekuvumela ukwazi ukwenza umboniso wotyibiliko
-Comment[zh_CN]=创建图像列表，并能为您创建幻灯片
-Comment[zh_HK]=建立圖像清單並讓您能建立幻燈片式放映
-Comment[zh_TW]=建立影像清單並讓您能建立幻燈片式放映
-Comment[zu]=Idala uhlu lwesithombe futhi ikuvumela wena ukuba udale umbukiso wesithombe esishibilikayo
diff --git a/kview/modules/presenter/kviewpresenter.h b/kview/modules/presenter/kviewpresenter.h
index 94b9fa65..865c9f86 100644
--- a/kview/modules/presenter/kviewpresenter.h
+++ b/kview/modules/presenter/kviewpresenter.h
@@ -24,7 +24,7 @@
 #include <tdeparts/plugin.h>
 #include <kurl.h>
 
-#include <tqsortedlist.h>
+#include <tqvaluelist.h>
 
 namespace KImageViewer { class Viewer; }
 
@@ -37,7 +37,7 @@ class TDEAction;
 
 class KViewPresenter : public KParts::Plugin
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	KViewPresenter( TQObject* parent, const char* name, const TQStringList & );
@@ -47,6 +47,11 @@ protected:
 	struct ImageInfo
 	{
 		KURL url;
+
+		ImageInfo()
+			: url()
+		{
+		}
 		ImageInfo( const KURL & url )
 			: url( url )
 		{
@@ -57,7 +62,7 @@ protected:
 		}
 		bool operator!=( const ImageInfo & i1 )
 		{
-			return url.prettyURL() == i1.url.prettyURL();
+			return url.prettyURL() != i1.url.prettyURL();
 		}
 		bool operator>( const ImageInfo & i1 )
 		{
@@ -94,11 +99,9 @@ private:
 	TDEAction * m_paFileOpen;
 	TDEAction * m_paFileClose;
 
-	TQSortedList<ImageInfo> m_imagelist;
+	TQValueList<ImageInfo> m_imagelist;
 	bool m_bDontAdd;
 	ImageListItem * m_pCurrentItem;
 	TQTimer * m_pSlideshowTimer;
 };
-
-// vim:sw=4:ts=4:cindent
 #endif
diff --git a/kview/modules/presenter/kviewpresenterconfmodule.cpp b/kview/modules/presenter/kviewpresenterconfmodule.cpp
index 3d6de8b4..aee4dd44 100644
--- a/kview/modules/presenter/kviewpresenterconfmodule.cpp
+++ b/kview/modules/presenter/kviewpresenterconfmodule.cpp
@@ -54,7 +54,4 @@ void KViewPresenterConfModule::createPage( TQFrame * page )
 
 	m_pCheckBox = new TQCheckBox( "This is only for testing...", page );
 }
-
-// vim:sw=4:ts=4
-
 #include "kviewpresenterconfmodule.moc"
diff --git a/kview/modules/presenter/kviewpresenterconfmodule.h b/kview/modules/presenter/kviewpresenterconfmodule.h
index 2c9a2ef6..5787541f 100644
--- a/kview/modules/presenter/kviewpresenterconfmodule.h
+++ b/kview/modules/presenter/kviewpresenterconfmodule.h
@@ -27,7 +27,7 @@ class TQCheckBox;
 
 class KViewPresenterConfModule : public KPreferencesModule
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 	public:
 		KViewPresenterConfModule( TQObject * parent );
@@ -44,7 +44,4 @@ class KViewPresenterConfModule : public KPreferencesModule
 	private:
 		TQCheckBox * m_pCheckBox;
 };
-
-// vim:sw=4:ts=4
-
 #endif // KVIEWPRESENTERCONFMODULE_H