diff --git a/.gitignore b/.gitignore index 1bb2dccf..3930fedd 100644 --- a/.gitignore +++ b/.gitignore @@ -28,7 +28,7 @@ examples/windowsmanifest/windowsmanifest.exe examples/uidesigner/uidesigner examples/uidesigner/uidesigner.exe examples/libraries/extras-scintillaedit/extras-scintillaedit -examples/libraries/qt-qprintsupport/qt-qprintsupport +examples/libraries/qt-printsupport/qt-printsupport examples/libraries/restricted-extras-qscintilla/restricted-extras-qscintilla # android temporary build files diff --git a/cmd/genbindings/config-libraries.go b/cmd/genbindings/config-libraries.go index c8e9ecc7..2966d9e5 100644 --- a/cmd/genbindings/config-libraries.go +++ b/cmd/genbindings/config-libraries.go @@ -23,7 +23,7 @@ func ProcessLibraries(clangBin, outDir, extraLibsDir string) { ) generate( - "qt/qprintsupport", + "qt/printsupport", []string{ "/usr/include/x86_64-linux-gnu/qt5/QtPrintSupport", }, @@ -78,7 +78,7 @@ func ProcessLibraries(clangBin, outDir, extraLibsDir string) { // Qt 6 QtPrintSupport generate( - "qt6/qprintsupport", + "qt6/printsupport", []string{ "/usr/include/x86_64-linux-gnu/qt6/QtPrintSupport", }, diff --git a/examples/libraries/qt-qprintsupport/main.go b/examples/libraries/qt-printsupport/main.go similarity index 79% rename from examples/libraries/qt-qprintsupport/main.go rename to examples/libraries/qt-printsupport/main.go index 513ba010..77890eec 100644 --- a/examples/libraries/qt-qprintsupport/main.go +++ b/examples/libraries/qt-printsupport/main.go @@ -4,7 +4,7 @@ import ( "os" "github.com/mappu/miqt/qt" - "github.com/mappu/miqt/qt/qprintsupport" + "github.com/mappu/miqt/qt/printsupport" ) func main() { @@ -16,7 +16,7 @@ func main() { btn.OnPressed(func() { - dlg := qprintsupport.NewQPrintDialog3() + dlg := printsupport.NewQPrintDialog3() dlg.OnFinished(func(int) { dlg.DeleteLater() }) diff --git a/qt-restricted-extras/qscintilla/gen_qsciprinter.go b/qt-restricted-extras/qscintilla/gen_qsciprinter.go index fc464c83..6add49e1 100644 --- a/qt-restricted-extras/qscintilla/gen_qsciprinter.go +++ b/qt-restricted-extras/qscintilla/gen_qsciprinter.go @@ -10,14 +10,14 @@ import "C" import ( "github.com/mappu/miqt/qt" - "github.com/mappu/miqt/qt/qprintsupport" + "github.com/mappu/miqt/qt/printsupport" "runtime" "unsafe" ) type QsciPrinter struct { h *C.QsciPrinter - *qprintsupport.QPrinter + *printsupport.QPrinter } func (this *QsciPrinter) cPointer() *C.QsciPrinter { @@ -38,7 +38,7 @@ func newQsciPrinter(h *C.QsciPrinter) *QsciPrinter { if h == nil { return nil } - return &QsciPrinter{h: h, QPrinter: qprintsupport.UnsafeNewQPrinter(unsafe.Pointer(h))} + return &QsciPrinter{h: h, QPrinter: printsupport.UnsafeNewQPrinter(unsafe.Pointer(h))} } func UnsafeNewQsciPrinter(h unsafe.Pointer) *QsciPrinter { @@ -52,7 +52,7 @@ func NewQsciPrinter() *QsciPrinter { } // NewQsciPrinter2 constructs a new QsciPrinter object. -func NewQsciPrinter2(mode qprintsupport.QPrinter__PrinterMode) *QsciPrinter { +func NewQsciPrinter2(mode printsupport.QPrinter__PrinterMode) *QsciPrinter { ret := C.QsciPrinter_new2((C.int)(mode)) return newQsciPrinter(ret) } diff --git a/qt/qprintsupport/cflags.go b/qt/printsupport/cflags.go similarity index 100% rename from qt/qprintsupport/cflags.go rename to qt/printsupport/cflags.go diff --git a/qt/qprintsupport/gen_qabstractprintdialog.cpp b/qt/printsupport/gen_qabstractprintdialog.cpp similarity index 100% rename from qt/qprintsupport/gen_qabstractprintdialog.cpp rename to qt/printsupport/gen_qabstractprintdialog.cpp diff --git a/qt/qprintsupport/gen_qabstractprintdialog.go b/qt/printsupport/gen_qabstractprintdialog.go similarity index 99% rename from qt/qprintsupport/gen_qabstractprintdialog.go rename to qt/printsupport/gen_qabstractprintdialog.go index ce366bb5..fb0f3d05 100644 --- a/qt/qprintsupport/gen_qabstractprintdialog.go +++ b/qt/printsupport/gen_qabstractprintdialog.go @@ -1,4 +1,4 @@ -package qprintsupport +package printsupport /* diff --git a/qt/qprintsupport/gen_qabstractprintdialog.h b/qt/printsupport/gen_qabstractprintdialog.h similarity index 100% rename from qt/qprintsupport/gen_qabstractprintdialog.h rename to qt/printsupport/gen_qabstractprintdialog.h diff --git a/qt/qprintsupport/gen_qpagesetupdialog.cpp b/qt/printsupport/gen_qpagesetupdialog.cpp similarity index 100% rename from qt/qprintsupport/gen_qpagesetupdialog.cpp rename to qt/printsupport/gen_qpagesetupdialog.cpp diff --git a/qt/qprintsupport/gen_qpagesetupdialog.go b/qt/printsupport/gen_qpagesetupdialog.go similarity index 99% rename from qt/qprintsupport/gen_qpagesetupdialog.go rename to qt/printsupport/gen_qpagesetupdialog.go index 49ece7e8..6c36f179 100644 --- a/qt/qprintsupport/gen_qpagesetupdialog.go +++ b/qt/printsupport/gen_qpagesetupdialog.go @@ -1,4 +1,4 @@ -package qprintsupport +package printsupport /* diff --git a/qt/qprintsupport/gen_qpagesetupdialog.h b/qt/printsupport/gen_qpagesetupdialog.h similarity index 100% rename from qt/qprintsupport/gen_qpagesetupdialog.h rename to qt/printsupport/gen_qpagesetupdialog.h diff --git a/qt/qprintsupport/gen_qprintdialog.cpp b/qt/printsupport/gen_qprintdialog.cpp similarity index 100% rename from qt/qprintsupport/gen_qprintdialog.cpp rename to qt/printsupport/gen_qprintdialog.cpp diff --git a/qt/qprintsupport/gen_qprintdialog.go b/qt/printsupport/gen_qprintdialog.go similarity index 99% rename from qt/qprintsupport/gen_qprintdialog.go rename to qt/printsupport/gen_qprintdialog.go index 8af4f37c..df6623e9 100644 --- a/qt/qprintsupport/gen_qprintdialog.go +++ b/qt/printsupport/gen_qprintdialog.go @@ -1,4 +1,4 @@ -package qprintsupport +package printsupport /* diff --git a/qt/qprintsupport/gen_qprintdialog.h b/qt/printsupport/gen_qprintdialog.h similarity index 100% rename from qt/qprintsupport/gen_qprintdialog.h rename to qt/printsupport/gen_qprintdialog.h diff --git a/qt/qprintsupport/gen_qprintengine.cpp b/qt/printsupport/gen_qprintengine.cpp similarity index 100% rename from qt/qprintsupport/gen_qprintengine.cpp rename to qt/printsupport/gen_qprintengine.cpp diff --git a/qt/qprintsupport/gen_qprintengine.go b/qt/printsupport/gen_qprintengine.go similarity index 99% rename from qt/qprintsupport/gen_qprintengine.go rename to qt/printsupport/gen_qprintengine.go index 490aafd7..b1156d11 100644 --- a/qt/qprintsupport/gen_qprintengine.go +++ b/qt/printsupport/gen_qprintengine.go @@ -1,4 +1,4 @@ -package qprintsupport +package printsupport /* diff --git a/qt/qprintsupport/gen_qprintengine.h b/qt/printsupport/gen_qprintengine.h similarity index 100% rename from qt/qprintsupport/gen_qprintengine.h rename to qt/printsupport/gen_qprintengine.h diff --git a/qt/qprintsupport/gen_qprinter.cpp b/qt/printsupport/gen_qprinter.cpp similarity index 100% rename from qt/qprintsupport/gen_qprinter.cpp rename to qt/printsupport/gen_qprinter.cpp diff --git a/qt/qprintsupport/gen_qprinter.go b/qt/printsupport/gen_qprinter.go similarity index 99% rename from qt/qprintsupport/gen_qprinter.go rename to qt/printsupport/gen_qprinter.go index 314632bf..1d844c4b 100644 --- a/qt/qprintsupport/gen_qprinter.go +++ b/qt/printsupport/gen_qprinter.go @@ -1,4 +1,4 @@ -package qprintsupport +package printsupport /* diff --git a/qt/qprintsupport/gen_qprinter.h b/qt/printsupport/gen_qprinter.h similarity index 100% rename from qt/qprintsupport/gen_qprinter.h rename to qt/printsupport/gen_qprinter.h diff --git a/qt/qprintsupport/gen_qprinterinfo.cpp b/qt/printsupport/gen_qprinterinfo.cpp similarity index 100% rename from qt/qprintsupport/gen_qprinterinfo.cpp rename to qt/printsupport/gen_qprinterinfo.cpp diff --git a/qt/qprintsupport/gen_qprinterinfo.go b/qt/printsupport/gen_qprinterinfo.go similarity index 99% rename from qt/qprintsupport/gen_qprinterinfo.go rename to qt/printsupport/gen_qprinterinfo.go index 5520335b..9299e318 100644 --- a/qt/qprintsupport/gen_qprinterinfo.go +++ b/qt/printsupport/gen_qprinterinfo.go @@ -1,4 +1,4 @@ -package qprintsupport +package printsupport /* diff --git a/qt/qprintsupport/gen_qprinterinfo.h b/qt/printsupport/gen_qprinterinfo.h similarity index 100% rename from qt/qprintsupport/gen_qprinterinfo.h rename to qt/printsupport/gen_qprinterinfo.h diff --git a/qt/qprintsupport/gen_qprintpreviewdialog.cpp b/qt/printsupport/gen_qprintpreviewdialog.cpp similarity index 100% rename from qt/qprintsupport/gen_qprintpreviewdialog.cpp rename to qt/printsupport/gen_qprintpreviewdialog.cpp diff --git a/qt/qprintsupport/gen_qprintpreviewdialog.go b/qt/printsupport/gen_qprintpreviewdialog.go similarity index 99% rename from qt/qprintsupport/gen_qprintpreviewdialog.go rename to qt/printsupport/gen_qprintpreviewdialog.go index ce0534f1..a2517195 100644 --- a/qt/qprintsupport/gen_qprintpreviewdialog.go +++ b/qt/printsupport/gen_qprintpreviewdialog.go @@ -1,4 +1,4 @@ -package qprintsupport +package printsupport /* diff --git a/qt/qprintsupport/gen_qprintpreviewdialog.h b/qt/printsupport/gen_qprintpreviewdialog.h similarity index 100% rename from qt/qprintsupport/gen_qprintpreviewdialog.h rename to qt/printsupport/gen_qprintpreviewdialog.h diff --git a/qt/qprintsupport/gen_qprintpreviewwidget.cpp b/qt/printsupport/gen_qprintpreviewwidget.cpp similarity index 100% rename from qt/qprintsupport/gen_qprintpreviewwidget.cpp rename to qt/printsupport/gen_qprintpreviewwidget.cpp diff --git a/qt/qprintsupport/gen_qprintpreviewwidget.go b/qt/printsupport/gen_qprintpreviewwidget.go similarity index 99% rename from qt/qprintsupport/gen_qprintpreviewwidget.go rename to qt/printsupport/gen_qprintpreviewwidget.go index 3ad0e007..dae5d9eb 100644 --- a/qt/qprintsupport/gen_qprintpreviewwidget.go +++ b/qt/printsupport/gen_qprintpreviewwidget.go @@ -1,4 +1,4 @@ -package qprintsupport +package printsupport /* diff --git a/qt/qprintsupport/gen_qprintpreviewwidget.h b/qt/printsupport/gen_qprintpreviewwidget.h similarity index 100% rename from qt/qprintsupport/gen_qprintpreviewwidget.h rename to qt/printsupport/gen_qprintpreviewwidget.h diff --git a/qt6/qprintsupport/cflags.go b/qt6/printsupport/cflags.go similarity index 100% rename from qt6/qprintsupport/cflags.go rename to qt6/printsupport/cflags.go diff --git a/qt6/qprintsupport/gen_qabstractprintdialog.cpp b/qt6/printsupport/gen_qabstractprintdialog.cpp similarity index 100% rename from qt6/qprintsupport/gen_qabstractprintdialog.cpp rename to qt6/printsupport/gen_qabstractprintdialog.cpp diff --git a/qt6/qprintsupport/gen_qabstractprintdialog.go b/qt6/printsupport/gen_qabstractprintdialog.go similarity index 99% rename from qt6/qprintsupport/gen_qabstractprintdialog.go rename to qt6/printsupport/gen_qabstractprintdialog.go index e288cb4c..bfe11e73 100644 --- a/qt6/qprintsupport/gen_qabstractprintdialog.go +++ b/qt6/printsupport/gen_qabstractprintdialog.go @@ -1,4 +1,4 @@ -package qprintsupport +package printsupport /* diff --git a/qt6/qprintsupport/gen_qabstractprintdialog.h b/qt6/printsupport/gen_qabstractprintdialog.h similarity index 100% rename from qt6/qprintsupport/gen_qabstractprintdialog.h rename to qt6/printsupport/gen_qabstractprintdialog.h diff --git a/qt6/qprintsupport/gen_qpagesetupdialog.cpp b/qt6/printsupport/gen_qpagesetupdialog.cpp similarity index 100% rename from qt6/qprintsupport/gen_qpagesetupdialog.cpp rename to qt6/printsupport/gen_qpagesetupdialog.cpp diff --git a/qt6/qprintsupport/gen_qpagesetupdialog.go b/qt6/printsupport/gen_qpagesetupdialog.go similarity index 99% rename from qt6/qprintsupport/gen_qpagesetupdialog.go rename to qt6/printsupport/gen_qpagesetupdialog.go index c7507c07..7c40c1b5 100644 --- a/qt6/qprintsupport/gen_qpagesetupdialog.go +++ b/qt6/printsupport/gen_qpagesetupdialog.go @@ -1,4 +1,4 @@ -package qprintsupport +package printsupport /* diff --git a/qt6/qprintsupport/gen_qpagesetupdialog.h b/qt6/printsupport/gen_qpagesetupdialog.h similarity index 100% rename from qt6/qprintsupport/gen_qpagesetupdialog.h rename to qt6/printsupport/gen_qpagesetupdialog.h diff --git a/qt6/qprintsupport/gen_qprintdialog.cpp b/qt6/printsupport/gen_qprintdialog.cpp similarity index 100% rename from qt6/qprintsupport/gen_qprintdialog.cpp rename to qt6/printsupport/gen_qprintdialog.cpp diff --git a/qt6/qprintsupport/gen_qprintdialog.go b/qt6/printsupport/gen_qprintdialog.go similarity index 99% rename from qt6/qprintsupport/gen_qprintdialog.go rename to qt6/printsupport/gen_qprintdialog.go index f1f8424c..e95f257d 100644 --- a/qt6/qprintsupport/gen_qprintdialog.go +++ b/qt6/printsupport/gen_qprintdialog.go @@ -1,4 +1,4 @@ -package qprintsupport +package printsupport /* diff --git a/qt6/qprintsupport/gen_qprintdialog.h b/qt6/printsupport/gen_qprintdialog.h similarity index 100% rename from qt6/qprintsupport/gen_qprintdialog.h rename to qt6/printsupport/gen_qprintdialog.h diff --git a/qt6/qprintsupport/gen_qprintengine.cpp b/qt6/printsupport/gen_qprintengine.cpp similarity index 100% rename from qt6/qprintsupport/gen_qprintengine.cpp rename to qt6/printsupport/gen_qprintengine.cpp diff --git a/qt6/qprintsupport/gen_qprintengine.go b/qt6/printsupport/gen_qprintengine.go similarity index 99% rename from qt6/qprintsupport/gen_qprintengine.go rename to qt6/printsupport/gen_qprintengine.go index e5145547..36f6049d 100644 --- a/qt6/qprintsupport/gen_qprintengine.go +++ b/qt6/printsupport/gen_qprintengine.go @@ -1,4 +1,4 @@ -package qprintsupport +package printsupport /* diff --git a/qt6/qprintsupport/gen_qprintengine.h b/qt6/printsupport/gen_qprintengine.h similarity index 100% rename from qt6/qprintsupport/gen_qprintengine.h rename to qt6/printsupport/gen_qprintengine.h diff --git a/qt6/qprintsupport/gen_qprinter.cpp b/qt6/printsupport/gen_qprinter.cpp similarity index 100% rename from qt6/qprintsupport/gen_qprinter.cpp rename to qt6/printsupport/gen_qprinter.cpp diff --git a/qt6/qprintsupport/gen_qprinter.go b/qt6/printsupport/gen_qprinter.go similarity index 99% rename from qt6/qprintsupport/gen_qprinter.go rename to qt6/printsupport/gen_qprinter.go index 87e2a4a5..34e7d972 100644 --- a/qt6/qprintsupport/gen_qprinter.go +++ b/qt6/printsupport/gen_qprinter.go @@ -1,4 +1,4 @@ -package qprintsupport +package printsupport /* diff --git a/qt6/qprintsupport/gen_qprinter.h b/qt6/printsupport/gen_qprinter.h similarity index 100% rename from qt6/qprintsupport/gen_qprinter.h rename to qt6/printsupport/gen_qprinter.h diff --git a/qt6/qprintsupport/gen_qprinterinfo.cpp b/qt6/printsupport/gen_qprinterinfo.cpp similarity index 100% rename from qt6/qprintsupport/gen_qprinterinfo.cpp rename to qt6/printsupport/gen_qprinterinfo.cpp diff --git a/qt6/qprintsupport/gen_qprinterinfo.go b/qt6/printsupport/gen_qprinterinfo.go similarity index 99% rename from qt6/qprintsupport/gen_qprinterinfo.go rename to qt6/printsupport/gen_qprinterinfo.go index db0b7325..25b1f049 100644 --- a/qt6/qprintsupport/gen_qprinterinfo.go +++ b/qt6/printsupport/gen_qprinterinfo.go @@ -1,4 +1,4 @@ -package qprintsupport +package printsupport /* diff --git a/qt6/qprintsupport/gen_qprinterinfo.h b/qt6/printsupport/gen_qprinterinfo.h similarity index 100% rename from qt6/qprintsupport/gen_qprinterinfo.h rename to qt6/printsupport/gen_qprinterinfo.h diff --git a/qt6/qprintsupport/gen_qprintpreviewdialog.cpp b/qt6/printsupport/gen_qprintpreviewdialog.cpp similarity index 100% rename from qt6/qprintsupport/gen_qprintpreviewdialog.cpp rename to qt6/printsupport/gen_qprintpreviewdialog.cpp diff --git a/qt6/qprintsupport/gen_qprintpreviewdialog.go b/qt6/printsupport/gen_qprintpreviewdialog.go similarity index 99% rename from qt6/qprintsupport/gen_qprintpreviewdialog.go rename to qt6/printsupport/gen_qprintpreviewdialog.go index bb04f49b..8f7c6405 100644 --- a/qt6/qprintsupport/gen_qprintpreviewdialog.go +++ b/qt6/printsupport/gen_qprintpreviewdialog.go @@ -1,4 +1,4 @@ -package qprintsupport +package printsupport /* diff --git a/qt6/qprintsupport/gen_qprintpreviewdialog.h b/qt6/printsupport/gen_qprintpreviewdialog.h similarity index 100% rename from qt6/qprintsupport/gen_qprintpreviewdialog.h rename to qt6/printsupport/gen_qprintpreviewdialog.h diff --git a/qt6/qprintsupport/gen_qprintpreviewwidget.cpp b/qt6/printsupport/gen_qprintpreviewwidget.cpp similarity index 100% rename from qt6/qprintsupport/gen_qprintpreviewwidget.cpp rename to qt6/printsupport/gen_qprintpreviewwidget.cpp diff --git a/qt6/qprintsupport/gen_qprintpreviewwidget.go b/qt6/printsupport/gen_qprintpreviewwidget.go similarity index 99% rename from qt6/qprintsupport/gen_qprintpreviewwidget.go rename to qt6/printsupport/gen_qprintpreviewwidget.go index f8e659be..088d5ff5 100644 --- a/qt6/qprintsupport/gen_qprintpreviewwidget.go +++ b/qt6/printsupport/gen_qprintpreviewwidget.go @@ -1,4 +1,4 @@ -package qprintsupport +package printsupport /* diff --git a/qt6/qprintsupport/gen_qprintpreviewwidget.h b/qt6/printsupport/gen_qprintpreviewwidget.h similarity index 100% rename from qt6/qprintsupport/gen_qprintpreviewwidget.h rename to qt6/printsupport/gen_qprintpreviewwidget.h