Commit - bw/opentoonz - 1660e0d6271878a4ce63788238931d0d32bc9f30

    Fix conflicts (Remove license and edition defines and code) (#291)
    
    * Remove license support, and old editions

    

    Previously, old code to support various editions of Toonz, as well as

    license activiation code, was cluttering the repository.

    Support for LINETEST is retained.

    

    * fix conflicts

toonz/sources/colorfx/colorfx.cpp

file modified

+0 -2

toonz/sources/image/pli/pli_io.cpp

file modified

+0 -4

toonz/sources/image/pli/tiio_pli.cpp

file modified

+0 -4

toonz/sources/image/tiio.cpp

file modified

+0 -10

toonz/sources/image/tzl/tiio_tzl.cpp

file modified

+0 -3

toonz/sources/include/toonzqt/dvdialog.h

file modified

+0 -4

toonz/sources/include/toonzqt/licensechecker.h

file removed

-71

toonz/sources/include/toonzqt/styleeditor.h

file modified

+0 -2

toonz/sources/tcleanupper/tcleanupper.cpp

file modified

+0 -12

toonz/sources/tcomposer/tcomposer.cpp

file modified

+0 -44

toonz/sources/tnztools/brushtool.cpp

file modified

+0 -2

toonz/sources/tnztools/edittool.cpp

file modified

+0 -4

toonz/sources/tnztools/filltool.cpp

file modified

+0 -4

toonz/sources/tnztools/fullcolorbrushtool.cpp

file modified

+0 -2

toonz/sources/tnztools/selectiontool.cpp

file modified

+0 -2

toonz/sources/tnztools/vectorselectiontool.cpp

file modified

+0 -2

toonz/sources/toonz/Resources/info.txt

file modified

+1 -11

toonz/sources/toonz/cellselection.cpp

file modified

+2 -14

toonz/sources/toonz/convertpopup.cpp

file modified

+0 -12

toonz/sources/toonz/curveio.cpp

file modified

+0 -12

toonz/sources/toonz/dvitemview.cpp

file modified

+0 -4

toonz/sources/toonz/exportlevelpopup.cpp

file modified

+0 -4

toonz/sources/toonz/exportpanel.cpp

file modified

+5 -20

toonz/sources/toonz/filebrowser.cpp

file modified

+0 -12

toonz/sources/toonz/filebrowserpopup.cpp

file modified

+0 -38

toonz/sources/toonz/filebrowserpopup.h

file modified

+0 -14

toonz/sources/toonz/fileselection.cpp

file modified

+0 -15

toonz/sources/toonz/filmstrip.cpp

file modified

+0 -2

toonz/sources/toonz/filmstripselection.cpp

file modified

+0 -2

toonz/sources/toonz/frameheadgadget.cpp

file modified

+0 -14

toonz/sources/toonz/iocommand.cpp

file modified

+0 -51

toonz/sources/toonz/levelsettingspopup.cpp

file modified

+0 -8

toonz/sources/toonz/licensecontroller.cpp

file removed

-1124

toonz/sources/toonz/licensegui.cpp

file removed

-590

toonz/sources/toonz/licensegui.h

file removed

-115

toonz/sources/toonz/main.cpp

file modified

+2 -131

toonz/sources/toonz/mainwindow.cpp

file modified

+5 -63

toonz/sources/toonz/mainwindow.h

file modified

+0 -16

toonz/sources/toonz/menubar.cpp

file modified

+2 -12

toonz/sources/toonz/outputsettingspopup.cpp

file modified

+0 -14

toonz/sources/toonz/preferencespopup.cpp

file modified

+0 -8

toonz/sources/toonz/previewfxmanager.cpp

file modified

+0 -7

toonz/sources/toonz/rendercommand.cpp

file modified

+0 -98

toonz/sources/toonz/sceneviewercontextmenu.cpp

file modified

+0 -8

toonz/sources/toonz/shortcutpopup.cpp

file modified

+0 -4

toonz/sources/toonz/tab30qt.pri

file modified

+0 -4

toonz/sources/toonz/tapp.cpp

file modified

+0 -4

toonz/sources/toonz/toonz.rc

file modified

+1 -14

toonz/sources/toonz/tpanels.cpp

file modified

+0 -6

toonz/sources/toonz/xshcellviewer.cpp

file modified

+2 -2

toonz/sources/toonz/xshrowviewer.cpp

file modified

+20 -25

toonz/sources/toonzqt/CMakeLists.txt

file modified

+0 -2

toonz/sources/toonzqt/dvdialog.cpp

file modified

+0 -111

toonz/sources/toonzqt/licensechecker.cpp

file removed

-236

toonz/sources/toonzqt/paletteviewer.cpp

file modified

+0 -4

toonz/sources/toonzqt/stageschematicscene.cpp

file modified

+0 -4

toonz/sources/toonzqt/studiopaletteviewer.cpp

file modified

+0 -4

toonz/sources/toonzqt/styleeditor.cpp

file modified

+0 -6

toonz/sources/translations/french/toonz.ts

file modified

+0 -6

toonz/sources/translations/french/toonzqt.ts

file modified

+0 -10

toonz/sources/translations/italian/toonz.ts

file modified

+0 -7

toonz/sources/translations/italian/toonzqt.ts

file modified

+0 -10

toonz/sources/translations/japanese/toonz.ts

file modified

+0 -6

toonz/sources/translations/japanese/toonzqt.ts

file modified

+0 -9

bw / opentoonz

Source Code

1660e0 Fix conflicts (Remove license and edition defines and code) (#291)

64 files Authored by Shinya Kitaoka 8 years ago , Committed by Keisuke Ogaki 8 years ago ,

`1660e0` Fix conflicts (Remove license and edition defines and code) (#291)