16 files changed, 113 insertions, 176 deletions
diff --git a/parts/classview/CMakeLists.txt b/parts/classview/CMakeLists.txt
index 2d19388a..4d6255eb 100644
--- a/parts/classview/CMakeLists.txt
+++ b/parts/classview/CMakeLists.txt
@@ -30,7 +30,12 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevclassview.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+tde_create_translated_desktop(
+  SOURCE kdevclassview.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
+  PO_DIR tdevelop-desktops
+)
+
 install( FILES kdevclassview.rc DESTINATION ${DATA_INSTALL_DIR}/kdevclassview )
 
 
diff --git a/parts/classview/classtooldlg.cpp b/parts/classview/classtooldlg.cpp
index c0cc21a2..853eb417 100644
--- a/parts/classview/classtooldlg.cpp
+++ b/parts/classview/classtooldlg.cpp
@@ -106,21 +106,21 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
 
     layout->addWidget(class_tree, 10);
 
-    connect( class_combo, TQT_SIGNAL(activated(const TQString&)),
-             this, TQT_SLOT(slotClassComboChoice(const TQString&)) );
-    connect( close_button, TQT_SIGNAL(clicked()),
-             this, TQT_SLOT(slotClose()) );
-    connect( access_combo, TQT_SIGNAL(activated(const TQString&)),
-             this, TQT_SLOT(slotAccessComboChoice(const TQString&)) );
-    connect( parents_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewParents()));
-    connect( children_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewChildren()));
-    connect( clients_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewClients()));
-    connect( suppliers_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewSuppliers()));
-    connect( methods_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewMethods()));
-    connect( attributes_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewAttributes()));
-
-    connect( part, TQT_SIGNAL(setLanguageSupport(KDevLanguageSupport*)),
-             this, TQT_SLOT(setLanguageSupport(KDevLanguageSupport*)) );
+    connect( class_combo, TQ_SIGNAL(activated(const TQString&)),
+             this, TQ_SLOT(slotClassComboChoice(const TQString&)) );
+    connect( close_button, TQ_SIGNAL(clicked()),
+             this, TQ_SLOT(slotClose()) );
+    connect( access_combo, TQ_SIGNAL(activated(const TQString&)),
+             this, TQ_SLOT(slotAccessComboChoice(const TQString&)) );
+    connect( parents_button, TQ_SIGNAL(clicked()), TQ_SLOT(viewParents()));
+    connect( children_button, TQ_SIGNAL(clicked()), TQ_SLOT(viewChildren()));
+    connect( clients_button, TQ_SIGNAL(clicked()), TQ_SLOT(viewClients()));
+    connect( suppliers_button, TQ_SIGNAL(clicked()), TQ_SLOT(viewSuppliers()));
+    connect( methods_button, TQ_SIGNAL(clicked()), TQ_SLOT(viewMethods()));
+    connect( attributes_button, TQ_SIGNAL(clicked()), TQ_SLOT(viewAttributes()));
+
+    connect( part, TQ_SIGNAL(setLanguageSupport(KDevLanguageSupport*)),
+             this, TQ_SLOT(setLanguageSupport(KDevLanguageSupport*)) );
 
     m_part->registerClassToolDialog(this);
 }
@@ -136,7 +136,7 @@ void ClassToolDialog::setLanguageSupport(KDevLanguageSupport *ls)
 {
     if (ls) {
         disconnect(ls, 0, this, 0);
-        connect(ls, TQT_SIGNAL(updatedSourceInfo()), this, TQT_SLOT(refresh()));
+        connect(ls, TQ_SIGNAL(updatedSourceInfo()), this, TQ_SLOT(refresh()));
     } else
         refresh();
 
@@ -240,7 +240,7 @@ void ClassToolDialog::slotAccessComboChoice(const TQString &str)
 void ClassToolDialog::slotClose()
 {
     delete this;
-    //    TQTimer::singleShot(0, this, TQT_SLOT(delayedClose()));
+    //    TQTimer::singleShot(0, this, TQ_SLOT(delayedClose()));
 }
 
 
diff --git a/parts/classview/classtooldlg.h b/parts/classview/classtooldlg.h
index d143e66e..958cb9b5 100644
--- a/parts/classview/classtooldlg.h
+++ b/parts/classview/classtooldlg.h
@@ -29,7 +29,7 @@ class ParsedClass;
 
 class ClassToolDialog : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/parts/classview/classtoolwidget.h b/parts/classview/classtoolwidget.h
index 8fd6b974..cfe2d603 100644
--- a/parts/classview/classtoolwidget.h
+++ b/parts/classview/classtoolwidget.h
@@ -19,7 +19,7 @@
 
 class ClassToolWidget : public ClassTreeBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     
 public:
diff --git a/parts/classview/classtreebase.cpp b/parts/classview/classtreebase.cpp
index 9e052418..aeb7f11a 100644
--- a/parts/classview/classtreebase.cpp
+++ b/parts/classview/classtreebase.cpp
@@ -40,9 +40,9 @@ TDEPopupMenu *ClassTreeItem::createPopup()
 
     TDEPopupMenu *popup = new TDEPopupMenu();
     if (features & KDevLanguageSupport::Declarations)
-        popup->insertItem( i18n("Go to Declaration"), classTree(), TQT_SLOT(slotGotoDeclaration()) );
+        popup->insertItem( i18n("Go to Declaration"), classTree(), TQ_SLOT(slotGotoDeclaration()) );
     if (m_item->itemType() == PIT_METHOD)
-        popup->insertItem( i18n("Go to Definition"), classTree(), TQT_SLOT(slotGotoImplementation()) );
+        popup->insertItem( i18n("Go to Definition"), classTree(), TQ_SLOT(slotGotoImplementation()) );
 
     TQString title;
     switch(m_item->itemType()) {
@@ -52,13 +52,13 @@ TDEPopupMenu *ClassTreeItem::createPopup()
             bool hasAddMethod = features & KDevLanguageSupport::AddMethod;
             bool hasAddAttribute = features & KDevLanguageSupport::AddAttribute;
             if (hasAddMethod)
-                popup->insertItem( i18n("Add Method..."), classTree(), TQT_SLOT(slotAddMethod()));
+                popup->insertItem( i18n("Add Method..."), classTree(), TQ_SLOT(slotAddMethod()));
             if (hasAddAttribute)
-                popup->insertItem( i18n("Add Attribute..."), classTree(), TQT_SLOT(slotAddAttribute()));
+                popup->insertItem( i18n("Add Attribute..."), classTree(), TQ_SLOT(slotAddAttribute()));
             popup->insertSeparator();
-            popup->insertItem( i18n("Parent Classes..."), classTree(), TQT_SLOT(slotClassBaseClasses()));
-            popup->insertItem( i18n("Child Classes..."), classTree(), TQT_SLOT(slotClassDerivedClasses()));
-            popup->insertItem( i18n("Class Tool..."), classTree(), TQT_SLOT(slotClassTool()));
+            popup->insertItem( i18n("Parent Classes..."), classTree(), TQ_SLOT(slotClassBaseClasses()));
+            popup->insertItem( i18n("Child Classes..."), classTree(), TQ_SLOT(slotClassDerivedClasses()));
+            popup->insertItem( i18n("Class Tool..."), classTree(), TQ_SLOT(slotClassTool()));
             }
         break;
     case PIT_STRUCT:
@@ -459,14 +459,14 @@ ClassTreeBase::ClassTreeBase(ClassViewPart *part, TQWidget *parent, const char *
 
     (void) new ClassToolTip(this);
     
-    connect( this, TQT_SIGNAL(executed(TQListViewItem*)),
-             this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) );
-    connect( this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)),
-             this, TQT_SLOT(slotItemPressed(int, TQListViewItem*)) );
-    connect( this, TQT_SIGNAL(returnPressed( TQListViewItem*)), 
-             TQT_SLOT( slotItemExecuted(TQListViewItem*)) );
-    connect( this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)),
-             this, TQT_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint&)) );
+    connect( this, TQ_SIGNAL(executed(TQListViewItem*)),
+             this, TQ_SLOT(slotItemExecuted(TQListViewItem*)) );
+    connect( this, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)),
+             this, TQ_SLOT(slotItemPressed(int, TQListViewItem*)) );
+    connect( this, TQ_SIGNAL(returnPressed( TQListViewItem*)), 
+             TQ_SLOT( slotItemExecuted(TQListViewItem*)) );
+    connect( this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)),
+             this, TQ_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint&)) );
 
     m_part = part;
 }
diff --git a/parts/classview/classtreebase.h b/parts/classview/classtreebase.h
index 413f288b..a73aede7 100644
--- a/parts/classview/classtreebase.h
+++ b/parts/classview/classtreebase.h
@@ -29,7 +29,7 @@ class TDEPopupMenu;
 
 class ClassTreeBase : public TDEListView
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     
 public: 
diff --git a/parts/classview/classviewpart.cpp b/parts/classview/classviewpart.cpp
index 92e26bd0..93110a54 100644
--- a/parts/classview/classviewpart.cpp
+++ b/parts/classview/classviewpart.cpp
@@ -139,12 +139,12 @@ class FunctionCompletion : public CustomCompleter {
 
 
 typedef KDevGenericFactory<ClassViewPart> ClassViewFactory;
-static const KDevPluginInfo data("kdevclassview");
-K_EXPORT_COMPONENT_FACTORY( libkdevclassview, ClassViewFactory( data ) )
+static const KDevPluginInfo pluginData("kdevclassview");
+K_EXPORT_COMPONENT_FACTORY( libkdevclassview, ClassViewFactory( pluginData ) )
 
 ClassViewPart::ClassViewPart(TQObject *parent, const char *name, const TQStringList& )
-    :/// KDevPlugin( &data, parent, name ? name : "ClassViewPart" ),
-    KDevCodeBrowserFrontend( &data, parent, name ? name : "ClassViewPart" ),
+    :/// KDevPlugin( &pluginData, parent, name ? name : "ClassViewPart" ),
+    KDevCodeBrowserFrontend( &pluginData, parent, name ? name : "ClassViewPart" ),
     m_activeDocument(0), m_activeView(0), m_activeSelection(0), m_activeEditor(0), m_activeViewCursor(0), m_hierarchyDlg(0)
 {
     setInstance(ClassViewFactory::instance());
@@ -161,11 +161,11 @@ ClassViewPart::ClassViewPart(TQObject *parent, const char *name, const TQStringL
     TQWhatsThis::add(m_widget, i18n("<b>Class browser</b><p>"
             "The class browser shows all namespaces, classes and namespace and class members in a project."));
 
-    connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) );
-    connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) );
-    connect( core(), TQT_SIGNAL(languageChanged()), this, TQT_SLOT(slotProjectOpened()) );
-    connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)),
-        this, TQT_SLOT(activePartChanged(KParts::Part*)));
+    connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotProjectOpened()) );
+    connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(slotProjectClosed()) );
+    connect( core(), TQ_SIGNAL(languageChanged()), this, TQ_SLOT(slotProjectOpened()) );
+    connect( partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)),
+        this, TQ_SLOT(activePartChanged(KParts::Part*)));
 }
 
 bool ClassViewPart::jumpedToItem( ItemDom item ) {
@@ -182,34 +182,34 @@ ClassViewPart::~ClassViewPart()
 
 void ClassViewPart::slotProjectOpened( )
 {
-    connect( languageSupport(), TQT_SIGNAL(updatedSourceInfo()), navigator, TQT_SLOT(refresh()) );
-    connect( languageSupport(), TQT_SIGNAL(addedSourceInfo(const TQString& )), navigator, TQT_SLOT(addFile(const TQString& )));
+    connect( languageSupport(), TQ_SIGNAL(updatedSourceInfo()), navigator, TQ_SLOT(refresh()) );
+    connect( languageSupport(), TQ_SIGNAL(addedSourceInfo(const TQString& )), navigator, TQ_SLOT(addFile(const TQString& )));
     navigator->refresh();
 }
 
 void ClassViewPart::slotProjectClosed( )
 {
 //    navigator->refresh();
-//    disconnect( languageSupport(), TQT_SIGNAL(updatedSourceInfo()), navigator, TQT_SLOT(refresh()) );
+//    disconnect( languageSupport(), TQ_SIGNAL(updatedSourceInfo()), navigator, TQ_SLOT(refresh()) );
 }
 
 void ClassViewPart::setupActions( )
 {
     m_functionsnav = new TDEListViewAction( new KComboView(true, 150, 0, "m_functionsnav_combo", new FunctionCompletion() ), i18n("Functions Navigation"), 0, 0, 0, actionCollection(), "functionsnav_combo", true );
-    connect(m_functionsnav->view(), TQT_SIGNAL(activated(TQListViewItem*)), navigator, TQT_SLOT(selectFunctionNav(TQListViewItem*)));
+    connect(m_functionsnav->view(), TQ_SIGNAL(activated(TQListViewItem*)), navigator, TQ_SLOT(selectFunctionNav(TQListViewItem*)));
 //    m_functionsnav->view()->setEditable(false);
-    connect(m_functionsnav->view(), TQT_SIGNAL(focusGranted()), navigator, TQT_SLOT(functionNavFocused()));
-    connect(m_functionsnav->view(), TQT_SIGNAL(focusLost()), navigator, TQT_SLOT(functionNavUnFocused()));
+    connect(m_functionsnav->view(), TQ_SIGNAL(focusGranted()), navigator, TQ_SLOT(functionNavFocused()));
+    connect(m_functionsnav->view(), TQ_SIGNAL(focusLost()), navigator, TQ_SLOT(functionNavUnFocused()));
     m_functionsnav->setToolTip(i18n("Functions in file"));
     m_functionsnav->setWhatsThis(i18n("<b>Function navigator</b><p>Navigates over functions contained in the file."));
 //    m_functionsnav->view()->setCurrentText(NAV_NODEFINITION);
     m_functionsnav->view()->setDefaultText(NAV_NODEFINITION);
 
-    new TDEAction( i18n("Focus Navigator"), 0, this, TQT_SLOT(slotFocusNavbar()), actionCollection(), "focus_navigator" );
+    new TDEAction( i18n("Focus Navigator"), 0, this, TQ_SLOT(slotFocusNavbar()), actionCollection(), "focus_navigator" );
 
     if (langHasFeature(KDevLanguageSupport::Classes))
     {
-        TDEAction *ac = new TDEAction(i18n("Class Inheritance Diagram"), "view_tree", 0, this, TQT_SLOT(graphicalClassView()), actionCollection(), "inheritance_dia");
+        TDEAction *ac = new TDEAction(i18n("Class Inheritance Diagram"), "view_tree", 0, this, TQ_SLOT(graphicalClassView()), actionCollection(), "inheritance_dia");
         ac->setToolTip(i18n("Class inheritance diagram"));
         ac->setWhatsThis(i18n("<b>Class inheritance diagram</b><p>Displays inheritance relationship between classes in project. "
                                  "Note, it does not display classes outside inheritance hierarchy."));    
@@ -242,8 +242,8 @@ void ClassViewPart::activePartChanged( KParts::Part * part)
     navigator->stopTimer();
     if (m_activeView)
     {
-        disconnect(m_activeView, TQT_SIGNAL(cursorPositionChanged()), 
-            navigator, TQT_SLOT(slotCursorPositionChanged()));
+        disconnect(m_activeView, TQ_SIGNAL(cursorPositionChanged()), 
+            navigator, TQ_SLOT(slotCursorPositionChanged()));
     }
     
     kdDebug() << "ClassViewPart::activePartChanged()" << endl;
@@ -267,8 +267,8 @@ void ClassViewPart::activePartChanged( KParts::Part * part)
     }
     if( m_activeViewCursor )
     {
-        connect(m_activeView, TQT_SIGNAL(cursorPositionChanged()),
-            navigator, TQT_SLOT(slotCursorPositionChanged()) );
+        connect(m_activeView, TQ_SIGNAL(cursorPositionChanged()),
+            navigator, TQ_SLOT(slotCursorPositionChanged()) );
     }
 }
 void ClassViewPart::slotFocusNavbar()
diff --git a/parts/classview/classviewpart.h b/parts/classview/classviewpart.h
index 16e18def..19342916 100644
--- a/parts/classview/classviewpart.h
+++ b/parts/classview/classviewpart.h
@@ -54,7 +54,7 @@ class Navigator;
 class HierarchyDialog;
 class ClassViewPart : public Extensions::KDevCodeBrowserFrontend
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     ClassViewPart(TQObject *parent, const char *name, const TQStringList &);
diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp
index 22b865ef..18a5d686 100644
--- a/parts/classview/classviewwidget.cpp
+++ b/parts/classview/classviewwidget.cpp
@@ -59,11 +59,11 @@ ClassViewWidget::ClassViewWidget( ClassViewPart * part )
 
     m_projectItem = 0;
 
-    connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SLOT(slotExecuted(TQListViewItem*)) );
-    connect( this, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotExecuted(TQListViewItem*)) );
-    connect( m_part->core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) );
-    connect( m_part->core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) );
-    connect( m_part->core(), TQT_SIGNAL(languageChanged()), this, TQT_SLOT(slotProjectOpened()) );
+    connect( this, TQ_SIGNAL(returnPressed(TQListViewItem*)), this, TQ_SLOT(slotExecuted(TQListViewItem*)) );
+    connect( this, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotExecuted(TQListViewItem*)) );
+    connect( m_part->core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotProjectOpened()) );
+    connect( m_part->core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(slotProjectClosed()) );
+    connect( m_part->core(), TQ_SIGNAL(languageChanged()), this, TQ_SLOT(slotProjectOpened()) );
 
     TQStringList lst;
     lst << i18n( "Group by Directories" ) << i18n( "Plain List" ) << i18n( "Java Like Mode" );
@@ -71,28 +71,28 @@ ClassViewWidget::ClassViewWidget( ClassViewPart * part )
     m_actionViewMode->setItems( lst );
     m_actionViewMode->setWhatsThis(i18n("<b>View mode</b><p>Class browser items can be grouped by directories, listed in a plain or java like view."));
 
-    m_actionNewClass = new TDEAction( i18n("New Class..."), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotNewClass()),
+    m_actionNewClass = new TDEAction( i18n("New Class..."), TDEShortcut(), this, TQ_SLOT(slotNewClass()),
 				    m_part->actionCollection(), "classview_new_class" );
     m_actionNewClass->setWhatsThis(i18n("<b>New class</b><p>Calls the <b>New Class</b> wizard."));
 	
-	m_actionCreateAccessMethods = new TDEAction( i18n("Create get/set Methods"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotCreateAccessMethods()), m_part->actionCollection(), "classview_create_access_methods" );
+	m_actionCreateAccessMethods = new TDEAction( i18n("Create get/set Methods"), TDEShortcut(), this, TQ_SLOT(slotCreateAccessMethods()), m_part->actionCollection(), "classview_create_access_methods" );
 	
 	
-    m_actionAddMethod = new TDEAction( i18n("Add Method..."), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotAddMethod()),
+    m_actionAddMethod = new TDEAction( i18n("Add Method..."), TDEShortcut(), this, TQ_SLOT(slotAddMethod()),
 				    m_part->actionCollection(), "classview_add_method" );
     m_actionAddMethod->setWhatsThis(i18n("<b>Add method</b><p>Calls the <b>New Method</b> wizard."));
-    m_actionAddAttribute = new TDEAction( i18n("Add Attribute..."), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotAddAttribute()),
+    m_actionAddAttribute = new TDEAction( i18n("Add Attribute..."), TDEShortcut(), this, TQ_SLOT(slotAddAttribute()),
 				    m_part->actionCollection(), "classview_add_attribute" );
     m_actionAddAttribute->setWhatsThis(i18n("<b>Add attribute</b><p>Calls the <b>New Attribute</b> wizard."));
 
-    m_actionOpenDeclaration = new TDEAction( i18n("Open Declaration"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotOpenDeclaration()),
+    m_actionOpenDeclaration = new TDEAction( i18n("Open Declaration"), TDEShortcut(), this, TQ_SLOT(slotOpenDeclaration()),
 				    m_part->actionCollection(), "classview_open_declaration" );
     m_actionOpenDeclaration->setWhatsThis(i18n("<b>Open declaration</b><p>Opens a file where the selected item is declared and jumps to the declaration line."));
-    m_actionOpenImplementation = new TDEAction( i18n("Open Implementation"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotOpenImplementation()),
+    m_actionOpenImplementation = new TDEAction( i18n("Open Implementation"), TDEShortcut(), this, TQ_SLOT(slotOpenImplementation()),
 				    m_part->actionCollection(), "classview_open_implementation" );
     m_actionOpenImplementation->setWhatsThis(i18n("<b>Open implementation</b><p>Opens a file where the selected item is defined (implemented) and jumps to the definition line."));
 
-	m_actionFollowEditor = new TDEToggleAction( i18n("Follow Editor"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotFollowEditor()), m_part->actionCollection(), "classview_follow_editor" );
+	m_actionFollowEditor = new TDEToggleAction( i18n("Follow Editor"), TDEShortcut(), this, TQ_SLOT(slotFollowEditor()), m_part->actionCollection(), "classview_follow_editor" );
 
     TDEConfig* config = m_part->instance()->config();
     config->setGroup( "General" );
@@ -218,12 +218,12 @@ void ClassViewWidget::slotProjectOpened( )
 
     m_projectDirectoryLength = m_projectDirectory.length() + 1;
 
-    connect( m_part->languageSupport(), TQT_SIGNAL(updatedSourceInfo()),
-	     this, TQT_SLOT(refresh()) );
-    connect( m_part->languageSupport(), TQT_SIGNAL(aboutToRemoveSourceInfo(const TQString&)),
-	     this, TQT_SLOT(removeFile(const TQString&)) );
-    connect( m_part->languageSupport(), TQT_SIGNAL(addedSourceInfo(const TQString&)),
-	     this, TQT_SLOT(insertFile(const TQString&)) );
+    connect( m_part->languageSupport(), TQ_SIGNAL(updatedSourceInfo()),
+	     this, TQ_SLOT(refresh()) );
+    connect( m_part->languageSupport(), TQ_SIGNAL(aboutToRemoveSourceInfo(const TQString&)),
+	     this, TQ_SLOT(removeFile(const TQString&)) );
+    connect( m_part->languageSupport(), TQ_SIGNAL(addedSourceInfo(const TQString&)),
+	     this, TQ_SLOT(insertFile(const TQString&)) );
 }
 
 void ClassViewWidget::slotProjectClosed( )
diff --git a/parts/classview/classviewwidget.h b/parts/classview/classviewwidget.h
index d74448f5..bdbd69f4 100644
--- a/parts/classview/classviewwidget.h
+++ b/parts/classview/classviewwidget.h
@@ -45,7 +45,7 @@ class TDEToggleAction;
 
 class ClassViewWidget : public TDEListView, public TQToolTip
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     enum ViewMode
diff --git a/parts/classview/digraphview.h b/parts/classview/digraphview.h
index a72aa941..ed7fcc2e 100644
--- a/parts/classview/digraphview.h
+++ b/parts/classview/digraphview.h
@@ -23,7 +23,7 @@ class DigraphEdge;
 
 class DigraphView : public TQScrollView
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     
 public:
diff --git a/parts/classview/hierarchydlg.cpp b/parts/classview/hierarchydlg.cpp
index c8761861..3059f00e 100644
--- a/parts/classview/hierarchydlg.cpp
+++ b/parts/classview/hierarchydlg.cpp
@@ -51,7 +51,7 @@ HierarchyDialog::HierarchyDialog( ClassViewPart *part )
     TQPushButton *save_button = new KPushButton(KStdGuiItem::save(), this);
     TQPushButton *refresh_button = new KPushButton(i18n("Refresh"), this);
 
-    TQSplitter *splitter = new TQSplitter(Qt::Vertical, this);
+    TQSplitter *splitter = new TQSplitter(TQt::Vertical, this);
     digraph = new DigraphView(splitter, "digraph view");
 //    member_tree = new ClassToolWidget(part, splitter);
 
@@ -66,22 +66,22 @@ HierarchyDialog::HierarchyDialog( ClassViewPart *part )
     combo_layout->addWidget(close_button);
     layout->addWidget(splitter);
 
-    connect( namespace_combo, TQT_SIGNAL(activated(TQListViewItem*)),
-             this, TQT_SLOT(slotNamespaceComboChoice(TQListViewItem*)) );
-    connect( class_combo, TQT_SIGNAL(activated(TQListViewItem*)),
-             this, TQT_SLOT(slotClassComboChoice(TQListViewItem*)) );
-    connect( namespace_combo, TQT_SIGNAL(textChanged(const TQString&)),
-             this, TQT_SLOT(slotNamespaceComboChoice(const TQString&)) );
-    connect( class_combo, TQT_SIGNAL(textChanged(const TQString&)),
-             this, TQT_SLOT(slotClassComboChoice(const TQString&)) );
-    connect( close_button, TQT_SIGNAL(clicked()),
-             this, TQT_SLOT(hide()) );
-    connect( save_button, TQT_SIGNAL(clicked()),
-             this, TQT_SLOT(save()) );
-    connect( refresh_button, TQT_SIGNAL(clicked()),
-             this, TQT_SLOT(refresh()) );
-    connect( digraph, TQT_SIGNAL(selected(const TQString&)),
-             this, TQT_SLOT(classSelected(const TQString&)) );
+    connect( namespace_combo, TQ_SIGNAL(activated(TQListViewItem*)),
+             this, TQ_SLOT(slotNamespaceComboChoice(TQListViewItem*)) );
+    connect( class_combo, TQ_SIGNAL(activated(TQListViewItem*)),
+             this, TQ_SLOT(slotClassComboChoice(TQListViewItem*)) );
+    connect( namespace_combo, TQ_SIGNAL(textChanged(const TQString&)),
+             this, TQ_SLOT(slotNamespaceComboChoice(const TQString&)) );
+    connect( class_combo, TQ_SIGNAL(textChanged(const TQString&)),
+             this, TQ_SLOT(slotClassComboChoice(const TQString&)) );
+    connect( close_button, TQ_SIGNAL(clicked()),
+             this, TQ_SLOT(hide()) );
+    connect( save_button, TQ_SIGNAL(clicked()),
+             this, TQ_SLOT(save()) );
+    connect( refresh_button, TQ_SIGNAL(clicked()),
+             this, TQ_SLOT(refresh()) );
+    connect( digraph, TQ_SIGNAL(selected(const TQString&)),
+             this, TQ_SLOT(classSelected(const TQString&)) );
 
     m_part = part;
 //    m_part->registerHierarchyDialog(this);
@@ -157,7 +157,7 @@ void HierarchyDialog::refresh()
 void HierarchyDialog::setLanguageSupport(KDevLanguageSupport *ls)
 {
     if (ls)
-        connect(ls, TQT_SIGNAL(updatedSourceInfo()), this, TQT_SLOT(refresh()));
+        connect(ls, TQ_SIGNAL(updatedSourceInfo()), this, TQ_SLOT(refresh()));
     else
         refresh();
 }
diff --git a/parts/classview/hierarchydlg.h b/parts/classview/hierarchydlg.h
index 1c41a8f0..486b9bcb 100644
--- a/parts/classview/hierarchydlg.h
+++ b/parts/classview/hierarchydlg.h
@@ -25,7 +25,7 @@ class TQListViewItem;
 
 class HierarchyDialog : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/parts/classview/kdevclassview.desktop b/parts/classview/kdevclassview.desktop
index 4ad87aa4..7e0ca9e8 100644
--- a/parts/classview/kdevclassview.desktop
+++ b/parts/classview/kdevclassview.desktop
@@ -1,80 +1,12 @@
 [Desktop Entry]
-Type=Service
-Exec=blubb
-Comment=This plugin displays a graphical view of all the classes in the project, complete with methods and attributes, and provides a way of direct source navigation.
-Comment[ca]=Aquest connector mostra una vista gràfica de totes les classes del projecte, completant-lo amb mètodes i atributs, i proporciona una forma de navegar directament a través del codi font.
-Comment[da]=Dette plugin giver en grafisk visning af alle klasserne i projektet, fuldstændig med metoder og attributter og sørger for en måde at have direkte kildenavigation.
-Comment[de]=Dieses Modul zeigt eine grafische Ansicht aller Klassen im Projekt, einschließlich der Methoden und Attribute und ermöglicht die Navigation in den betreffenden Quelltexten.
-Comment[el]=Αυτό το πρόσθετο εμφανίζει μια γραφική προβολή όλων των κλάσεων του έργου, πλήρης με μεθόδους και χαρακτηριστικά, και προσφέρει μια μέθοδο απευθείας πλοήγησης στον κώδικα.
-Comment[es]=Este complemento muestra una vista gráfica de todas las clases del proyecto, completándolo con métodos y atributos, y proporciona una forma de navegar directamente por el código fuente.
-Comment[et]=See plugin näitab graafiliselt kõiki projekti klasse koos meetodite ja atribuutidega ning võimaldab nende vahel kiiresti liikuda.
-Comment[eu]=Plugin honek proiektuak dituen klase guztien ikuspegi grafiko bat bistaratzen du, metodo eta atributuekin osatuta, eta iturburuen arteko nabigazio zuzena eskeintzen du.
-Comment[fa]=این وصله یک نمای نگاره‌ای از همۀ رده‌ها در پروژه را نمایش می‌دهد، با روشها و ویژگیها کامل می‌کند و یک راه ناوش مستقیم منبع فراهم می‌کند.
-Comment[fr]=Ce module externe affiche une vue graphique de toutes les classes dans le projet, la complète avec des méthodes et des attributs, et offre un moyen de naviguer directement dans le source.
-Comment[gl]=Esta extensión mostra unha vista gráfica de tódalas clases do proxecto, cos métodos e os atributos, e proporciona unha maneira para navegar o código directamente.
-Comment[hu]=Bővítőmodul egy projekt osztályainak áttekintéséhez, a tagfüggvényekkel és az attribútumokkal együtt, navigálási lehetőséggel
-Comment[it]=Questo plugin offre una rappresentazione grafica di tutte le classi nel progetto, complete con metodi e attributi, e fornisce un modo per la navigazione diretta nei sorgenti.
-Comment[ja]=このプラグインは、プロジェクトの中のすべてのクラスを視覚的に表示します。また、メソッドや属性を補完し、直接的なソース操作を提供します。
-Comment[ms]=Plugin ini memaparkan paparan bergrafik bagi semua kelas dalam projek, lengkap dengan kaedah dan ciri, dan menyediakan kaedah kemudian sumber secara terus.
-Comment[nds]=Dit Moduul wiest en graafsch Ansicht vun all Klassen vun en Projekt, komplett mit Metoden un Attributen, un stellt dat Stüern binnen de Borntexten praat.
-Comment[ne]=यो प्लगइनले विधि र विशेषतासँग परियोजनामा सबै कक्षको ग्राफिकल दृश्य प्रर्दशन गर्दछ र प्रत्यक्ष स्रोत नेभिगेसनको उपाय प्रदान गर्दछ ।
-Comment[nl]=Deze plugin toont een grafische weergave van alle klassen in een project, compleet met methoden en attributen, en biedt directe navigatie hiertussen.
-Comment[pl]=Ta wtyczka pokazuje graficzny widok wszystkich klas w projekcie z metodami i atrybutami oraz umożliwia bezpośrednią nawigację w kodzie źródłowym..
-Comment[pt]=Este 'plugin' mostra uma vista gráfica de todas as classes no projecto, completas com os métodos e atributos, oferecendo uma forma de navegação directa sobre o código.
-Comment[pt_BR]=Este plug-in exibe uma visão gráfica de todas as classes no projeto, juntamente com métodos e atributos, e fornece uma maneira de navegar diretamente no código.
-Comment[ru]=Этот модуль показывает список классов в проекте, включая методы и атрибуты, а также предоставляет возможности навигации по коду.
-Comment[sk]=Modul zobrazí grafický pohľad na triedy v projekte, spolu s metódami a atribútmi, a umožní priamy prístup k zdrojovému kódu.
-Comment[sr]=Овај прикључак приказује графички изглед свих класа у пројекту, заједно са методама и атрибутима, и обезбеђује начин директне навигације кроз изворни кôд.
-Comment[sr@Latn]=Ovaj priključak prikazuje grafički izgled svih klasa u projektu, zajedno sa metodama i atributima, i obezbeđuje način direktne navigacije kroz izvorni kôd.
-Comment[sv]=Insticksprogrammet visar en grafisk bild av alla klasser i ett projekt, tillsammans med metoder och egenskaper, och ger möjlighet till direkt navigering i källkoden.
-Comment[ta]=இந்த சொருகி திட்டப்பணியில் உள்ள வகுப்புகளின், முறைகள் மற்றும் பண்புகளை உங்களுக்கு வரைகலை பார்வையில் அளிக்கும்,மற்றும் மூலத்தை வழி செலுத்த இது நேர்வழி அளிக்கும்.
-Comment[tg]=Ин модул рӯйхати синфҳоро дар лоиҳа намоиш медиҳад, ва боз методҳо ва атрибутҳо ва боз ҳам имкони кодро роҳ медиҳад.
-Comment[tr]=Bu eklenti projedeki sınıfların bütün yöntem ve öznitelikleri ile grafiksel bir görünümü gösterir ve doğrudan kaynak dolaşımını sağlar.
-Comment[zh_CN]=这个插件以图形显示工程中所有的类，包括完整的方法和属性，并提供浏览源文件的方法。
-Comment[zh_TW]=這個外掛程式顯示專案中所有類別、完整方法與屬性的圖形檢視，並提供源碼導覽。
 Name=KDevClassView
-Name[da]=TDevelop klassevisning
-Name[de]=Klassenansicht (TDevelop)
-Name[hi]=के-डेव-क्लॉस-व्यू
-Name[nds]=KlassKieker (TDevelop)
-Name[pl]=KDevWidokKlas
-Name[sk]=KDev pohľad na triedy
-Name[sv]=TDevelop klassvisning
-Name[tg]=Намоиши снфи KDev
-Name[zh_TW]=TDevelop 類別檢視
+
 GenericName=Class View
-GenericName[ca]=Visor de classes
-GenericName[da]=Klassevisning
-GenericName[de]=Klassenansicht
-GenericName[el]=Προβολή κλάσεων
-GenericName[es]=Visor de clases
-GenericName[et]=Klasside vaade
-GenericName[eu]=Klase ikuspegia
-GenericName[fa]=نمای رده
-GenericName[fr]=Vue des classes
-GenericName[gl]=Vista de clases
-GenericName[hi]=क्लॉस व्यू
-GenericName[hu]=Osztálynézegető
-GenericName[it]=Visualizza classe
-GenericName[ja]=クラスビュー
-GenericName[ms]=Paparan Kelas
-GenericName[nds]=Klasskieker
-GenericName[ne]=कक्ष दृश्य
-GenericName[nl]=Klassenweergave
-GenericName[pl]=Widok klas
-GenericName[pt]=Vista de Classe
-GenericName[pt_BR]=Visualizador de Classe
-GenericName[ru]=Просмотр классов
-GenericName[sk]=Pohľad na triedy
-GenericName[sl]=Prikaz razreda
-GenericName[sr]=Преглед класа
-GenericName[sr@Latn]=Pregled klasa
-GenericName[sv]=Klassvisning
-GenericName[ta]=வகுப்புக்காட்சி
-GenericName[tg]=Намоиши синфҳо
-GenericName[tr]=Sınıf Görünümü
-GenericName[zh_CN]=类查看器
-GenericName[zh_TW]=類別檢視
+
+Comment=This plugin displays a graphical view of all the classes in the project, complete with methods and attributes, and provides a way of direct source navigation.
+
+Type=Service
+Exec=blubb
 X-TDE-ServiceTypes=TDevelop/CodeBrowserFrontend
 X-TDE-Library=libkdevclassview
 X-TDevelop-Version=5
diff --git a/parts/classview/navigator.cpp b/parts/classview/navigator.cpp
index 694aa0d4..f42bd8db 100644
--- a/parts/classview/navigator.cpp
+++ b/parts/classview/navigator.cpp
@@ -111,18 +111,18 @@ Navigator::Navigator(ClassViewPart *parent, const char *name)
     m_navNoDefinition = true;
 
     m_actionSyncWithEditor = new TDEAction( i18n("Sync ClassView"), "view_tree", TDEShortcut(), this,
-        TQT_SLOT(slotSyncWithEditor()), m_part->actionCollection(), "classview_sync_with_editor" );
+        TQ_SLOT(slotSyncWithEditor()), m_part->actionCollection(), "classview_sync_with_editor" );
 
     TDEAction * action = new TDEAction( i18n("Jump to next function"), CTRL+ALT+Key_PageDown, this,
-        TQT_SLOT(slotJumpToNextFunction()), m_part->actionCollection(), "navigator_jump_to_next_function" );
+        TQ_SLOT(slotJumpToNextFunction()), m_part->actionCollection(), "navigator_jump_to_next_function" );
     action->plug( &m_dummyActionWidget );
 
     action = new TDEAction( i18n("Jump to previous function"), CTRL+ALT+Key_PageUp, this,
-        TQT_SLOT(slotJumpToPreviousFunction()), m_part->actionCollection(), "navigator_jump_to_previous_function" );
+        TQ_SLOT(slotJumpToPreviousFunction()), m_part->actionCollection(), "navigator_jump_to_previous_function" );
     action->plug( &m_dummyActionWidget );
 
     m_syncTimer = new TQTimer(this);
-    connect(m_syncTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(syncFunctionNav()));
+    connect(m_syncTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(syncFunctionNav()));
 }
 
 Navigator::~Navigator()
diff --git a/parts/classview/navigator.h b/parts/classview/navigator.h
index ed0c3ffb..66442ea5 100644
--- a/parts/classview/navigator.h
+++ b/parts/classview/navigator.h
@@ -38,7 +38,7 @@ TextPaintItem highlightFunctionName( TQString function, int type, TextPaintStyle
 
 class Navigator : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
     enum NavigationState { GoToDefinitions, GoToDeclarations };