Changeset 4:0a29ce1ae854

Timestamp:

05/13/09 15:01:55 (4 years ago)

Author:

SokoL_SD

branch:

default

convert_revision:

svn:1c76f9a9-97a6-433d-956c-bb6a2077f4c7/trunk@8

Message:

CMake build script.
Small fixes in examples.

Files:

• CMakeLists.txt (modified) (1 diff)
• build/core.txt (added)
• build/gui.txt (added)
• build/opengl.txt (added)
• build/svg.txt (added)
• demos/CMakeLists.txt (added)
• demos/interview/CMakeLists.txt (added)
• examples/CMakeLists.txt (added)
• examples/itemviews/CMakeLists.txt (added)
• examples/itemviews/dirview/CMakeLists.txt (added)
• examples/mainwindows/CMakeLists.txt (added)
• examples/mainwindows/dockwidgets/CMakeLists.txt (added)
• examples/opengl/CMakeLists.txt (added)
• examples/opengl/hellogl/CMakeLists.txt (added)
• examples/opengl/hellogl/glwidget.d (modified) (16 diffs)
• examples/tutorials/CMakeLists.txt (added)
• examples/tutorials/tutorial/CMakeLists.txt (added)
• examples/tutorials/tutorial/t1/CMakeLists.txt (added)
• examples/tutorials/tutorial/t2/CMakeLists.txt (added)
• examples/tutorials/tutorial/t3/CMakeLists.txt (added)
• examples/tutorials/tutorial/t4/CMakeLists.txt (added)
• examples/tutorials/tutorial/t5/CMakeLists.txt (added)
• examples/tutorials/tutorial/t6/CMakeLists.txt (added)
• examples/widgets/CMakeLists.txt (added)
• examples/widgets/analogclock/AnalogClock.d (modified) (1 diff)
• examples/widgets/analogclock/CMakeLists.txt (added)
• examples/widgets/calculator/CMakeLists.txt (added)
• generator/CMakeLists.txt (added)
• generator/main.cpp (modified) (4 diffs)
• generator/main.h (modified) (3 diffs)
• generator/typesystem.cpp (modified) (5 diffs)
• generator/typesystem.h (modified) (1 diff)
• generator/typesystem_core.xml (modified) (1 diff)

CMakeLists.txt

@@ +1 @@
+cmake_minimum_required(VERSION 2.6)
-PROJECT(qtd CXX C)
-cmake_minimum_required(VERSION 2.6)
-FIND_PACKAGE(Qt4 REQUIRED)
-# Using Tango
-
-#set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/cmaked)
-#set(CMAKE_D_USE_TANGO True)
-
-include_directories(${QT_INCLUDES} include)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

examples/opengl/hellogl/glwidget.d

@@ -51 +51 @@
-{
-//    Q_OBJECT
-
+
-    public:
-        this(QWidget parent = null)
@@ -60 +60 @@
-            yRot = 0;
-            zRot = 0;
-
+
-            trolltechGreen = QColor.fromCmykF(0.40, 0.0, 1.0, 0.0);
-            trolltechPurple = QColor.fromCmykF(0.39, 0.39, 0.0, 0.0);
-
-
+
+
+
-        ~this()
-        {
-            makeCurrent();
-            glDeleteLists(object, 1);
-
-
+        
+
-        QSize minimumSizeHint()
-        {
@@ -92 +93 @@
-            }
-        }
-
+
-        void setYRotation(int angle)
-        {
@@ -102 +103 @@
-            }
-        }
-
+
-        void setZRotation(int angle)
-        {
@@ -112 +113 @@
-            }
-        }
-
+
-        mixin Signal!("xRotationChanged", int);
-        mixin Signal!("yRotationChanged", int);
-        mixin Signal!("zRotationChanged", int);
-
+
-
-    protected:
@@ -143 +144 @@
-            int side = qMin(width, height);
-            glViewport((width - side) / 2, (height - side) / 2, side, side);
-
+
-            glMatrixMode(GL_PROJECTION);
-            glLoadIdentity();
@@ -154 +155 @@
-            lastPos = QPoint(event.pos.x, event.pos.y);
-        }
-
+
-        void mouseMoveEvent(QMouseEvent event)
-        {
-            int dx = event.x - lastPos.x;
-            int dy = event.y - lastPos.y;
-
+
-            if (event.buttons() & Qt.LeftButton) {
-                setXRotation(xRot + 8 * dy);
@@ -174 +175 @@
-            GLuint list = glGenLists(1);
-            glNewList(list, GL_COMPILE);
-
+
-            glBegin(GL_QUADS);
-
+
-            GLdouble x1 = +0.06;
-            GLdouble y1 = -0.14;
@@ -185 +186 @@
-            GLdouble x4 = +0.30;
-            GLdouble y4 = +0.22;
-
+
-            quad(x1, y1, x2, y2, y2, x2, y1, x1);
-            quad(x3, y3, x4, y4, y4, x4, y3, x3);
-
+
-            extrude(x1, y1, x2, y2);
-            extrude(x2, y2, y2, x2);
@@ -196 +197 @@
-            extrude(x4, y4, y4, x4);
-            extrude(y4, x4, y3, x3);
-
+
-            const double Pi = 3.14159265358979323846;
-            const int NumSectors = 200;
-
+
-            for (int i = 0; i < NumSectors; ++i) {
-                double angle1 = (i * 2 * Pi) / NumSectors;
@@ -206 +207 @@
-                GLdouble x6 = 0.20 * sin(angle1);
-                GLdouble y6 = 0.20 * cos(angle1);
-
+
-                double angle2 = ((i + 1) * 2 * Pi) / NumSectors;
-                GLdouble x7 = 0.20 * sin(angle2);
@@ -212 +213 @@
-                GLdouble x8 = 0.30 * sin(angle2);
-                GLdouble y8 = 0.30 * cos(angle2);
-
+
-                quad(x5, y5, x6, y6, x7, y7, x8, y8);
-
+
-                extrude(x6, y6, x7, y7);
-                extrude(x8, y8, x5, y5);
-            }
-
+
-            glEnd();
-
@@ -224 +225 @@
-            return list;
-        }
-
+
-        void quad(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2,
-                   GLdouble x3, GLdouble y3, GLdouble x4, GLdouble y4)
-        {
-            qglColor(trolltechGreen);
-
+
-            glVertex3d(x1, y1, -0.05);
-            glVertex3d(x2, y2, -0.05);
-            glVertex3d(x3, y3, -0.05);
-            glVertex3d(x4, y4, -0.05);
-
+
-            glVertex3d(x4, y4, +0.05);
-            glVertex3d(x3, y3, +0.05);
@@ -240 +241 @@
-            glVertex3d(x1, y1, +0.05);
-        }
-
+
-        void extrude(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
-        {
-            qglColor(trolltechGreen.darker(rndint(250 + (100 * x1))));
-
+
-            glVertex3d(x1, y1, +0.05);
-            glVertex3d(x2, y2, +0.05);
@@ -250 +251 @@
-            glVertex3d(x1, y1, -0.05);
-        }
-
+
-        void normalizeAngle(int *angle)
-        {
@@ -258 +259 @@
-                *angle -= 360 * 16;
-        }
-
+
-        GLuint object;
-        int xRot;

examples/widgets/analogclock/AnalogClock.d

@@ -65 +65 @@
-    void paintEvent(QPaintEvent event)
-    {
-
+
-            QPoint(7, 8),
-            QPoint(-7, 8),
-            QPoint(0, -40)
-]
-[3] minuteHand = [
+}
+ minuteHand[3] = {
-            QPoint(7, 8),
-            QPoint(-7, 8),
-            QPoint(0, -70)
-
+
+
+
+
+
+
+
+
+
+
+
-
-        scope hourColor = new QColor(127, 0, 127);

generator/main.cpp

@@ -76 +76 @@
-    QString pp_file = ".preprocessed.tmp";
-    QStringList rebuild_classes;
+    QString source_dir;
-
-    QMap<QString, QString> args;
@@ -151 +152 @@
-    }
-
+    source_dir = args.value("source-directory");
-    fileName = args.value("arg-1");
+    if (!source_dir.isEmpty())
+    {
+        fileName = source_dir + "/" + fileName;
+    }
-
-    typesystemFileName = args.value("arg-2");
@@ -173 +179 @@
-    printf("Running the QtD Generator. Please wait while source files are being generated...\n");
-
-
+, source_dir
-        qFatal("Cannot parse file: '%s'", qPrintable(typesystemFileName));
-
-
-
+
-        fprintf(stderr, "Preprocessor failed on file: '%s'\n", qPrintable(fileName));
-        return 1;
@@ -213 +218 @@
-    printf(
-           "  --cpp-shared                              \n"
+           "  --qt-include-directory                    \n"
+           "  --qt-directory                            \n"
+           "  --source-directory                        \n"
-           "  --debug-level=[sparse|medium|full]        \n"
-      
+
-           "  --dump-object-tree                        \n"
-           "  --help, -h or -?                          \n"

generator/main.h

@@ -50 +50 @@
-struct Preprocess
-{
-
+
+
-    {
-        rpp::pp_environment env;
@@ -87 +88 @@
-
-        // Include Qt
-
-
+
+
+
+
-        if (qtdir.isEmpty() && qtdir_inc.isEmpty()) {
-(or)
+
-        } else {
-            if (qtdir_inc.isEmpty())
@@ -101 +104 @@
-            includes << qtdir_inc;
-        }
-
-
-        foreach (QString include, includes)

generator/typesystem.cpp

@@ -139 +139 @@
-{
-public:
-
-
+const QString &source_dir, 
+, m_source_dir(source_dir)
-    {
-        m_current_enum = 0;
@@ -216 +216 @@
-
-    QHash<QString, StackElement::ElementType> tagNames;
+
+    QString m_source_dir;
-};
-
@@ -841 +843 @@
-                }
-
-
+m_source_dir, 
-                    m_error = QString("Failed to parse: '%1'").arg(name);
-                    return false;
@@ -1513 +1515 @@
-}
-
-
-
-
+
+
+
+
+
+
+
+
-    Q_ASSERT(file.exists());
-    QXmlInputSource source(&file);
@@ -1522 +1529 @@
-
-    QXmlSimpleReader reader;
-
+source_dir, 
-
-    reader.setContentHandler(&handler);

generator/typesystem.h

@@ -1187 +1187 @@
-    QString filename() const { return "typesystem.txt"; }
-
-
+const QString &work_dir, 
-
-private:

generator/typesystem_core.xml

@@ -1925 +1925 @@
-
-  <value-type name="QLine" wrap="struct"/>
-
+ 
-        <inject-code>
-            <import-file name="typesystem_core-java.java" quote-after-line="class QLineF___" quote-before-line="}// class"/>