| -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 @@ -51,40 +51,40 @@ while (defined ($ARGV[0])) } $cppExt = "(cpp|cc|cxx|C|c\\+\\+)"; $hExt = "(h|H|hh|hxx|hpp|h\\+\\+)"; # list of compat headers. scroll down ... much of boring stuff here.. %compatmap = ( 'qapp.h' => "qapplication.h", - 'qarray.h' => "qmemarray.h", - 'qbitarry.h' => "qbitarray.h", + #'qarray.h' => "qmemarray.h", + #'qbitarry.h' => "qbitarray.h", 'qbttngrp.h' => "qbuttongroup.h", - 'qchkbox.h' => "qcheckbox.h", + #'qchkbox.h' => "qcheckbox.h", 'qclipbrd.h' => "qclipboard.h", - 'qcollect.h' => "qptrcollection.h", - 'qcollection.h' => "qptrcollection.h", + #'qcollect.h' => "qptrcollection.h", + #'qcollection.h' => "qptrcollection.h", 'qcombo.h' => "qcombobox.h", 'qconnect.h' => "qconnection.h", 'qdatetm.h' => "qdatetime.h", 'qdrawutl.h' => "qdrawutil.h", 'qdstream.h' => "qdatastream.h", - 'qfiledef.h' => "private/qfiledefs_p.h", + #'qfiledef.h' => "private/qfiledefs_p.h", 'qfiledlg.h' => "qfiledialog.h", 'qfileinf.h' => "qfileinfo.h", 'qfontdta.h' => "qfontdata.h", 'qfontinf.h' => "qfontinfo.h", 'qfontmet.h' => "qfontmetrics.h", 'qgrpbox.h' => "qgroupbox.h", 'qintcach.h' => "qintcache.h", 'qiodev.h' => "qiodevice.h", 'qlcdnum.h' => "qlcdnumber.h", 'qlined.h' => "qlineedit.h", - 'qlist.h' => "qptrlist.h", + #'qlist.h' => "qptrlist.h", 'qmenudta.h' => "qmenudata.h", 'qmetaobj.h' => "qmetaobject.h", 'qmlined.h' => "qtmultilineedit.h", 'qmsgbox.h' => "qmessagebox.h", 'qmultilinedit.h' => "qmultilineedit.h", 'qobjcoll.h' => "qobjectlist.h>\n\#include <qobjectdict.h", 'qobjdefs.h' => "qobjectdefs.h", 'qpaintd.h' => "qpaintdevice.h", @@ -98,31 +98,31 @@ $hExt = "(h|H|hh|hxx|hpp|h\\+\\+)"; 'qprogdlg.h' => "qprogressdialog.h", 'qpsprn.h' => "<private/qpsprinter_p.h>", 'qpushbt.h' => "qpushbutton.h", 'qqueue.h' => "qptrqueue.h", 'qradiobt.h' => "qradiobutton.h", 'qrangect.h' => "qrangecontrol.h", 'qscrbar.h' => "qscrollbar.h", 'qsocknot.h' => "qsocketnotifier.h", - 'qstack.h' => "qptrstack.h", +# 'qstack.h' => "qptrstack.h", 'qtabdlg.h' => "qtabdialog.h", 'qtstream.h' => "qtextstream.h", - 'qvector.h' => "qptrvector.h", +# 'qvector.h' => "qptrvector.h", 'qwidcoll.h' => "qwidgetlist.h\n\#include <qwidgetintdict.h", 'qwindefs.h' => "qwindowdefs.h", # and now the KDE specific compat includes - 'kapp.h' => "kapplication.h", - 'kstddirs.h' => "kstandarddirs.h", - 'kuniqueapp.h' => "kuniqueapplication.h", - 'ktmainwindow.h'=> "kmainwindow.h", - 'kcolorbtn.h' => "kcolorbutton.h", - 'kcolordlg.h' => "kcolordialog.h", - 'kxmlgui.h' => "kxmlguifactory.h", +# 'kapp.h' => "kapplication.h", +# 'kstddirs.h' => "kstandarddirs.h", +# 'kuniqueapp.h' => "kuniqueapplication.h", +# 'ktmainwindow.h'=> "kmainwindow.h", +# 'kcolorbtn.h' => "kcolorbutton.h", +# 'kcolordlg.h' => "kcolordialog.h", +# 'kxmlgui.h' => "kxmlguifactory.h", ); # now it starts to get interesting again # Look for source files in the given directory ($dir, first parameter) sub find_fixable_sources ($) { @@ -457,17 +457,17 @@ sub fix_unnecessary($) # so that it's easy to add kdDebug calls next if( $include eq "kdebug.h"); # avoid this one as it might cause # certain code parts to be disabled from compilation next if( $include eq "qmodules.h"); # check if it is its own header file my $blankhdr = $include; $blankhdr =~ s/(.*)\.[^\.]+/$1/; - next if ($blankhdr eq $blanksrc); + next if ($blankhdr eq $blanksrc); chdir($srcdir); local $localbackup = $srcfile . "#fixincludes"; # preserve timestamp if possible for CVS unlink $localbackup; rename $srcfile, $localbackup; |