Cleanup headers.

Signed-off-by: gregory guy <gregory-tde@laposte.net>

src/calltreedlg.cpp

@@ -25,10 +25,10 @@
  *
  ***************************************************************************/
 
-#include <ntqfile.h>
-#include <ntqtoolbutton.h>
-#include <ntqbuttongroup.h>
-#include <ntqwidgetstack.h>
+#include <tqfile.h>
+#include <tqtoolbutton.h>
+#include <tqbuttongroup.h>
+#include <tqwidgetstack.h>
 #include <tdelocale.h>
 #include <tdefiledialog.h>
 #include "calltreedlg.h"

src/calltreedlg.h

@@ -28,8 +28,8 @@
 #ifndef CALLTREEDLG_H
 #define CALLTREEDLG_H
 
-#include <ntqwidget.h>
-#include <ntqlistview.h>
+#include <tqwidget.h>
+#include <tqlistview.h>
 #include <calltreelayout.h>
 
 /**

src/calltreemanager.h

@@ -28,8 +28,8 @@
 #ifndef CALLTREEMANAGER_H
 #define CALLTREEMANAGER_H
 
-#include <ntqwidget.h>
-#include <ntqptrlist.h>
+#include <tqwidget.h>
+#include <tqptrlist.h>
 
 class CallTreeDlg;
 

src/configfrontend.h

@@ -28,7 +28,7 @@
 #ifndef CONFIGFRONTEND_H
 #define CONFIGFRONTEND_H
 
-#include <frontend.h>
+#include "frontend.h"
 
 /**
  * Frontend to the kscope_config shell script.

src/cscopefrontend.cpp

@@ -25,8 +25,8 @@
  *
  ***************************************************************************/
 
-#include <ntqfileinfo.h>
-#include <ntqtimer.h>
+#include <tqfileinfo.h>
+#include <tqtimer.h>
 #include <tdeconfig.h>
 #include <tdemessagebox.h>
 #include <tdelocale.h>

src/cscopefrontend.h

@@ -28,9 +28,9 @@
 #ifndef CSCOPEFRONTEND_H
 #define CSCOPEFRONTEND_H
 
-#include <ntqstringlist.h>
-#include <ntqprogressbar.h>
-#include <ntqlabel.h>
+#include <tqstringlist.h>
+#include <tqprogressbar.h>
+#include <tqlabel.h>
 #include "frontend.h"
 
 #define CSCOPE_RECORD_SIZE 4

src/cscopemsgdlg.cpp

@@ -25,8 +25,8 @@
  *
  ***************************************************************************/
 
-#include <ntqtextedit.h>
-#include <ntqpushbutton.h>
+#include <tqtextedit.h>
+#include <tqpushbutton.h>
 #include "cscopemsgdlg.h"
 
 /**

src/ctagsfrontend.cpp

@@ -25,7 +25,7 @@
  *
  ***************************************************************************/
 
-#include <ntqfileinfo.h>
+#include <tqfileinfo.h>
 #include <tdemessagebox.h>
 #include <tdelocale.h>
 #include <kshell.h>

src/ctagsfrontend.h

@@ -28,7 +28,7 @@
 #ifndef CTAGSFRONTEND_H
 #define CTAGSFRONTEND_H
 
-#include <frontend.h>
+#include "frontend.h"
 
 #define CTAGS_RECORD_SIZE 3
 

src/ctagslist.cpp

@@ -25,7 +25,7 @@
  *
  ***************************************************************************/
 
-#include <ntqheader.h>
+#include <tqheader.h>
 #include <tdelocale.h>
 #include "ctagslist.h"
 #include "kscopeconfig.h"

src/ctagslist.h

@@ -28,9 +28,9 @@
 #ifndef CTAGSLIST_H
 #define CTAGSLIST_H
 
-#include <ntqwidget.h>
-#include <ntqpixmap.h>
-#include <ntqmemarray.h>
+#include <tqwidget.h>
+#include <tqpixmap.h>
+#include <tqmemarray.h>
 #include "searchlist.h"
 #include "frontend.h"
 

src/dirscanner.cpp

@@ -25,7 +25,7 @@
  *
  ***************************************************************************/
 
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include "dirscanner.h"
 
 /**

src/dirscanner.h

@@ -28,13 +28,13 @@
 #ifndef DIRSCANNER_H
 #define DIRSCANNER_H
 
-#include <ntqobject.h>
-#include <ntqevent.h>
-#include <ntqthread.h>
-#include <ntqdir.h>
-#include <ntqstringlist.h>
-#include <ntqdict.h>
-#include <ntqlistview.h>
+#include <tqobject.h>
+#include <tqevent.h>
+#include <tqthread.h>
+#include <tqdir.h>
+#include <tqstringlist.h>
+#include <tqdict.h>
+#include <tqlistview.h>
 
 class DirScanner;
 

src/dotfrontend.cpp

@@ -25,8 +25,8 @@
  *
  ***************************************************************************/
 
-#include <ntqfileinfo.h>
-#include <ntqpaintdevicemetrics.h>
+#include <tqfileinfo.h>
+#include <tqpaintdevicemetrics.h>
 #include <tdemessagebox.h>
 #include <tdelocale.h>
 #include "dotfrontend.h"

src/dotfrontend.h

@@ -27,8 +27,8 @@
 #ifndef DOTFRONTEND_H
 #define DOTFRONTEND_H
 
-#include <frontend.h>
-#include <ntqpointarray.h>
+#include "frontend.h"
+#include <tqpointarray.h>
 
 class GraphWidget;
 

src/dotparse.ypp

@@ -1,9 +1,9 @@
 /* dot.y */
 
 %{
-#include <ntqdict.h>
-#include <ntqptrstack.h>
-#include <ntqlistview.h>
+#include <tqdict.h>
+#include <tqptrstack.h>
+#include <tqlistview.h>
 #include "calltreedlg.h"
 #include "graphwidget.h"
 #include "treewidget.h"

src/editormanager.h

@@ -28,7 +28,7 @@
 #ifndef EDITORMANAGER_H
 #define EDITORMANAGER_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include <tdeparts/partmanager.h>
 #include <klibloader.h>
 #include <tdetexteditor/document.h>

src/editorpage.cpp

@@ -25,7 +25,7 @@
  *
  ***************************************************************************/
 
-#include <ntqfileinfo.h>
+#include <tqfileinfo.h>
 #include <tdeversion.h>
 #include <tdetexteditor/selectioninterface.h>
 #include <tdetexteditor/viewcursorinterface.h>

src/editorpage.h

@@ -28,11 +28,11 @@
 #ifndef EDITORPAGE_H
 #define EDITORPAGE_H
 
-#include <ntqwidget.h>
-#include <ntqhbox.h>
-#include <ntqsplitter.h>
-#include <ntqtabwidget.h>
-#include <ntqpopupmenu.h>
+#include <tqwidget.h>
+#include <tqhbox.h>
+#include <tqsplitter.h>
+#include <tqtabwidget.h>
+#include <tqpopupmenu.h>
 #include <tdetexteditor/document.h>
 #include <tdetexteditor/view.h>
 #include <tdetexteditor/markinterfaceextension.h>

src/editortabs.cpp

@@ -25,7 +25,7 @@
  *
  ***************************************************************************/
 
-#include <ntqfileinfo.h>
+#include <tqfileinfo.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <kurldrag.h>

src/editortabs.h

@@ -28,8 +28,8 @@
 #ifndef EDITORTABS_H
 #define EDITORTABS_H
 
-#include <ntqwidget.h>
-#include <ntqpopupmenu.h>
+#include <tqwidget.h>
+#include <tqpopupmenu.h>
 #include "tabwidget.h"
 #include "editorpage.h"
 #include "projectmanager.h"

src/encoder.cpp

@@ -25,7 +25,7 @@
  *
  ***************************************************************************/
 
-#include "ntqstring.h"
+#include <tqstring.h>
 #include "encoder.h"
 
 #define CHAR_TO_HEX(c)		((c) < 0xA ? '0' + (c) : ('A' - 0xA) + (c))

src/filelist.cpp

@@ -25,8 +25,8 @@
  *
  ***************************************************************************/
 
-#include <ntqlineedit.h>
-#include <ntqfileinfo.h>
+#include <tqlineedit.h>
+#include <tqfileinfo.h>
 #include <tdelocale.h>
 #include "filelist.h"
 #include "kscope.h"

src/filelist.h

@@ -28,7 +28,7 @@
 #ifndef FILELIST_H
 #define FILELIST_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include "searchlist.h"
 #include "projectmanager.h"
 

src/fileview.cpp

@@ -25,9 +25,9 @@
  *
  ***************************************************************************/
 
-#include <ntqpushbutton.h>
-#include <ntqfileinfo.h>
-#include <ntqtabwidget.h>
+#include <tqpushbutton.h>
+#include <tqfileinfo.h>
+#include <tqtabwidget.h>
 #include <tdefiledialog.h>
 #include "fileview.h"
 #include "filelist.h"

src/frontend.cpp

@@ -25,8 +25,8 @@
  *
  ***************************************************************************/
 
-#include <ntqfileinfo.h>
-#include <ntqdir.h>
+#include <tqfileinfo.h>
+#include <tqdir.h>
 #include <tdelocale.h>
 #include "frontend.h"
 

src/frontend.h

@@ -28,7 +28,7 @@
 #ifndef FRONTEND_H
 #define FRONTEND_H
 
-#include <ntqobject.h>
+#include <tqobject.h>
 #include <kprocess.h>
 
 

src/graphedge.cpp

@@ -27,7 +27,7 @@
 
 #include <math.h>
 #include <stdlib.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include "graphedge.h"
 #include "graphnode.h"
 

src/graphedge.h

@@ -28,7 +28,7 @@
 #ifndef GRAPHEDGE_H
 #define GRAPHEDGE_H
 
-#include <ntqcanvas.h>
+#include <tqcanvas.h>
 
 class GraphNode;
 

src/graphnode.cpp

@@ -25,8 +25,8 @@
  *
  ***************************************************************************/
 
-#include <ntqpainter.h>
-#include <ntqfontmetrics.h>
+#include <tqpainter.h>
+#include <tqfontmetrics.h>
 #include "graphnode.h"
 
 int GraphNode::RTTI = 1001;

src/graphnode.h

@@ -28,8 +28,8 @@
 #ifndef GRAPHNODE_H
 #define GRAPHNODE_H
 
-#include <ntqcanvas.h>
-#include <ntqdict.h>
+#include <tqcanvas.h>
+#include <tqdict.h>
 #include "graphedge.h"
 
 /**

src/graphprefdlg.cpp

@@ -25,7 +25,7 @@
  *
  ***************************************************************************/
 
-#include <ntqspinbox.h>
+#include <tqspinbox.h>
 #include "graphprefdlg.h"
 #include "preferencesdlg.h"
 #include "kscopeconfig.h"

src/graphwidget.cpp

@@ -27,9 +27,9 @@
 
 #include <math.h>
 #include <stdlib.h>
-#include <ntqfile.h>
-#include <ntqpainter.h>
-#include <ntqtooltip.h>
+#include <tqfile.h>
+#include <tqpainter.h>
+#include <tqtooltip.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include "graphwidget.h"

src/graphwidget.h

@@ -28,9 +28,9 @@
 #ifndef GRAPHWIDGET_H
 #define GRAPHWIDGET_H
 
-#include <ntqcanvas.h>
-#include <ntqpopupmenu.h>
-#include <ntqdict.h>
+#include <tqcanvas.h>
+#include <tqpopupmenu.h>
+#include <tqdict.h>
 #include "cscopefrontend.h"
 #include "graphnode.h"
 #include "dotfrontend.h"

src/kscope.cpp

@@ -25,7 +25,7 @@
  *
  ***************************************************************************/
 
-#include <ntqfile.h>
+#include <tqfile.h>
 #include <tdefiledialog.h>
 #include <tdemenubar.h>
 #include <tdelocale.h>

src/kscope.h

@@ -32,7 +32,7 @@
 #include <config.h>
 #endif
 
-#include <ntqtimer.h>
+#include <tqtimer.h>
 #include <tdecmdlineargs.h>
 #include <kapp.h>
 #include <tdeparts/dockmainwindow.h>

src/kscopeconfig.h

@@ -28,9 +28,9 @@
 #ifndef KSCOPECONFIG_H
 #define KSCOPECONFIG_H
 
-#include <ntqobject.h>
-#include <ntqstringlist.h>
-#include <ntqcolor.h>
+#include <tqobject.h>
+#include <tqstringlist.h>
+#include <tqcolor.h>
 #include <kdockwidget.h>
 
 typedef TQValueList<int> SPLIT_SIZES;

src/kscopepixmaps.h

@@ -28,7 +28,7 @@
 #ifndef KSCOPEPIXMAPS_H
 #define KSCOPEPIXMAPS_H
 
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <kiconloader.h>
 
 #define GET_PIXMAP(_pix) \

src/makedlg.cpp

@@ -25,7 +25,7 @@
  *
  ***************************************************************************/
 
-#include <ntqtextcodec.h>
+#include <tqtextcodec.h>
 #include <ktextbrowser.h>
 #include <kcombobox.h>
 #include <kurlrequester.h>

src/makefrontend.cpp

@@ -25,7 +25,7 @@
  *
  ***************************************************************************/
 
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #include "makefrontend.h"
 
 // TODO:

src/makefrontend.h

@@ -28,7 +28,7 @@
 #ifndef MAKEFRONTEND_H
 #define MAKEFRONTEND_H
 
-#include <frontend.h>
+#include "frontend.h"
 
 /**
  * A shell-process front-end intended for running make-like tasks.

src/newprojectdlg.cpp

@@ -25,11 +25,11 @@
  *
  ***************************************************************************/
 
-#include <ntqregexp.h>
-#include <ntqpushbutton.h>
-#include <ntqspinbox.h>
-#include <ntqlabel.h>
-#include <ntqtextedit.h>
+#include <tqregexp.h>
+#include <tqpushbutton.h>
+#include <tqspinbox.h>
+#include <tqlabel.h>
+#include <tqtextedit.h>
 #include <kurlrequester.h>
 #include <klineedit.h>
 #include <tdemessagebox.h>

src/newprojectdlg.h

@@ -28,8 +28,8 @@
 #ifndef NEWPROJECTDLG_H
 #define NEWPROJECTDLG_H
 
-#include <ntqlineedit.h>
-#include <ntqcheckbox.h>
+#include <tqlineedit.h>
+#include <tqcheckbox.h>
 #include <newprojectlayout.h>
 #include <autocompletionlayout.h>
 #include "projectbase.h"

src/openprojectdlg.cpp

@@ -25,9 +25,9 @@
  *
  ***************************************************************************/
 
-#include <ntqpushbutton.h>
-#include <ntqlineedit.h>
-#include <ntqlistbox.h>
+#include <tqpushbutton.h>
+#include <tqlineedit.h>
+#include <tqlistbox.h>
 #include <kurlrequester.h>
 #include "openprojectdlg.h"
 #include "kscopeconfig.h"

src/openprojectdlg.h

@@ -28,7 +28,7 @@
 #ifndef OPENPROJECTDLG_H
 #define OPENPROJECTDLG_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include <openprojectlayout.h>
 
 /**

src/prefcolor.cpp

@@ -25,8 +25,8 @@
  *
  ***************************************************************************/
 
-#include <ntqlistview.h>
-#include <ntqpainter.h>
+#include <tqlistview.h>
+#include <tqpainter.h>
 #include <kcolordialog.h>
 #include "prefcolor.h"
 #include "kscopeconfig.h"

src/preferencesdlg.cpp

@@ -25,12 +25,12 @@
  *
  ***************************************************************************/
 
-#include <ntqlayout.h>
+#include <tqlayout.h>
 #include <tdelocale.h>
 #include <kiconloader.h>
 #include <kurlrequester.h>
 #include <klineedit.h>
-#include <ntqcheckbox.h>
+#include <tqcheckbox.h>
 #include <kcolorbutton.h>
 #include <tdemessagebox.h>
 #include <tdefontrequester.h>

src/preferencesdlg.h

@@ -28,7 +28,7 @@
 #ifndef PREFERENCESDLG_H
 #define PREFERENCESDLG_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include <kdialogbase.h>
 
 class PrefFrontend;

src/preffont.cpp

@@ -25,8 +25,8 @@
  *
  ***************************************************************************/
 
-#include <ntqlistview.h>
-#include <ntqpainter.h>
+#include <tqlistview.h>
+#include <tqpainter.h>
 #include <tdefontdialog.h>
 #include <tdelocale.h>
 #include "preffont.h"

src/preffrontend.cpp

@@ -25,8 +25,8 @@
  *
  ***************************************************************************/
 
-#include <ntqcheckbox.h>
-#include <ntqtextedit.h>
+#include <tqcheckbox.h>
+#include <tqtextedit.h>
 #include <kurlrequester.h>
 #include <klineedit.h>
 #include <kstandarddirs.h>

src/preffrontend.h

@@ -28,7 +28,7 @@
 #ifndef PREFFRONTENDDLG_H
 #define PREFFRONTENDDLG_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include <preffrontendlayout.h>
 
 /**

src/prefopt.cpp

@@ -25,10 +25,10 @@
  *
  ***************************************************************************/
 
-#include <ntqcheckbox.h>
-#include <ntqradiobutton.h>
-#include <ntqlineedit.h>
-#include <ntqlabel.h>
+#include <tqcheckbox.h>
+#include <tqradiobutton.h>
+#include <tqlineedit.h>
+#include <tqlabel.h>
 #include "prefopt.h"
 #include "kscopeconfig.h"
 

src/progressdlg.h

@@ -28,8 +28,8 @@
 #ifndef PROGRESSDLG_H
 #define PROGRESSDLG_H
 
-#include <ntqwidget.h>
-#include <ntqtimer.h>
+#include <tqwidget.h>
+#include <tqtimer.h>
 #include <kprogress.h>
 
 /**

src/project.h

@@ -28,7 +28,7 @@
 #ifndef PROJECT_H
 #define PROJECT_H
 
-#include <projectbase.h>
+#include "projectbase.h"
 
 /**
  * @author Elad Lahav

src/projectbase.h

@@ -28,9 +28,9 @@
 #ifndef PROJECTBASE_H
 #define PROJECTBASE_H
 
-#include <ntqstringlist.h>
-#include <ntqdir.h>
-#include <ntqfile.h>
+#include <tqstringlist.h>
+#include <tqdir.h>
+#include <tqfile.h>
 #include <tdeconfig.h>
 
 #define DEF_IS_KERNEL		false

src/projectfilesdlg.cpp

@@ -25,10 +25,10 @@
  *
  ***************************************************************************/
 
-#include <ntqpushbutton.h>
-#include <ntqlistview.h>
-#include <ntqlineedit.h>
-#include <ntqregexp.h>
+#include <tqpushbutton.h>
+#include <tqlistview.h>
+#include <tqlineedit.h>
+#include <tqregexp.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <tdefiledialog.h>

src/projectfilesdlg.h

@@ -28,9 +28,9 @@
 #ifndef PROJECTFILESDLG_H
 #define PROJECTFILESDLG_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include <projectfileslayout.h>
-#include <ntqdict.h>
+#include <tqdict.h>
 #include "project.h"
 
 class DirScanner;

src/querypage.cpp

@@ -25,7 +25,7 @@
  *
  ***************************************************************************/
 
-#include <ntqfile.h>
+#include <tqfile.h>
 #include <tdelocale.h>
 #include "querypage.h"
 #include "queryview.h"

src/querypage.h

@@ -28,9 +28,9 @@
 #ifndef QUERYPAGE_H
 #define QUERYPAGE_H
 
-#include <ntqwidget.h>
-#include <ntqlistview.h>
-#include <ntqregexp.h>
+#include <tqwidget.h>
+#include <tqlistview.h>
+#include <tqregexp.h>
 #include "querypagebase.h"
 #include "cscopefrontend.h"
 

src/querypagebase.cpp

@@ -25,7 +25,7 @@
  *
  ***************************************************************************/
 
-#include <ntqfile.h>
+#include <tqfile.h>
 #include "querypagebase.h"
 #include "queryview.h"
 #include "kscopeconfig.h"

src/querypagebase.h

@@ -28,7 +28,7 @@
 #ifndef QUERYPAGEBASE_H
 #define QUERYPAGEBASE_H
 
-#include <ntqhbox.h>
+#include <tqhbox.h>
 
 class QueryView;
 

src/queryresultsmenu.h

@@ -28,9 +28,9 @@
 #ifndef QUERYRESULTSMENU_H
 #define QUERYRESULTSMENU_H
 
-#include <ntqpopupmenu.h>
-#include <ntqlistview.h>
-#include <ntqregexp.h>
+#include <tqpopupmenu.h>
+#include <tqlistview.h>
+#include <tqregexp.h>
 
 /**
  * Provides a popup-menu for list views containing query results.

src/queryview.cpp

@@ -25,8 +25,8 @@
  *
  ***************************************************************************/
 
-#include <ntqapplication.h>
-#include <ntqclipboard.h>
+#include <tqapplication.h>
+#include <tqclipboard.h>
 #include <tdelocale.h>
 #include "queryview.h"
 #include "queryresultsmenu.h"

src/queryview.h

@@ -28,8 +28,8 @@
 #ifndef QUERYVIEW_H
 #define QUERYVIEW_H
 
-#include <ntqlistview.h>
-#include <ntqregexp.h>
+#include <tqlistview.h>
+#include <tqregexp.h>
 
 class QueryResultsMenu;
 

src/queryviewdriver.h

@@ -28,8 +28,8 @@
 #ifndef QUERYVIEWDRIVER_H
 #define QUERYVIEWDRIVER_H
 
-#include <ntqobject.h>
-#include <ntqlistview.h>
+#include <tqobject.h>
+#include <tqlistview.h>
 #include "cscopefrontend.h"
 
 class QueryView;

src/querywidget.cpp

@@ -25,8 +25,8 @@
  *
  ***************************************************************************/
 
-#include <ntqtoolbutton.h>
-#include <ntqtooltip.h>
+#include <tqtoolbutton.h>
+#include <tqtooltip.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include "querywidget.h"

src/querywidget.h

@@ -28,8 +28,8 @@
 #ifndef QUERYWIDGET_H
 #define QUERYWIDGET_H
 
-#include <ntqlistview.h>
-#include <ntqpopupmenu.h>
+#include <tqlistview.h>
+#include <tqpopupmenu.h>
 #include <tdeaction.h>
 #include "querywidgetlayout.h"
 #include "tabwidget.h"

src/scanprogressdlg.cpp

@@ -25,8 +25,8 @@
  *
  ***************************************************************************/
 
-#include <ntqlabel.h>
-#include <ntqpushbutton.h>
+#include <tqlabel.h>
+#include <tqpushbutton.h>
 #include <tdelocale.h>
 #include "scanprogressdlg.h"
 

src/scanprogressdlg.h

@@ -28,7 +28,7 @@
 #ifndef SCANPROGRESSDLG_H
 #define SCANPROGRESSDLG_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include <scanprogresslayout.h>
 
 /**

src/searchlist.cpp

@@ -25,7 +25,7 @@
  *
  ***************************************************************************/
 
-#include <ntqheader.h>
+#include <tqheader.h>
 #include "searchlist.h"
 
 /**

src/searchlist.h

@@ -28,11 +28,11 @@
 #ifndef SEARCHLIST_H
 #define SEARCHLIST_H
 
-#include <ntqwidget.h>
-#include <ntqvbox.h>
-#include <ntqlineedit.h>
-#include <ntqlistview.h>
-#include <ntqtooltip.h>
+#include <tqwidget.h>
+#include <tqvbox.h>
+#include <tqlineedit.h>
+#include <tqlistview.h>
+#include <tqtooltip.h>
 
 class SearchList;
 

src/searchresultsdlg.cpp

@@ -25,10 +25,10 @@
  *
  ***************************************************************************/
 
-#include <ntqpushbutton.h>
-#include <ntqlineedit.h>
-#include <ntqcombobox.h>
-#include <ntqradiobutton.h>
+#include <tqpushbutton.h>
+#include <tqlineedit.h>
+#include <tqcombobox.h>
+#include <tqradiobutton.h>
 #include "searchresultsdlg.h"
 
 int SearchResultsDlg::s_nType = PlainText;

src/searchresultsdlg.h

@@ -28,8 +28,8 @@
 #ifndef SEARCHRESULTSDLG_H
 #define SEARCHRESULTSDLG_H
 
-#include <ntqregexp.h>
-#include <ntqcheckbox.h>
+#include <tqregexp.h>
+#include <tqcheckbox.h>
 #include "searchresultslayout.h"
 
 /**

src/symbolcompletion.cpp

@@ -25,7 +25,7 @@
  *
  ***************************************************************************/
 
-#include <ntqtimer.h> 
+#include <tqtimer.h>
 #include <tdelocale.h>
 #include "symbolcompletion.h"
 

src/symbolcompletion.h

@@ -28,8 +28,8 @@
 #ifndef SYMBOLCOMPLETION_H
 #define SYMBOLCOMPLETION_H
 
-#include <ntqobject.h>
-#include <ntqregexp.h>
+#include <tqobject.h>
+#include <tqregexp.h>
 #include <tdetexteditor/codecompletioninterface.h>
 #include <tdetexteditor/view.h>
 #include "cscopefrontend.h"

src/symboldlg.cpp

@@ -25,12 +25,12 @@
  *
  ***************************************************************************/
 
-#include <ntqlabel.h>
-#include <ntqlistview.h>
-#include <ntqpushbutton.h>
-#include <ntqradiobutton.h>
-#include <ntqcheckbox.h>
-#include <ntqgroupbox.h>
+#include <tqlabel.h>
+#include <tqlistview.h>
+#include <tqpushbutton.h>
+#include <tqradiobutton.h>
+#include <tqcheckbox.h>
+#include <tqgroupbox.h>
 #include <kcombobox.h>
 #include <tdelocale.h>
 #include "symboldlg.h"

src/symboldlg.h

@@ -28,7 +28,7 @@
 #ifndef SYMBOLDLG_H
 #define SYMBOLDLG_H
 
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #include "symbollayout.h"
 #include "cscopefrontend.h"
 

src/tabwidget.cpp

@@ -25,7 +25,7 @@
  *
  ***************************************************************************/
 
-#include <ntqtooltip.h>
+#include <tqtooltip.h>
 #include <tdelocale.h>
 #include "tabwidget.h"
 #include "kscopepixmaps.h"

src/tabwidget.h

@@ -29,8 +29,8 @@
 #define TABWIDGET_H
 
 
-#include <ntqtoolbutton.h>
-#include <ntqpopupmenu.h>
+#include <tqtoolbutton.h>
+#include <tqpopupmenu.h>
 #include <ktabwidget.h>
 
 /**