10 files changed, 42 insertions, 122 deletions
diff --git a/parts/bookmarks/CMakeLists.txt b/parts/bookmarks/CMakeLists.txt
index 0422965c..ff371ef8 100644
--- a/parts/bookmarks/CMakeLists.txt
+++ b/parts/bookmarks/CMakeLists.txt
@@ -26,7 +26,11 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevbookmarks.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+tde_create_translated_desktop(
+  SOURCE kdevbookmarks.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
+  PO_DIR tdevelop-desktops
+)
 
 
 ##### libkdevbookmarks (module) #################
diff --git a/parts/bookmarks/bookmarks_config.cpp b/parts/bookmarks/bookmarks_config.cpp
index c5ef7191..f49b76c8 100644
--- a/parts/bookmarks/bookmarks_config.cpp
+++ b/parts/bookmarks/bookmarks_config.cpp
@@ -32,7 +32,7 @@ BookmarksConfig::~BookmarksConfig()
  */
 void BookmarksConfig::writeConfig()
 {
-	TDEConfig *config = kapp->config();   
+	TDEConfig *config = tdeApp->config();   
 	config->setGroup("Bookmarks");
 	
 	config->writeEntry("Context", _context );
@@ -49,7 +49,7 @@ void BookmarksConfig::writeConfig()
  */
 void BookmarksConfig::readConfig()
 {
-	TDEConfig *config = kapp->config();
+	TDEConfig *config = tdeApp->config();
 	config->setGroup("Bookmarks");
 	
 	_context = config->readPropertyEntry( "Context", 5 ).toInt();
@@ -134,5 +134,3 @@ void BookmarksConfig::setToken( TQString const & token )
 {
 	_token = token;
 }
-
-// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off;
diff --git a/parts/bookmarks/bookmarks_config.h b/parts/bookmarks/bookmarks_config.h
index 38a3f0e9..6721bd7d 100644
--- a/parts/bookmarks/bookmarks_config.h
+++ b/parts/bookmarks/bookmarks_config.h
@@ -49,5 +49,3 @@ private:
 };
 
 #endif
-
-// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off;
diff --git a/parts/bookmarks/bookmarks_part.cpp b/parts/bookmarks/bookmarks_part.cpp
index f7ac78cb..a22756df 100644
--- a/parts/bookmarks/bookmarks_part.cpp
+++ b/parts/bookmarks/bookmarks_part.cpp
@@ -41,11 +41,11 @@
 #define BOOKMARKSETTINGSPAGE 1
 
 typedef KDevGenericFactory<BookmarksPart> BookmarksFactory;
-static const KDevPluginInfo data("kdevbookmarks");
-K_EXPORT_COMPONENT_FACTORY( libkdevbookmarks, BookmarksFactory( data ) )
+static const KDevPluginInfo pluginData("kdevbookmarks");
+K_EXPORT_COMPONENT_FACTORY( libkdevbookmarks, BookmarksFactory( pluginData ) )
 
 BookmarksPart::BookmarksPart(TQObject *parent, const char *name, const TQStringList& )
-	: KDevPlugin(&data, parent, name ? name : "BookmarksPart" )
+	: KDevPlugin(&pluginData, parent, name ? name : "BookmarksPart" )
 {
 	setInstance(BookmarksFactory::instance());
 
@@ -64,19 +64,19 @@ BookmarksPart::BookmarksPart(TQObject *parent, const char *name, const TQStringL
 	_editorMap.setAutoDelete( true );
 	_settingMarks = false;
 
-	connect( partController(), TQT_SIGNAL( partAdded( KParts::Part * ) ), this, TQT_SLOT( partAdded( KParts::Part * ) ) );
+	connect( partController(), TQ_SIGNAL( partAdded( KParts::Part * ) ), this, TQ_SLOT( partAdded( KParts::Part * ) ) );
 
 	_configProxy = new ConfigWidgetProxy( core() );
 	_configProxy->createProjectConfigPage( i18n("Bookmarks"), BOOKMARKSETTINGSPAGE, info()->icon() );
-	connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )),
-		this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) );
+	connect( _configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )),
+		this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) );
 
-	connect( _widget, TQT_SIGNAL( removeAllBookmarksForURL( const KURL & ) ),
-		this, TQT_SLOT( removeAllBookmarksForURL( const KURL & ) ) );
-	connect( _widget, TQT_SIGNAL( removeBookmarkForURL( const KURL &, int ) ),
-		this, TQT_SLOT( removeBookmarkForURL( const KURL &, int ) ) );
+	connect( _widget, TQ_SIGNAL( removeAllBookmarksForURL( const KURL & ) ),
+		this, TQ_SLOT( removeAllBookmarksForURL( const KURL & ) ) );
+	connect( _widget, TQ_SIGNAL( removeBookmarkForURL( const KURL &, int ) ),
+		this, TQ_SLOT( removeBookmarkForURL( const KURL &, int ) ) );
 
-	connect( _marksChangeTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( marksChanged() ) );
+	connect( _marksChangeTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( marksChanged() ) );
 
 	_config = new BookmarksConfig;
 	_config->readConfig();
@@ -112,10 +112,10 @@ void BookmarksPart::partAdded( KParts::Part * part )
 
 			// connect to this editor
 			KTextEditor::Document * doc = static_cast<KTextEditor::Document*>( ro_part );
-			connect( doc, TQT_SIGNAL( marksChanged() ), this, TQT_SLOT( marksEvent() ) );
+			connect( doc, TQ_SIGNAL( marksChanged() ), this, TQ_SLOT( marksEvent() ) );
 
 			// workaround for a katepart oddity where it drops all bookmarks on 'reload'
-			connect( doc, TQT_SIGNAL( completed() ), this, TQT_SLOT( reload() ) );
+			connect( doc, TQ_SIGNAL( completed() ), this, TQ_SLOT( reload() ) );
 		}
 	}
 }
@@ -124,7 +124,7 @@ void BookmarksPart::reload()
 {
 	//kdDebug(0) << "BookmarksPart::reload()" << endl;
 
-	TQObject * senderobj = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>( sender() ));
+	TQObject * senderobj = const_cast<TQObject*>(sender());
 	if ( KParts::ReadOnlyPart * ro_part = dynamic_cast<KParts::ReadOnlyPart *>( senderobj ) )
 	{
 		if ( partIsSane( ro_part ) )
@@ -140,7 +140,7 @@ void BookmarksPart::marksEvent()
 
 	if ( ! _settingMarks )
 	{
-		TQObject * senderobj = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>( sender() ));
+		TQObject * senderobj = const_cast<TQObject*>(sender());
 		KParts::ReadOnlyPart * ro_part = dynamic_cast<KParts::ReadOnlyPart *>( senderobj );
 
 		if ( partIsSane( ro_part ) && !_dirtyParts.contains( ro_part ) )
@@ -203,7 +203,7 @@ void BookmarksPart::restorePartialProjectSession( const TQDomElement * el )
 				TQString line = mark.attribute( "line" );
 				if ( line != TQString() )
 				{
-					data->marks.append( tqMakePair( line.toInt(), TQString() ) );
+					data->marks.append( qMakePair( line.toInt(), TQString() ) );
 				}
 				mark = mark.nextSibling().toElement();
 			}
@@ -409,7 +409,7 @@ EditorData * BookmarksPart::storeBookmarksForURL( KParts::ReadOnlyPart * ro_part
 			if ( it.current()->type & KTextEditor::MarkInterface::markType01 )
 			{
 			    int line = it.current()->line;
-				data->marks.append( tqMakePair( line, TQString() ) );
+				data->marks.append( qMakePair( line, TQString() ) );
 			}
 			++it;
 		}
@@ -490,7 +490,7 @@ void BookmarksPart::insertConfigWidget( const KDialogBase * dlg, TQWidget * page
 	if ( pagenumber == BOOKMARKSETTINGSPAGE )
 	{
 		BookmarkSettings * w = new BookmarkSettings( this, page );
-		connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(slotAccept()) );
+		connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(slotAccept()) );
 	}
 }
 
@@ -564,5 +564,3 @@ BookmarksConfig * BookmarksPart::config( )
 }
 
 #include "bookmarks_part.moc"
-
-// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off;
diff --git a/parts/bookmarks/bookmarks_part.h b/parts/bookmarks/bookmarks_part.h
index f51603d7..b0b58b6b 100644
--- a/parts/bookmarks/bookmarks_part.h
+++ b/parts/bookmarks/bookmarks_part.h
@@ -40,7 +40,7 @@ class TQDomElement;
 
 class BookmarksPart : public KDevPlugin
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
@@ -106,5 +106,3 @@ private:
 
 
 #endif
-
-// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off;
diff --git a/parts/bookmarks/bookmarks_settings.cpp b/parts/bookmarks/bookmarks_settings.cpp
index 58369d92..56a64b5a 100644
--- a/parts/bookmarks/bookmarks_settings.cpp
+++ b/parts/bookmarks/bookmarks_settings.cpp
@@ -62,5 +62,3 @@ void BookmarkSettings::slotAccept()
 
 
 #include "bookmarks_settings.moc"
-
-// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off;
diff --git a/parts/bookmarks/bookmarks_settings.h b/parts/bookmarks/bookmarks_settings.h
index a28f424e..278fa637 100644
--- a/parts/bookmarks/bookmarks_settings.h
+++ b/parts/bookmarks/bookmarks_settings.h
@@ -18,7 +18,7 @@ class BookmarksPart;
 
 class BookmarkSettings : public BookmarkSettingsBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public:
diff --git a/parts/bookmarks/bookmarks_widget.cpp b/parts/bookmarks/bookmarks_widget.cpp
index 39dad5e3..33354269 100644
--- a/parts/bookmarks/bookmarks_widget.cpp
+++ b/parts/bookmarks/bookmarks_widget.cpp
@@ -150,10 +150,10 @@ BookmarksWidget::BookmarksWidget(BookmarksPart *part)
 	setAllColumnsShowFocus( true );
 // 	setSortColumn( -1 );
 
-	connect( this, TQT_SIGNAL( executed( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) );
-	connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) );
-	connect( this, TQT_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ),
-		this, TQT_SLOT( popupMenu(TQListViewItem *, const TQPoint & , int ) ) );
+	connect( this, TQ_SIGNAL( executed( TQListViewItem * ) ), this, TQ_SLOT( itemClicked( TQListViewItem * ) ) );
+	connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), this, TQ_SLOT( itemClicked( TQListViewItem * ) ) );
+	connect( this, TQ_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ),
+		this, TQ_SLOT( popupMenu(TQListViewItem *, const TQPoint & , int ) ) );
 }
 
 
@@ -270,18 +270,18 @@ void BookmarksWidget::popupMenu( TQListViewItem * item, const TQPoint & p, int )
 			popup.insertTitle( _selectedItem->url().fileName() + i18n(", line ")
 				+ TQString::number( _selectedItem->line() +1 ) );
 
-			popup.insertItem( i18n("Remove This Bookmark"), this, TQT_SLOT( doEmitRemoveBookMark() ) );
+			popup.insertItem( i18n("Remove This Bookmark"), this, TQ_SLOT( doEmitRemoveBookMark() ) );
 		}
 		else
 		{
 			popup.insertTitle( _selectedItem->url().fileName() + i18n( ", All" ) );
-			popup.insertItem( i18n("Remove These Bookmarks"), this, TQT_SLOT( doEmitRemoveBookMark() ) );
+			popup.insertItem( i18n("Remove These Bookmarks"), this, TQ_SLOT( doEmitRemoveBookMark() ) );
 		}
 		
 		popup.insertSeparator();
 		
-		popup.insertItem( i18n( "Collapse All" ), this, TQT_SLOT(collapseAll()) );
-		popup.insertItem( i18n( "Expand All" ), this, TQT_SLOT(expandAll()) );
+		popup.insertItem( i18n( "Collapse All" ), this, TQ_SLOT(collapseAll()) );
+		popup.insertItem( i18n( "Expand All" ), this, TQ_SLOT(expandAll()) );
 		
 		popup.exec(p);
 	}
@@ -332,5 +332,3 @@ void BookmarksWidget::expandAll( )
 
 
 #include "bookmarks_widget.moc"
-
-// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off;
diff --git a/parts/bookmarks/bookmarks_widget.h b/parts/bookmarks/bookmarks_widget.h
index 57180574..3246cec0 100644
--- a/parts/bookmarks/bookmarks_widget.h
+++ b/parts/bookmarks/bookmarks_widget.h
@@ -28,7 +28,7 @@ class BookmarksConfig;
 
 class BookmarksWidget : public TDEListView, public TQToolTip
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
@@ -69,5 +69,3 @@ private:
 
 
 #endif
-
-// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off;
diff --git a/parts/bookmarks/kdevbookmarks.desktop b/parts/bookmarks/kdevbookmarks.desktop
index dfad7dbf..a21150c6 100644
--- a/parts/bookmarks/kdevbookmarks.desktop
+++ b/parts/bookmarks/kdevbookmarks.desktop
@@ -1,82 +1,12 @@
 [Desktop Entry]
-Type=Service
-Exec=blubb
-Comment=Plugin that provides navigation and overview of active source bookmarks and persists them between sessions.
-Comment[ca]=Connector que proporciona navegació i visió de conjunt dels marcadors actius en el codi font i els manté entre sessions.
-Comment[da]=Plugin der sørger for navigation og overblik for aktive kilde-bogmærker og lader dem overleve mellem sessioner.
-Comment[de]=Ein Modul, das die Navigation in und die Übersicht über Quelltext-Lesezeichen ermöglicht und diese zwischen den Arbeitssitzungen speichert.
-Comment[el]=Πρόσθετο που προσφέρει πλοήγηση και περίληψη των ενεργών σελιδοδεικτών στον κώδικα καθώς και τη διατήρηση αυτών μεταξύ των συνεδριών.
-Comment[es]=Complemento que proporciona navegación de marcadores del código activos y los mantiene entre sesiones.
-Comment[et]=Plugin, mis võimaldab näha ja liikuda aktiivse koodi järjehoidjate vahel ning peab need seansside vahel meeles.
-Comment[eu]=Iturburu laster-marka aktiboen arakatze eta ikuspegi orokorra eskeintzen duen plugina da eta hauek sesioen artean mantentzen ditu.
-Comment[fa]=وصله‌ای که ناوش و خلاصۀ چوب الفهای فعال منبع را فراهم می‌کند و آنها را در بین نشستها می‌گذارد
-Comment[fr]=Module externe qui fournit une navigation et une vue d'ensemble des signets du source actif, et les maintient persistants entre les sessions.
-Comment[gl]=Extensión que proporciona navegación e vista xeral de marcadores activos no código e que se encarga de mantelos entre sesións.
-Comment[hu]=Bővítőmodul a forrásfájlok könyvjelzőinek áttekintéséhez, eltárolásához
-Comment[it]=Plugin che offre la navigazione e l'anteprima dei segnalibri nel codice attivo e rimane nelle varie sessioni.
-Comment[ja]=セッション間でアクティブなソースのブックマークや主張の外観やナビゲーションを提供するプラグイン。
-Comment[ms]=Plugin yang menyediakan pengemudian dan pandangan umum bagi tandalaman sumber aktif dan mengekalkan mereka antara sesi.
-Comment[nds]=En Moduul, wat dat Stüern twischen un de Översicht över Borntext-Leestekens praatstellt, un disse över Törns wohrt.
-Comment[ne]=प्लगइनले सक्रिय स्रोत पुस्तकचिनोको नेभिगेसन र समिक्षा प्रदान गर्दछ र सत्रहरू बिच तिनीहरूलाई राख्दछ ।
-Comment[nl]=Plugin die bladwijzers biedt die ook blijven bestaan tussen opeenvolgende sessies.
-Comment[pl]=Wtyczka umożliwiająca nawigację i uzyskiwanie informacji na temat aktywnych zakładek w kodzie oraz przenoszenie ich między sesjami.
-Comment[pt]=Um 'plugin' que oferece uma navegação e uma vista geral sobre os favoritos de código activos, mantendo-os persistentes entre sessões.
-Comment[pt_BR]=Plug-in que fornece navegação e uma visão geral dos marcadores de código ativos e persiste entre sessões.
-Comment[ru]=Модуль, который обеспечивает навигацию и просмотр активных закладок в коде, а также их сохранение в проекте.
-Comment[sk]=Modul proskytuje navigáciu a prehľad aktívnych zdrojových záložiek a ich pretrvanie medzi sedeniami.
-Comment[sr]=Прикључак који обезбеђује навигацију и преглед активних маркера изворног кôда и одржава их између сесија.
-Comment[sr@Latn]=Priključak koji obezbeđuje navigaciju i pregled aktivnih markera izvornog kôda i održava ih između sesija.
-Comment[sv]=Insticksprogram som tillhandahåller navigering och översikt över aktiva källkodsbokmärken och gör dem bestående mellan sessioner.
-Comment[ta]=நடப்பில் உள்ள புத்தக குறியீடு மூலத்திற்கு மேற்பார்வை மற்றும் வழிசெலுத்தும் வசதிகளை சொருகி உங்களுக்கு தரும் மற்றும் அமர்வுக்கு இடையே இதனை பரிசோதிக்கும். 
-Comment[tg]=Модуле, ки навигатсия ва намоиши поягузории фаъолро дар код таъмин месозад, ва боз барои нигоҳ доштан дар лоиҳа ҳам.
-Comment[tr]=Etkin kaynak yerimlerinin dolaşımını, gözden geçirilmesini ve oturumlar arasında devamlılığını sağlayan bir eklenti.
-Comment[zh_CN]=提供当前源文件书签的浏览、预览和保存的插件。
-Comment[zh_TW]=提供目前程式碼書籤的導覽與概觀，並保持在工作階段間。
 Name=KDevBookmarks
-Name[da]=TDevelop bogmærker
-Name[de]=Lesezeichen-Unterstützung (TDevelop)
-Name[hi]=के-डेव-बुकमार्क्स
-Name[nds]=Leestekens-Ünnerstütten (TDevelop)
-Name[pl]=KDevZakładki
-Name[sk]=KDev záložky
-Name[sv]=TDevelop bokmärken
-Name[zh_TW]=TDevelop 書籤
+
 GenericName=Bookmarks
-GenericName[br]=Sinedoù
-GenericName[ca]=Marcadors
-GenericName[cy]=Tudnodau
-GenericName[da]=Bogmærker
-GenericName[de]=Unterstützung für Lesezeichen
-GenericName[el]=Σελιδοδείκτες
-GenericName[es]=Marcadores
-GenericName[et]=Järjehoidjad
-GenericName[eu]=Laster-markak
-GenericName[fa]=چوب‌ الفها
-GenericName[fr]=Signets
-GenericName[ga]=Leabharmharcanna
-GenericName[gl]=Marcadores
-GenericName[hi]= पसंदीदा 
-GenericName[hu]=Könyvjelzők
-GenericName[it]=Segnalibri
-GenericName[ja]=ブックマーク
-GenericName[ms]=Tandabuku
-GenericName[nds]=Leestekens-Ünnerstütten
-GenericName[ne]=पुस्तकचिनो
-GenericName[nl]=Bladwijzers
-GenericName[pl]=Zakładki
-GenericName[pt]=Favoritos
-GenericName[pt_BR]=Marcadores
-GenericName[ru]=Закладки
-GenericName[sk]=Záložky
-GenericName[sl]=Zaznamki
-GenericName[sr]=Маркери
-GenericName[sr@Latn]=Markeri
-GenericName[sv]=Bokmärken
-GenericName[ta]=புத்தகக்குறியின்
-GenericName[tg]=Поягузор
-GenericName[tr]=Yerimleri
-GenericName[zh_CN]=书签
-GenericName[zh_TW]=書籤
+
+Comment=Plugin that provides navigation and overview of active source bookmarks and persists them between sessions.
+
+Type=Service
+Exec=blubb
 Icon=bookmark
 X-TDE-ServiceTypes=TDevelop/Plugin
 X-TDevelop-Scope=Project