Skip to content

Commit

Permalink
remove almost every function in qucs
Browse files Browse the repository at this point in the history
Detail:
remove most function impl in
qucs_actions.cpp, qucs_init.cpp, qucs.cpp main.cpp

cleanup main, remove QucsSettings struct
cleanup function in main that related to print

disable build of all components
disable build of all diagrams
disable build of all painting
disable build of some dialog which use QucsSetting
  • Loading branch information
yodalee committed Apr 14, 2015
1 parent 45cfdaa commit a7ca430
Show file tree
Hide file tree
Showing 14 changed files with 54 additions and 3,813 deletions.
38 changes: 11 additions & 27 deletions qucs/qucs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -97,53 +97,37 @@ ENDIF(WIN32)
ADD_DEFINITIONS(${QT_DEFINITIONS})

#ADD_SUBDIRECTORY( bitmaps ) -> added as resources
ADD_SUBDIRECTORY( components )
ADD_SUBDIRECTORY( diagrams )
#ADD_SUBDIRECTORY( components )
#ADD_SUBDIRECTORY( diagrams )
ADD_SUBDIRECTORY( dialogs )
ADD_SUBDIRECTORY( octave )
ADD_SUBDIRECTORY( python )
ADD_SUBDIRECTORY( paintings )
#ADD_SUBDIRECTORY( octave )
#ADD_SUBDIRECTORY( python )
#ADD_SUBDIRECTORY( paintings )

SET(QUCS_SRCS
element.cpp octave_window.cpp qucsdoc.cpp
textdoc.cpp main.cpp schematic.cpp
mnemo.cpp qucs.cpp viewpainter.cpp
module.cpp schematic_element.cpp wire.cpp
mouseactions.cpp qucs_actions.cpp schematic_file.cpp
wirelabel.cpp node.cpp qucs_init.cpp
syntax.cpp misc.cpp messagedock.cpp
imagewriter.cpp printerwriter.cpp projectView.cpp
qucsdoc.cpp textdoc.cpp main.cpp
mnemo.cpp qucs.cpp qucs_actions.cpp
qucs_init.cpp
syntax.cpp misc.cpp
projectView.cpp
)

SET(QUCS_HDRS
element.h
main.h
messagedock.h
misc.h
mnemo.h
module.h
mouseactions.h
node.h
octave_window.h
qucs.h
qucsdoc.h
schematic.h
syntax.h
textdoc.h
viewpainter.h
wire.h
wirelabel.h
)

#
# files that have Q_OBJECT need to be MOC'ed
#
SET(QUCS_MOC_HDRS
octave_window.h
qucs.h
schematic.h
textdoc.h
messagedock.h
)

#
Expand Down Expand Up @@ -224,7 +208,7 @@ ADD_EXECUTABLE( qucs MACOSX_BUNDLE WIN32
#
# Tell CMake which libraries we need to link our executable against.
#
TARGET_LINK_LIBRARIES( qucs components diagrams dialogs paintings ${QT_LIBRARIES} )
TARGET_LINK_LIBRARIES( qucs dialogs ${QT_LIBRARIES} )

#
# Prepare the installation
Expand Down
20 changes: 9 additions & 11 deletions qucs/qucs/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
# Boston, MA 02110-1301, USA.
#

SUBDIRS = components diagrams paintings dialogs octave
SUBDIRS = dialogs octave
# SUBDIRS = components diagrams paintings dialogs octave

if COND_WIN32
bin_SCRIPTS = qucsdigi.bat qucsveri.bat qucsdigilib.bat
Expand All @@ -32,15 +33,14 @@ endif

bin_PROGRAMS = qucs

MOCHEADERS = qucs.h schematic.h textdoc.h octave_window.h messagedock.h
MOCHEADERS = qucs.h textdoc.h
MOCFILES = $(MOCHEADERS:.h=.moc.cpp)

qucs_SOURCES = node.cpp element.cpp qucsdoc.cpp wire.cpp mouseactions.cpp \
qucs.cpp main.cpp wirelabel.cpp qucs_init.cpp qucs_actions.cpp \
viewpainter.cpp mnemo.cpp schematic.cpp schematic_element.cpp textdoc.cpp \
schematic_file.cpp syntax.cpp module.cpp octave_window.cpp qrc_qucs.cpp \
messagedock.cpp misc.cpp imagewriter.cpp printerwriter.cpp \
projectView.cpp
qucs_SOURCES = qucsdoc.cpp \
qucs.cpp main.cpp qucs_init.cpp qucs_actions.cpp \
mnemo.cpp textdoc.cpp \
syntax.cpp qrc_qucs.cpp \
misc.cpp projectView.cpp

qrc_qucs.cpp: qucs.qrc
$(RCC) -o $@ $<
Expand All @@ -49,9 +49,7 @@ nodist_qucs_SOURCES = $(MOCFILES)

AM_CPPFLAGS = $(X11_INCLUDES) $(QT_INCLUDES) -I$(top_srcdir)/qucs-lib
qucs_LDFLAGS = $(X11_LDFLAGS) $(QT_LDFLAGS)
qucs_LDADD = components/libcomponents.a diagrams/libdiagrams.a \
paintings/libpaintings.a dialogs/libdialogs.a \
$(X11_LIBS) $(QT_LIBS)
qucs_LDADD = dialogs/libdialogs.a $(X11_LIBS) $(QT_LIBS)

noinst_HEADERS = $(MOCHEADERS) main.h wire.h qucsdoc.h element.h node.h \
wirelabel.h viewpainter.h mnemo.h mouseactions.h syntax.h module.h misc.h
Expand Down
4 changes: 2 additions & 2 deletions qucs/qucs/diagrams/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ MOCHEADERS = diagramdialog.h markerdialog.h
MOCFILES = $(MOCHEADERS:.h=.moc.cpp)

libdiagrams_a_SOURCES = tabdiagram.cpp smithdiagram.cpp rectdiagram.cpp \
polardiagram.cpp graph.cpp diagramdialog.cpp diagram.cpp marker.cpp \
markerdialog.cpp psdiagram.cpp rect3ddiagram.cpp curvediagram.cpp \
polardiagram.cpp graph.cpp \
markerdialog.cpp psdiagram.cpp rect3ddiagram.cpp \
timingdiagram.cpp truthdiagram.cpp

nodist_libdiagrams_a_SOURCES = $(MOCFILES)
Expand Down
29 changes: 6 additions & 23 deletions qucs/qucs/dialogs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,52 +10,35 @@ SET(DIALOGS_HDRS
changedialog.h
digisettingsdialog.h
exportdialog.h
importdialog.h
labeldialog.h
librarydialog.h
loaddialog.h
matchdialog.h
newprojdialog.h
packagedialog.h
qucssettingsdialog.h
savedialog.h
searchdialog.h
settingsdialog.h
simmessage.h
sweepdialog.h
vasettingsdialog.h
)



SET(DIALOGS_SRCS
changedialog.cpp packagedialog.cpp vasettingsdialog.cpp
digisettingsdialog.cpp qucssettingsdialog.cpp
importdialog.cpp savedialog.cpp labeldialog.cpp
searchdialog.cpp librarydialog.cpp settingsdialog.cpp
matchdialog.cpp simmessage.cpp newprojdialog.cpp
sweepdialog.cpp exportdialog.cpp loaddialog.cpp
changedialog.cpp
digisettingsdialog.cpp
savedialog.cpp labeldialog.cpp
searchdialog.cpp settingsdialog.cpp
newprojdialog.cpp
exportdialog.cpp loaddialog.cpp
)

SET(DIALOGS_MOC_HDRS
changedialog.h
digisettingsdialog.h
exportdialog.h
importdialog.h
labeldialog.h
librarydialog.h
loaddialog.h
matchdialog.h
newprojdialog.h
packagedialog.h
qucssettingsdialog.h
savedialog.h
searchdialog.h
settingsdialog.h
simmessage.h
sweepdialog.h
sweepdialog.h
vasettingsdialog.h
)

SET(DIALOGS_UIC_HDRS
Expand Down
15 changes: 6 additions & 9 deletions qucs/qucs/dialogs/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,9 @@

noinst_LIBRARIES = libdialogs.a

MOCHEADERS = settingsdialog.h simmessage.h qucssettingsdialog.h \
labeldialog.h changedialog.h matchdialog.h digisettingsdialog.h \
sweepdialog.h searchdialog.h librarydialog.h importdialog.h \
packagedialog.h savedialog.h vasettingsdialog.h \
MOCHEADERS = settingsdialog.h \
labeldialog.h changedialog.h digisettingsdialog.h \
searchdialog.h savedialog.h \
exportdialog.h loaddialog.h newprojdialog.h

MOCFILES = $(MOCHEADERS:.h=.moc.cpp)
Expand All @@ -37,11 +36,9 @@ UICFILES = ui_searchdialog.h
BUILT_SOURCES = $(UICFILES)

libdialogs_a_SOURCES = settingsdialog.cpp newprojdialog.cpp \
simmessage.cpp qucssettingsdialog.cpp labeldialog.cpp changedialog.cpp \
matchdialog.cpp sweepdialog.cpp digisettingsdialog.cpp searchdialog.cpp \
librarydialog.cpp importdialog.cpp packagedialog.cpp \
savedialog.cpp vasettingsdialog.cpp \
exportdialog.cpp loaddialog.cpp
labeldialog.cpp changedialog.cpp \
digisettingsdialog.cpp searchdialog.cpp \
savedialog.cpp exportdialog.cpp loaddialog.cpp

nodist_libdialogs_a_SOURCES = $(MOCFILES)

Expand Down

0 comments on commit a7ca430

Please sign in to comment.