-rwxr-xr-x | scripts/fixincludes | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/scripts/fixincludes b/scripts/fixincludes index 95fc129..da8613c 100755 --- a/scripts/fixincludes +++ b/scripts/fixincludes | |||
@@ -56,19 +56,19 @@ $hExt = "(h|H|hh|hxx|hpp|h\\+\\+)"; | |||
56 | # list of compat headers. scroll down ... much of boring stuff here.. | 56 | # list of compat headers. scroll down ... much of boring stuff here.. |
57 | %compatmap = ( | 57 | %compatmap = ( |
58 | 'qapp.h' => "qapplication.h", | 58 | 'qapp.h' => "qapplication.h", |
59 | 'qarray.h' => "qmemarray.h", | 59 | #'qarray.h' => "qmemarray.h", |
60 | 'qbitarry.h' => "qbitarray.h", | 60 | #'qbitarry.h' => "qbitarray.h", |
61 | 'qbttngrp.h' => "qbuttongroup.h", | 61 | 'qbttngrp.h' => "qbuttongroup.h", |
62 | 'qchkbox.h' => "qcheckbox.h", | 62 | #'qchkbox.h' => "qcheckbox.h", |
63 | 'qclipbrd.h' => "qclipboard.h", | 63 | 'qclipbrd.h' => "qclipboard.h", |
64 | 'qcollect.h' => "qptrcollection.h", | 64 | #'qcollect.h' => "qptrcollection.h", |
65 | 'qcollection.h' => "qptrcollection.h", | 65 | #'qcollection.h' => "qptrcollection.h", |
66 | 'qcombo.h' => "qcombobox.h", | 66 | 'qcombo.h' => "qcombobox.h", |
67 | 'qconnect.h' => "qconnection.h", | 67 | 'qconnect.h' => "qconnection.h", |
68 | 'qdatetm.h' => "qdatetime.h", | 68 | 'qdatetm.h' => "qdatetime.h", |
69 | 'qdrawutl.h' => "qdrawutil.h", | 69 | 'qdrawutl.h' => "qdrawutil.h", |
70 | 'qdstream.h' => "qdatastream.h", | 70 | 'qdstream.h' => "qdatastream.h", |
71 | 'qfiledef.h' => "private/qfiledefs_p.h", | 71 | #'qfiledef.h' => "private/qfiledefs_p.h", |
72 | 'qfiledlg.h' => "qfiledialog.h", | 72 | 'qfiledlg.h' => "qfiledialog.h", |
73 | 'qfileinf.h' => "qfileinfo.h", | 73 | 'qfileinf.h' => "qfileinfo.h", |
74 | 'qfontdta.h' => "qfontdata.h", | 74 | 'qfontdta.h' => "qfontdata.h", |
@@ -79,7 +79,7 @@ $hExt = "(h|H|hh|hxx|hpp|h\\+\\+)"; | |||
79 | 'qiodev.h' => "qiodevice.h", | 79 | 'qiodev.h' => "qiodevice.h", |
80 | 'qlcdnum.h' => "qlcdnumber.h", | 80 | 'qlcdnum.h' => "qlcdnumber.h", |
81 | 'qlined.h' => "qlineedit.h", | 81 | 'qlined.h' => "qlineedit.h", |
82 | 'qlist.h' => "qptrlist.h", | 82 | #'qlist.h' => "qptrlist.h", |
83 | 'qmenudta.h' => "qmenudata.h", | 83 | 'qmenudta.h' => "qmenudata.h", |
84 | 'qmetaobj.h' => "qmetaobject.h", | 84 | 'qmetaobj.h' => "qmetaobject.h", |
85 | 'qmlined.h' => "qtmultilineedit.h", | 85 | 'qmlined.h' => "qtmultilineedit.h", |
@@ -103,21 +103,21 @@ $hExt = "(h|H|hh|hxx|hpp|h\\+\\+)"; | |||
103 | 'qrangect.h' => "qrangecontrol.h", | 103 | 'qrangect.h' => "qrangecontrol.h", |
104 | 'qscrbar.h' => "qscrollbar.h", | 104 | 'qscrbar.h' => "qscrollbar.h", |
105 | 'qsocknot.h' => "qsocketnotifier.h", | 105 | 'qsocknot.h' => "qsocketnotifier.h", |
106 | 'qstack.h' => "qptrstack.h", | 106 | # 'qstack.h' => "qptrstack.h", |
107 | 'qtabdlg.h' => "qtabdialog.h", | 107 | 'qtabdlg.h' => "qtabdialog.h", |
108 | 'qtstream.h' => "qtextstream.h", | 108 | 'qtstream.h' => "qtextstream.h", |
109 | 'qvector.h' => "qptrvector.h", | 109 | # 'qvector.h' => "qptrvector.h", |
110 | 'qwidcoll.h' => "qwidgetlist.h\n\#include <qwidgetintdict.h", | 110 | 'qwidcoll.h' => "qwidgetlist.h\n\#include <qwidgetintdict.h", |
111 | 'qwindefs.h' => "qwindowdefs.h", | 111 | 'qwindefs.h' => "qwindowdefs.h", |
112 | 112 | ||
113 | # and now the KDE specific compat includes | 113 | # and now the KDE specific compat includes |
114 | 'kapp.h' => "kapplication.h", | 114 | # 'kapp.h' => "kapplication.h", |
115 | 'kstddirs.h' => "kstandarddirs.h", | 115 | # 'kstddirs.h' => "kstandarddirs.h", |
116 | 'kuniqueapp.h' => "kuniqueapplication.h", | 116 | # 'kuniqueapp.h' => "kuniqueapplication.h", |
117 | 'ktmainwindow.h'=> "kmainwindow.h", | 117 | # 'ktmainwindow.h'=> "kmainwindow.h", |
118 | 'kcolorbtn.h' => "kcolorbutton.h", | 118 | # 'kcolorbtn.h' => "kcolorbutton.h", |
119 | 'kcolordlg.h' => "kcolordialog.h", | 119 | # 'kcolordlg.h' => "kcolordialog.h", |
120 | 'kxmlgui.h' => "kxmlguifactory.h", | 120 | # 'kxmlgui.h' => "kxmlguifactory.h", |
121 | ); | 121 | ); |
122 | 122 | ||
123 | 123 | ||
@@ -462,7 +462,7 @@ sub fix_unnecessary($) | |||
462 | # check if it is its own header file | 462 | # check if it is its own header file |
463 | my $blankhdr = $include; | 463 | my $blankhdr = $include; |
464 | $blankhdr =~ s/(.*)\.[^\.]+/$1/; | 464 | $blankhdr =~ s/(.*)\.[^\.]+/$1/; |
465 | next if ($blankhdr eq $blanksrc); | 465 | next if ($blankhdr eq $blanksrc); |
466 | 466 | ||
467 | chdir($srcdir); | 467 | chdir($srcdir); |
468 | 468 | ||