Skip to content

Commit

Permalink
部分文本代码改了之后
Browse files Browse the repository at this point in the history
  • Loading branch information
loyolh committed Jul 10, 2018
1 parent 3f52dec commit cc441f7
Show file tree
Hide file tree
Showing 12 changed files with 453 additions and 65 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
/****************************************************************************
** Meta object code from reading C++ file 'dialog.h'
**
** Created by: The Qt Meta Object Compiler version 67 (Qt 5.2.0)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/

#include "../../../vector-editor/src/dialog.h"
#include <QtCore/qbytearray.h>
#include <QtCore/qmetatype.h>
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'dialog.h' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 67
#error "This file was generated using the moc from 5.2.0. It"
#error "cannot be used with the include files from this version of Qt."
#error "(The moc has changed too much.)"
#endif

QT_BEGIN_MOC_NAMESPACE
struct qt_meta_stringdata_Dialog_t {
QByteArrayData data[4];
char stringdata[41];
};
#define QT_MOC_LITERAL(idx, ofs, len) \
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
offsetof(qt_meta_stringdata_Dialog_t, stringdata) + ofs \
- idx * sizeof(QByteArrayData) \
)
static const qt_meta_stringdata_Dialog_t qt_meta_stringdata_Dialog = {
{
QT_MOC_LITERAL(0, 0, 6),
QT_MOC_LITERAL(1, 7, 9),
QT_MOC_LITERAL(2, 17, 0),
QT_MOC_LITERAL(3, 18, 21)
},
"Dialog\0clickMark\0\0on_pushButton_clicked\0"
};
#undef QT_MOC_LITERAL

static const uint qt_meta_data_Dialog[] = {

// content:
7, // revision
0, // classname
0, 0, // classinfo
2, 14, // methods
0, 0, // properties
0, 0, // enums/sets
0, 0, // constructors
0, // flags
1, // signalCount

// signals: name, argc, parameters, tag, flags
1, 2, 24, 2, 0x06,

// slots: name, argc, parameters, tag, flags
3, 0, 29, 2, 0x08,

// signals: parameters
QMetaType::Void, QMetaType::Int, QMetaType::QString, 2, 2,

// slots: parameters
QMetaType::Void,

0 // eod
};

void Dialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
{
if (_c == QMetaObject::InvokeMetaMethod) {
Dialog *_t = static_cast<Dialog *>(_o);
switch (_id) {
case 0: _t->clickMark((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< QString(*)>(_a[2]))); break;
case 1: _t->on_pushButton_clicked(); break;
default: ;
}
} else if (_c == QMetaObject::IndexOfMethod) {
int *result = reinterpret_cast<int *>(_a[0]);
void **func = reinterpret_cast<void **>(_a[1]);
{
typedef void (Dialog::*_t)(int , QString );
if (*reinterpret_cast<_t *>(func) == static_cast<_t>(&Dialog::clickMark)) {
*result = 0;
}
}
}
}

const QMetaObject Dialog::staticMetaObject = {
{ &QDialog::staticMetaObject, qt_meta_stringdata_Dialog.data,
qt_meta_data_Dialog, qt_static_metacall, 0, 0}
};


const QMetaObject *Dialog::metaObject() const
{
return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject;
}

void *Dialog::qt_metacast(const char *_clname)
{
if (!_clname) return 0;
if (!strcmp(_clname, qt_meta_stringdata_Dialog.stringdata))
return static_cast<void*>(const_cast< Dialog*>(this));
return QDialog::qt_metacast(_clname);
}

int Dialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
{
_id = QDialog::qt_metacall(_c, _id, _a);
if (_id < 0)
return _id;
if (_c == QMetaObject::InvokeMetaMethod) {
if (_id < 2)
qt_static_metacall(this, _c, _id, _a);
_id -= 2;
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
if (_id < 2)
*reinterpret_cast<int*>(_a[0]) = -1;
_id -= 2;
}
return _id;
}

// SIGNAL 0
void Dialog::clickMark(int _t1, QString _t2)
{
void *_a[] = { 0, const_cast<void*>(reinterpret_cast<const void*>(&_t1)), const_cast<void*>(reinterpret_cast<const void*>(&_t2)) };
QMetaObject::activate(this, &staticMetaObject, 0, _a);
}
QT_END_MOC_NAMESPACE
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

QT_BEGIN_MOC_NAMESPACE
struct qt_meta_stringdata_MainWindow_t {
QByteArrayData data[31];
char stringdata[473];
QByteArrayData data[35];
char stringdata[498];
};
#define QT_MOC_LITERAL(idx, ofs, len) \
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
Expand Down Expand Up @@ -59,7 +59,11 @@ QT_MOC_LITERAL(26, 347, 22),
QT_MOC_LITERAL(27, 370, 27),
QT_MOC_LITERAL(28, 398, 23),
QT_MOC_LITERAL(29, 422, 23),
QT_MOC_LITERAL(30, 446, 25)
QT_MOC_LITERAL(30, 446, 25),
QT_MOC_LITERAL(31, 472, 9),
QT_MOC_LITERAL(32, 482, 1),
QT_MOC_LITERAL(33, 484, 1),
QT_MOC_LITERAL(34, 486, 10)
},
"MainWindow\0on_butSave_clicked\0\0"
"on_butOpen_clicked\0checkSelection\0"
Expand All @@ -75,7 +79,8 @@ QT_MOC_LITERAL(30, 446, 25)
"on_actionNew_triggered\0"
"on_toolButton_clear_clicked\0"
"on_actionOpen_triggered\0on_actionSave_triggered\0"
"on_actionSaveAs_triggered\0"
"on_actionSaveAs_triggered\0addDialog\0"
"a\0b\0timeUpdate\0"
};
#undef QT_MOC_LITERAL

Expand All @@ -85,41 +90,43 @@ static const uint qt_meta_data_MainWindow[] = {
7, // revision
0, // classname
0, 0, // classinfo
27, 14, // methods
29, 14, // methods
0, 0, // properties
0, 0, // enums/sets
0, 0, // constructors
0, // flags
0, // signalCount

// slots: name, argc, parameters, tag, flags
1, 0, 149, 2, 0x08,
3, 0, 150, 2, 0x08,
4, 0, 151, 2, 0x08,
5, 0, 152, 2, 0x08,
6, 1, 153, 2, 0x08,
9, 1, 156, 2, 0x08,
10, 0, 159, 2, 0x08,
11, 0, 160, 2, 0x08,
12, 0, 161, 2, 0x08,
13, 0, 162, 2, 0x08,
14, 0, 163, 2, 0x08,
15, 0, 164, 2, 0x08,
16, 0, 165, 2, 0x08,
17, 0, 166, 2, 0x08,
18, 0, 167, 2, 0x08,
19, 0, 168, 2, 0x08,
20, 0, 169, 2, 0x08,
21, 0, 170, 2, 0x08,
22, 0, 171, 2, 0x08,
23, 0, 172, 2, 0x08,
24, 0, 173, 2, 0x08,
25, 0, 174, 2, 0x08,
26, 0, 175, 2, 0x08,
27, 0, 176, 2, 0x08,
28, 0, 177, 2, 0x08,
29, 0, 178, 2, 0x08,
30, 0, 179, 2, 0x08,
1, 0, 159, 2, 0x08,
3, 0, 160, 2, 0x08,
4, 0, 161, 2, 0x08,
5, 0, 162, 2, 0x08,
6, 1, 163, 2, 0x08,
9, 1, 166, 2, 0x08,
10, 0, 169, 2, 0x08,
11, 0, 170, 2, 0x08,
12, 0, 171, 2, 0x08,
13, 0, 172, 2, 0x08,
14, 0, 173, 2, 0x08,
15, 0, 174, 2, 0x08,
16, 0, 175, 2, 0x08,
17, 0, 176, 2, 0x08,
18, 0, 177, 2, 0x08,
19, 0, 178, 2, 0x08,
20, 0, 179, 2, 0x08,
21, 0, 180, 2, 0x08,
22, 0, 181, 2, 0x08,
23, 0, 182, 2, 0x08,
24, 0, 183, 2, 0x08,
25, 0, 184, 2, 0x08,
26, 0, 185, 2, 0x08,
27, 0, 186, 2, 0x08,
28, 0, 187, 2, 0x08,
29, 0, 188, 2, 0x08,
30, 0, 189, 2, 0x08,
31, 2, 190, 2, 0x08,
34, 0, 195, 2, 0x08,

// slots: parameters
QMetaType::Void,
Expand Down Expand Up @@ -148,6 +155,8 @@ static const uint qt_meta_data_MainWindow[] = {
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void, QMetaType::Int, QMetaType::QString, 32, 33,
QMetaType::Void,

0 // eod
Expand Down Expand Up @@ -185,6 +194,8 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id,
case 24: _t->on_actionOpen_triggered(); break;
case 25: _t->on_actionSave_triggered(); break;
case 26: _t->on_actionSaveAs_triggered(); break;
case 27: _t->addDialog((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< QString(*)>(_a[2]))); break;
case 28: _t->timeUpdate(); break;
default: ;
}
}
Expand Down Expand Up @@ -215,13 +226,13 @@ int MainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
if (_id < 0)
return _id;
if (_c == QMetaObject::InvokeMetaMethod) {
if (_id < 27)
if (_id < 29)
qt_static_metacall(this, _c, _id, _a);
_id -= 27;
_id -= 29;
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
if (_id < 27)
if (_id < 29)
*reinterpret_cast<int*>(_a[0]) = -1;
_id -= 27;
_id -= 29;
}
return _id;
}
Expand Down
Binary file not shown.
22 changes: 1 addition & 21 deletions FourthOne/vector-editor/VectorEditor.pro.user
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<<<<<<< HEAD
<!-- Written by QtCreator 3.0.0, 2018-07-10T08:33:32. -->
=======
<!-- Written by QtCreator 3.0.0, 2018-07-09T23:09:30. -->
>>>>>>> 3bd95971433d998575086cea7d84044a158377d3
<!-- Written by QtCreator 3.0.0, 2018-07-10T08:47:12. -->
<qtcreator>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
Expand Down Expand Up @@ -62,11 +58,7 @@
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
<<<<<<< HEAD
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">E:/GitHub/QPainter/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug</value>
=======
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/pprp/Desktop/Github/QPainter/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Debug</value>
>>>>>>> 3bd95971433d998575086cea7d84044a158377d3
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
Expand Down Expand Up @@ -119,11 +111,7 @@
<value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
<<<<<<< HEAD
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">E:/GitHub/QPainter/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Release</value>
=======
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/pprp/Desktop/Github/QPainter/FourthOne/build-VectorEditor-Desktop_Qt_5_2_0_MinGW_32bit-Release</value>
>>>>>>> 3bd95971433d998575086cea7d84044a158377d3
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
Expand Down Expand Up @@ -229,11 +217,7 @@
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">src</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<<<<<<< HEAD
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:E:/GitHub/QPainter/FourthOne/vector-editor/src/src.pro</value>
=======
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Users/pprp/Desktop/Github/QPainter/FourthOne/vector-editor/src/src.pro</value>
>>>>>>> 3bd95971433d998575086cea7d84044a158377d3
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">src/src.pro</value>
<value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
Expand All @@ -255,11 +239,7 @@
</data>
<data>
<variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
<<<<<<< HEAD
<value type="QByteArray">{7d4e28bc-1f80-4f0a-8ac6-fe33c7b6d589}</value>
=======
<value type="QByteArray">{dd3a5811-f7c1-4907-a9f8-7c8534825697}</value>
>>>>>>> 3bd95971433d998575086cea7d84044a158377d3
</data>
<data>
<variable>ProjectExplorer.Project.Updater.FileVersion</variable>
Expand Down
Loading

0 comments on commit cc441f7

Please sign in to comment.