From 4ff709afede2f49e6165ec52699acc98b0c928fc Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 8 Dec 2020 12:30:30 +0900 Subject: [PATCH] Renaming of files in preparation for code style tools. Signed-off-by: Michele Calgaro (cherry picked from commit 7ec5a57fc3f04526f36477e22066199372beb0ee) --- ark/ChangeLog | 9 +++------ kcharselect/CMakeLists.txt | 2 +- kcharselect/Makefile.am | 4 ++-- .../{kcharselectdia.cc => kcharselectdia.cpp} | 0 kcharselect/{main.cc => main.cpp} | 0 kgpg/Makefile.am | 2 +- khexedit/CMakeLists.txt | 20 +++++++++---------- khexedit/Makefile.am | 16 +++++++-------- .../{bitswapwidget.cc => bitswapwidget.cpp} | 0 ...chartabledialog.cc => chartabledialog.cpp} | 0 khexedit/{conversion.cc => conversion.cpp} | 0 ...converterdialog.cc => converterdialog.cpp} | 0 khexedit/{dialog.cc => dialog.cpp} | 0 khexedit/{draglabel.cc => draglabel.cpp} | 0 .../{exportdialog.cc => exportdialog.cpp} | 0 .../{fileinfodialog.cc => fileinfodialog.cpp} | 0 khexedit/{hexbuffer.cc => hexbuffer.cpp} | 0 .../{hexclipboard.cc => hexclipboard.cpp} | 0 khexedit/{hexdrag.cc => hexdrag.cpp} | 0 ...hexeditorwidget.cc => hexeditorwidget.cpp} | 0 khexedit/{hexerror.cc => hexerror.cpp} | 0 ...xmanagerwidget.cc => hexmanagerwidget.cpp} | 0 khexedit/{hexprinter.cc => hexprinter.cpp} | 0 .../{hextoolwidget.cc => hextoolwidget.cpp} | 0 .../{hexvalidator.cc => hexvalidator.cpp} | 0 .../{hexviewwidget.cc => hexviewwidget.cpp} | 0 khexedit/{listview.cc => listview.cpp} | 0 khexedit/{main.cc => main.cpp} | 0 .../{optiondialog.cc => optiondialog.cpp} | 0 ...printdialogpage.cc => printdialogpage.cpp} | 0 khexedit/{searchbar.cc => searchbar.cpp} | 0 ...usbarprogress.cc => statusbarprogress.cpp} | 0 .../{stringdialog.cc => stringdialog.cpp} | 0 khexedit/{toplevel.cc => toplevel.cpp} | 0 klaptopdaemon/CMakeLists.txt | 2 +- klaptopdaemon/Makefile.am | 2 +- klaptopdaemon/{xautolock.cc => xautolock.cpp} | 0 kregexpeditor/CMakeLists.txt | 2 +- kregexpeditor/Makefile.am | 4 ++-- kregexpeditor/gen_qregexplexer.cpp | 2 +- ...qregexpparser.cc => gen_qregexpparser.cpp} | 6 +++--- ...n_qregexpparser.hh => gen_qregexpparser.h} | 2 +- kregexpeditor/qregexpparser.l | 2 +- kregexpeditor/qt-only/compile | 4 ++-- kregexpeditor/qt-only/qt-only.pro | 2 +- 45 files changed, 39 insertions(+), 42 deletions(-) rename kcharselect/{kcharselectdia.cc => kcharselectdia.cpp} (100%) rename kcharselect/{main.cc => main.cpp} (100%) rename khexedit/{bitswapwidget.cc => bitswapwidget.cpp} (100%) rename khexedit/{chartabledialog.cc => chartabledialog.cpp} (100%) rename khexedit/{conversion.cc => conversion.cpp} (100%) rename khexedit/{converterdialog.cc => converterdialog.cpp} (100%) rename khexedit/{dialog.cc => dialog.cpp} (100%) rename khexedit/{draglabel.cc => draglabel.cpp} (100%) rename khexedit/{exportdialog.cc => exportdialog.cpp} (100%) rename khexedit/{fileinfodialog.cc => fileinfodialog.cpp} (100%) rename khexedit/{hexbuffer.cc => hexbuffer.cpp} (100%) rename khexedit/{hexclipboard.cc => hexclipboard.cpp} (100%) rename khexedit/{hexdrag.cc => hexdrag.cpp} (100%) rename khexedit/{hexeditorwidget.cc => hexeditorwidget.cpp} (100%) rename khexedit/{hexerror.cc => hexerror.cpp} (100%) rename khexedit/{hexmanagerwidget.cc => hexmanagerwidget.cpp} (100%) rename khexedit/{hexprinter.cc => hexprinter.cpp} (100%) rename khexedit/{hextoolwidget.cc => hextoolwidget.cpp} (100%) rename khexedit/{hexvalidator.cc => hexvalidator.cpp} (100%) rename khexedit/{hexviewwidget.cc => hexviewwidget.cpp} (100%) rename khexedit/{listview.cc => listview.cpp} (100%) rename khexedit/{main.cc => main.cpp} (100%) rename khexedit/{optiondialog.cc => optiondialog.cpp} (100%) rename khexedit/{printdialogpage.cc => printdialogpage.cpp} (100%) rename khexedit/{searchbar.cc => searchbar.cpp} (100%) rename khexedit/{statusbarprogress.cc => statusbarprogress.cpp} (100%) rename khexedit/{stringdialog.cc => stringdialog.cpp} (100%) rename khexedit/{toplevel.cc => toplevel.cpp} (100%) rename klaptopdaemon/{xautolock.cc => xautolock.cpp} (100%) rename kregexpeditor/{gen_qregexpparser.cc => gen_qregexpparser.cpp} (99%) rename kregexpeditor/{gen_qregexpparser.hh => gen_qregexpparser.h} (98%) diff --git a/ark/ChangeLog b/ark/ChangeLog index aa440bd..e9f3e96 100644 --- a/ark/ChangeLog +++ b/ark/ChangeLog @@ -1,8 +1,5 @@ $Id$ -2001-10-24: Roberto Selbach Teixeira - * Renamed all .cc files to .cpp to make things more logic. - 2001-06-23: Roberto Selbach Teixeira * Fixed a bug in tar addition with non-compressed tar archives @@ -20,12 +17,12 @@ 2001-05-29 Roberto Selbach Teixeira - * compressedfile.cc (unarchFile): move to fromLocal8Bit() to allow + * compressedfile.cpp (unarchFile): move to fromLocal8Bit() to allow non-Latin1 characters in filenames. - * ar.cc (unarchFile): .latin1() to .local8Bit() + * ar.cpp (unarchFile): .latin1() to .local8Bit() - * zip.cc (unarchFile): .latin1() to .local8Bit() + * zip.cpp (unarchFile): .latin1() to .local8Bit() 2000-07-10: Emily Ezust * Added checks for available disk space diff --git a/kcharselect/CMakeLists.txt b/kcharselect/CMakeLists.txt index cc3d6cf..1ccd750 100644 --- a/kcharselect/CMakeLists.txt +++ b/kcharselect/CMakeLists.txt @@ -25,7 +25,7 @@ link_directories( ##### kcharselect (executable) ################## tde_add_executable( kcharselect AUTOMOC - SOURCES kcharselectdia.cc main.cc + SOURCES kcharselectdia.cpp main.cpp LINK tdeui-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kcharselect/Makefile.am b/kcharselect/Makefile.am index f6dcede..46ac039 100644 --- a/kcharselect/Makefile.am +++ b/kcharselect/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = $(all_includes) LDADD = $(LIB_TDEFILE) bin_PROGRAMS = kcharselect -kcharselect_SOURCES = kcharselectdia.cc main.cc +kcharselect_SOURCES = kcharselectdia.cpp main.cpp kcharselect_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kcharselect_METASOURCES = kcharselectdia.moc @@ -17,5 +17,5 @@ rcdir = $(kde_datadir)/kcharselect rc_DATA = kcharselectui.rc messages: rc.cpp - $(XGETTEXT) *.cc *.cpp -o $(podir)/kcharselect.pot + $(XGETTEXT) *.cpp -o $(podir)/kcharselect.pot diff --git a/kcharselect/kcharselectdia.cc b/kcharselect/kcharselectdia.cpp similarity index 100% rename from kcharselect/kcharselectdia.cc rename to kcharselect/kcharselectdia.cpp diff --git a/kcharselect/main.cc b/kcharselect/main.cpp similarity index 100% rename from kcharselect/main.cc rename to kcharselect/main.cpp diff --git a/kgpg/Makefile.am b/kgpg/Makefile.am index 780c012..c9e3748 100644 --- a/kgpg/Makefile.am +++ b/kgpg/Makefile.am @@ -37,7 +37,7 @@ KDE_ICON = kgpg messages: rc.cpp $(PREPARETIPS) > tips.txt - LIST=`find . -name \*.h -o -name \*.txt -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \ + LIST=`find . -name \*.h -o -name \*.txt -o -name \*.cpp; \ if test -n "$$LIST"; then \ $(XGETTEXT) $$LIST -o $(podir)/kgpg.pot; \ fi diff --git a/khexedit/CMakeLists.txt b/khexedit/CMakeLists.txt index 12d3b46..003fdf6 100644 --- a/khexedit/CMakeLists.txt +++ b/khexedit/CMakeLists.txt @@ -29,16 +29,16 @@ link_directories( ##### khexedit (executable) ##################### tde_add_executable( khexedit AUTOMOC - SOURCES main.cc toplevel.cc hexmanagerwidget.cc - hexeditorwidget.cc hextoolwidget.cc - hexviewwidget.cc hexbuffer.cc conversion.cc - dialog.cc hexvalidator.cc hexclipboard.cc - optiondialog.cc printdialogpage.cc - statusbarprogress.cc hexprinter.cc - hexerror.cc draglabel.cc stringdialog.cc - bitswapwidget.cc chartabledialog.cc - hexdrag.cc exportdialog.cc fileinfodialog.cc - converterdialog.cc listview.cc searchbar.cc + SOURCES main.cpp toplevel.cpp hexmanagerwidget.cpp + hexeditorwidget.cpp hextoolwidget.cpp + hexviewwidget.cpp hexbuffer.cpp conversion.cpp + dialog.cpp hexvalidator.cpp hexclipboard.cpp + optiondialog.cpp printdialogpage.cpp + statusbarprogress.cpp hexprinter.cpp + hexerror.cpp draglabel.cpp stringdialog.cpp + bitswapwidget.cpp chartabledialog.cpp + hexdrag.cpp exportdialog.cpp fileinfodialog.cpp + converterdialog.cpp listview.cpp searchbar.cpp LINK tdeio-shared tdeprint-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/khexedit/Makefile.am b/khexedit/Makefile.am index 557e6c7..15985d2 100644 --- a/khexedit/Makefile.am +++ b/khexedit/Makefile.am @@ -4,13 +4,13 @@ SUBDIRS = pics lib parts bin_PROGRAMS = khexedit -khexedit_SOURCES = main.cc toplevel.cc hexmanagerwidget.cc \ -hexeditorwidget.cc hextoolwidget.cc hexviewwidget.cc hexbuffer.cc \ -conversion.cc dialog.cc hexvalidator.cc hexclipboard.cc \ -optiondialog.cc printdialogpage.cc statusbarprogress.cc \ -hexprinter.cc hexerror.cc draglabel.cc stringdialog.cc \ -bitswapwidget.cc chartabledialog.cc hexdrag.cc exportdialog.cc \ -fileinfodialog.cc converterdialog.cc listview.cc searchbar.cc +khexedit_SOURCES = main.cpp toplevel.cpp hexmanagerwidget.cpp \ +hexeditorwidget.cpp hextoolwidget.cpp hexviewwidget.cpp hexbuffer.cpp \ +conversion.cpp dialog.cpp hexvalidator.cpp hexclipboard.cpp \ +optiondialog.cpp printdialogpage.cpp statusbarprogress.cpp \ +hexprinter.cpp hexerror.cpp draglabel.cpp stringdialog.cpp \ +bitswapwidget.cpp chartabledialog.cpp hexdrag.cpp exportdialog.cpp \ +fileinfodialog.cpp converterdialog.cpp listview.cpp searchbar.cpp noinst_HEADERS = toplevel.h hexmanagerwidget.h hexeditorwidget.h \ hextoolwidget.h hexviewwidget.h hexbuffer.h conversion.h dialog.h \ @@ -32,4 +32,4 @@ rc_DATA = khexeditui.rc messages: rc.cpp $(EXTRACTRC) parts/kpart/*rc >> rc.cpp - $(XGETTEXT) rc.cpp `find . -name \*.cc -o -name \*.cpp` -o $(podir)/khexedit.pot + $(XGETTEXT) rc.cpp `find . -name \*.cpp` -o $(podir)/khexedit.pot diff --git a/khexedit/bitswapwidget.cc b/khexedit/bitswapwidget.cpp similarity index 100% rename from khexedit/bitswapwidget.cc rename to khexedit/bitswapwidget.cpp diff --git a/khexedit/chartabledialog.cc b/khexedit/chartabledialog.cpp similarity index 100% rename from khexedit/chartabledialog.cc rename to khexedit/chartabledialog.cpp diff --git a/khexedit/conversion.cc b/khexedit/conversion.cpp similarity index 100% rename from khexedit/conversion.cc rename to khexedit/conversion.cpp diff --git a/khexedit/converterdialog.cc b/khexedit/converterdialog.cpp similarity index 100% rename from khexedit/converterdialog.cc rename to khexedit/converterdialog.cpp diff --git a/khexedit/dialog.cc b/khexedit/dialog.cpp similarity index 100% rename from khexedit/dialog.cc rename to khexedit/dialog.cpp diff --git a/khexedit/draglabel.cc b/khexedit/draglabel.cpp similarity index 100% rename from khexedit/draglabel.cc rename to khexedit/draglabel.cpp diff --git a/khexedit/exportdialog.cc b/khexedit/exportdialog.cpp similarity index 100% rename from khexedit/exportdialog.cc rename to khexedit/exportdialog.cpp diff --git a/khexedit/fileinfodialog.cc b/khexedit/fileinfodialog.cpp similarity index 100% rename from khexedit/fileinfodialog.cc rename to khexedit/fileinfodialog.cpp diff --git a/khexedit/hexbuffer.cc b/khexedit/hexbuffer.cpp similarity index 100% rename from khexedit/hexbuffer.cc rename to khexedit/hexbuffer.cpp diff --git a/khexedit/hexclipboard.cc b/khexedit/hexclipboard.cpp similarity index 100% rename from khexedit/hexclipboard.cc rename to khexedit/hexclipboard.cpp diff --git a/khexedit/hexdrag.cc b/khexedit/hexdrag.cpp similarity index 100% rename from khexedit/hexdrag.cc rename to khexedit/hexdrag.cpp diff --git a/khexedit/hexeditorwidget.cc b/khexedit/hexeditorwidget.cpp similarity index 100% rename from khexedit/hexeditorwidget.cc rename to khexedit/hexeditorwidget.cpp diff --git a/khexedit/hexerror.cc b/khexedit/hexerror.cpp similarity index 100% rename from khexedit/hexerror.cc rename to khexedit/hexerror.cpp diff --git a/khexedit/hexmanagerwidget.cc b/khexedit/hexmanagerwidget.cpp similarity index 100% rename from khexedit/hexmanagerwidget.cc rename to khexedit/hexmanagerwidget.cpp diff --git a/khexedit/hexprinter.cc b/khexedit/hexprinter.cpp similarity index 100% rename from khexedit/hexprinter.cc rename to khexedit/hexprinter.cpp diff --git a/khexedit/hextoolwidget.cc b/khexedit/hextoolwidget.cpp similarity index 100% rename from khexedit/hextoolwidget.cc rename to khexedit/hextoolwidget.cpp diff --git a/khexedit/hexvalidator.cc b/khexedit/hexvalidator.cpp similarity index 100% rename from khexedit/hexvalidator.cc rename to khexedit/hexvalidator.cpp diff --git a/khexedit/hexviewwidget.cc b/khexedit/hexviewwidget.cpp similarity index 100% rename from khexedit/hexviewwidget.cc rename to khexedit/hexviewwidget.cpp diff --git a/khexedit/listview.cc b/khexedit/listview.cpp similarity index 100% rename from khexedit/listview.cc rename to khexedit/listview.cpp diff --git a/khexedit/main.cc b/khexedit/main.cpp similarity index 100% rename from khexedit/main.cc rename to khexedit/main.cpp diff --git a/khexedit/optiondialog.cc b/khexedit/optiondialog.cpp similarity index 100% rename from khexedit/optiondialog.cc rename to khexedit/optiondialog.cpp diff --git a/khexedit/printdialogpage.cc b/khexedit/printdialogpage.cpp similarity index 100% rename from khexedit/printdialogpage.cc rename to khexedit/printdialogpage.cpp diff --git a/khexedit/searchbar.cc b/khexedit/searchbar.cpp similarity index 100% rename from khexedit/searchbar.cc rename to khexedit/searchbar.cpp diff --git a/khexedit/statusbarprogress.cc b/khexedit/statusbarprogress.cpp similarity index 100% rename from khexedit/statusbarprogress.cc rename to khexedit/statusbarprogress.cpp diff --git a/khexedit/stringdialog.cc b/khexedit/stringdialog.cpp similarity index 100% rename from khexedit/stringdialog.cc rename to khexedit/stringdialog.cpp diff --git a/khexedit/toplevel.cc b/khexedit/toplevel.cpp similarity index 100% rename from khexedit/toplevel.cc rename to khexedit/toplevel.cpp diff --git a/klaptopdaemon/CMakeLists.txt b/klaptopdaemon/CMakeLists.txt index b7b4d72..6ce141b 100644 --- a/klaptopdaemon/CMakeLists.txt +++ b/klaptopdaemon/CMakeLists.txt @@ -71,7 +71,7 @@ tde_add_kpart( kcm_laptop AUTOMOC tde_add_kpart( kded_klaptopdaemon AUTOMOC SOURCES laptop_daemon.cpp kpcmcia.cpp - xautolock.cc kpcmciainfo.cpp daemondock.cpp + xautolock.cpp kpcmciainfo.cpp daemondock.cpp xautolock_diy.c xautolock_engine.c laptop_daemon.skel LINK tdeio-shared kcmlaptop-shared diff --git a/klaptopdaemon/Makefile.am b/klaptopdaemon/Makefile.am index da40ae6..5e875ed 100644 --- a/klaptopdaemon/Makefile.am +++ b/klaptopdaemon/Makefile.am @@ -7,7 +7,7 @@ libkcmlaptop_la_SOURCES = portable.cpp smapidev.c daemon_state.cpp wake_laptop.c libkcmlaptop_la_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor libkcmlaptop_la_LIBADD = $(LIB_TDEUI) -MESSAGE_SOURCES = laptop_daemon.cpp kpcmcia.cpp xautolock.cc kpcmciainfo.cpp daemondock.cpp xautolock_diy.c xautolock_engine.c +MESSAGE_SOURCES = laptop_daemon.cpp kpcmcia.cpp xautolock.cpp kpcmciainfo.cpp daemondock.cpp xautolock_diy.c xautolock_engine.c kded_klaptopdaemon_la_SOURCES = $(MESSAGE_SOURCES) laptop_daemon.skel kded_klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version -lXtst $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kded_klaptopdaemon_la_LIBADD = $(LIB_TDEUI) $(LIB_XSS) libkcmlaptop.la diff --git a/klaptopdaemon/xautolock.cc b/klaptopdaemon/xautolock.cpp similarity index 100% rename from klaptopdaemon/xautolock.cc rename to klaptopdaemon/xautolock.cpp diff --git a/kregexpeditor/CMakeLists.txt b/kregexpeditor/CMakeLists.txt index 6a6fe75..28da975 100644 --- a/kregexpeditor/CMakeLists.txt +++ b/kregexpeditor/CMakeLists.txt @@ -65,7 +65,7 @@ tde_add_library( kregexpeditorcommon SHARED AUTOMOC scrollededitorwindow.cpp compoundwidget.cpp singlecontainerwidget.cpp widgetfactory.cpp dcbutton.cpp gen_qregexplexer.cpp - gen_qregexpparser.cc charselector.cpp + gen_qregexpparser.cpp charselector.cpp lookaheadregexp.cpp lookaheadwidget.cpp regexp.cpp infopage.cpp kregexpeditorprivate.cpp compoundregexp.cpp diff --git a/kregexpeditor/Makefile.am b/kregexpeditor/Makefile.am index d21c7a8..ceda35b 100644 --- a/kregexpeditor/Makefile.am +++ b/kregexpeditor/Makefile.am @@ -21,7 +21,7 @@ libkregexpeditorcommon_la_SOURCES = \ repeatwidget.cpp characterswidget.cpp altnwidget.cpp limitedcharlineedit.cpp textregexp.cpp textrangeregexp.cpp \ concregexp.cpp altnregexp.cpp positionregexp.cpp dotregexp.cpp repeatregexp.cpp textwidget.cpp \ selectablelineedit.cpp multicontainerwidget.cpp scrollededitorwindow.cpp compoundwidget.cpp \ - singlecontainerwidget.cpp widgetfactory.cpp dcbutton.cpp gen_qregexplexer.cpp gen_qregexpparser.cc \ + singlecontainerwidget.cpp widgetfactory.cpp dcbutton.cpp gen_qregexplexer.cpp gen_qregexpparser.cpp \ charselector.cpp lookaheadregexp.cpp lookaheadwidget.cpp regexp.cpp infopage.cpp kregexpeditorprivate.cpp \ compoundregexp.cpp auxbuttons.cpp myfontmetrics.cpp regexpbuttons.cpp userdefinedregexps.cpp verifier.cpp \ verifybuttons.cpp errormap.cpp qtregexphighlighter.cpp regexpconverter.cpp qtregexpconverter.cpp \ @@ -58,7 +58,7 @@ xdg_apps_DATA = kregexpeditor.desktop .PHONY: parser parser: cd $(srcdir) && flex -Pqregexp -ogen_qregexplexer.cpp qregexpparser.l - cd $(srcdir) && bison -d -p qregexp -o gen_qregexpparser.cc qregexpparser.y + cd $(srcdir) && bison -d -p qregexp -o gen_qregexpparser.cpp qregexpparser.y messages: perl extractrc-from-regexp `find . -name "*.regexp"` > predefined-regexps.cpp diff --git a/kregexpeditor/gen_qregexplexer.cpp b/kregexpeditor/gen_qregexplexer.cpp index b943814..172dd8e 100644 --- a/kregexpeditor/gen_qregexplexer.cpp +++ b/kregexpeditor/gen_qregexplexer.cpp @@ -453,7 +453,7 @@ char *yytext; #line 21 "qregexpparser.l" #include #include "textrangeregexp.h" - #include "gen_qregexpparser.hh" + #include "gen_qregexpparser.h" #ifdef TQT_ONLY #include "compat.h" #endif diff --git a/kregexpeditor/gen_qregexpparser.cc b/kregexpeditor/gen_qregexpparser.cpp similarity index 99% rename from kregexpeditor/gen_qregexpparser.cc rename to kregexpeditor/gen_qregexpparser.cpp index 4fdefbc..3d3a432 100644 --- a/kregexpeditor/gen_qregexpparser.cc +++ b/kregexpeditor/gen_qregexpparser.cpp @@ -155,7 +155,7 @@ typedef union { char ch; } yystype; /* Line 193 of /usr/share/bison/yacc.c. */ -#line 159 "gen_qregexpparser.cc" +#line 159 "gen_qregexpparser.cpp" # define YYSTYPE yystype # define YYSTYPE_IS_TRIVIAL 1 #endif @@ -176,7 +176,7 @@ typedef struct yyltype /* Line 213 of /usr/share/bison/yacc.c. */ -#line 180 "gen_qregexpparser.cc" +#line 180 "gen_qregexpparser.cpp" #if ! defined (yyoverflow) || YYERROR_VERBOSE @@ -1205,7 +1205,7 @@ yyreduce: } /* Line 1016 of /usr/share/bison/yacc.c. */ -#line 1209 "gen_qregexpparser.cc" +#line 1209 "gen_qregexpparser.cpp" yyvsp -= yylen; yyssp -= yylen; diff --git a/kregexpeditor/gen_qregexpparser.hh b/kregexpeditor/gen_qregexpparser.h similarity index 98% rename from kregexpeditor/gen_qregexpparser.hh rename to kregexpeditor/gen_qregexpparser.h index 9e75892..2916701 100644 --- a/kregexpeditor/gen_qregexpparser.hh +++ b/kregexpeditor/gen_qregexpparser.h @@ -82,7 +82,7 @@ typedef union { char ch; } yystype; /* Line 1281 of /usr/share/bison/yacc.c. */ -#line 86 "gen_qregexpparser.hh" +#line 86 "gen_qregexpparser.h" # define YYSTYPE yystype #endif diff --git a/kregexpeditor/qregexpparser.l b/kregexpeditor/qregexpparser.l index 4fb90cc..8831bb6 100644 --- a/kregexpeditor/qregexpparser.l +++ b/kregexpeditor/qregexpparser.l @@ -20,7 +20,7 @@ %{ #include #include "textrangeregexp.h" - #include "gen_qregexpparser.hh" + #include "gen_qregexpparser.h" #ifdef QT_ONLY #include "compat.h" #endif diff --git a/kregexpeditor/qt-only/compile b/kregexpeditor/qt-only/compile index 61c1328..b2510bc 100755 --- a/kregexpeditor/qt-only/compile +++ b/kregexpeditor/qt-only/compile @@ -3,7 +3,7 @@ ln -s ../*.{cpp,h,y,l} . ln -s ../{KMultiFormListBox,KWidgetStreamer}/*.{cpp,h} . ln -s $KDESRC/tdelibs/interfaces/kregexpeditor/kregexpeditorinterface.h . -ln -s gen_qregexpparser.cc gen_qregexpparser.cpp +ln -s gen_qregexpparser.cpp gen_qregexpparser.cpp touch unistd.h mkdir icons cp ../picts/* icons @@ -13,7 +13,7 @@ mkdir predefined/General cp ../predefined/General/*.regexp predefined/General flex -Pqregexp -ogen_qregexplexer.cpp qregexpparser.l -bison -d -p qregexp -o gen_qregexpparser.cc qregexpparser.y +bison -d -p qregexp -o gen_qregexpparser.cpp qregexpparser.y mkdir manual cd manual diff --git a/kregexpeditor/qt-only/qt-only.pro b/kregexpeditor/qt-only/qt-only.pro index 536c98b..aad7f07 100644 --- a/kregexpeditor/qt-only/qt-only.pro +++ b/kregexpeditor/qt-only/qt-only.pro @@ -28,7 +28,7 @@ HEADERS += altnregexp.h \ editorwindow.h \ emacsregexpconverter.h \ errormap.h \ - gen_qregexpparser.hh \ + gen_qregexpparser.h \ indexWindow.h \ infopage.h \ tdemultiformlistbox-multivisible.h \