[Netemul-develop] SF.net SVN: netemul:[237] trunk

[<f-r...@us...>]

Revision: 237
          http://netemul.svn.sourceforge.net/netemul/?rev=237&view=rev
Author:   f-r-o-s-t
Date:     2011-02-09 12:47:59 +0000 (Wed, 09 Feb 2011)

Log Message:
-----------
Fix some problems =)

Modified Paths:
--------------
    trunk/basicnetlib/basicnetlib.pro.user
    trunk/ipedit/ipedit.pro
    trunk/ipedit/ipeditdesignerplugin.cpp
    trunk/src/deviceport.cpp
    trunk/src/deviceport.h
    trunk/src/devices/smartdevice.cpp
    trunk/src/dialogs/logdialog.cpp
    trunk/src/dialogs/logdialog.h
    trunk/src/programms/dhcpdemon.h
    trunk/src/programms/spoofingprogramm.h

Added Paths:
-----------
    trunk/test/rect_cache_test/
    trunk/test/rect_cache_test/rect_cache_test.pro
    trunk/test/rect_cache_test/tst_rect_cache_testtest.cpp

Modified: trunk/basicnetlib/basicnetlib.pro.user
===================================================================
--- trunk/basicnetlib/basicnetlib.pro.user	2011-02-09 12:26:11 UTC (rev 236)
+++ trunk/basicnetlib/basicnetlib.pro.user	2011-02-09 12:47:59 UTC (rev 237)
@@ -43,12 +43,12 @@
     <value key="ProjectExplorer.BuildConfiguration.CleanStepsCount" type="int">1</value>
     <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
     <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
-    <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Отладка</value>
+    <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Qt в PATH Отладка</value>
     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">2</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">C:/netemul/trunk/basicnetlib-build-desktop</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">9</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">2</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/home/frost/netemul/trunk/basicnetlib-build-desktop</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">2</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">0</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">false</value>
    </valuemap>
    <valuemap key="ProjectExplorer.Target.BuildConfiguration.1" type="QVariantMap">
@@ -77,15 +77,151 @@
     <value key="ProjectExplorer.BuildConfiguration.CleanStepsCount" type="int">1</value>
     <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
     <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
-    <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Релиз</value>
+    <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Qt в PATH Релиз</value>
     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">0</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">C:/netemul/trunk/basicnetlib-build-desktop</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">9</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">2</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/home/frost/netemul/trunk/basicnetlib-build-desktop</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">2</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">0</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
    </valuemap>
-   <value key="ProjectExplorer.Target.BuildConfigurationCount" type="int">2</value>
+   <valuemap key="ProjectExplorer.Target.BuildConfiguration.2" type="QVariantMap">
+    <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.0" type="QVariantMap">
+     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">qmake</value>
+     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
+     <valuelist key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QVariantList"/>
+    </valuemap>
+    <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.1" type="QVariantMap">
+     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Сборка</value>
+     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
+     <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
+     <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList"/>
+     <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
+    </valuemap>
+    <value key="ProjectExplorer.BuildConfiguration.BuildStepsCount" type="int">2</value>
+    <valuemap key="ProjectExplorer.BuildConfiguration.CleanStep.0" type="QVariantMap">
+     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Сборка</value>
+     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
+     <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
+     <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList">
+      <value type="QString">clean</value>
+     </valuelist>
+     <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
+    </valuemap>
+    <value key="ProjectExplorer.BuildConfiguration.CleanStepsCount" type="int">1</value>
+    <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
+    <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
+    <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">4.5.0 Отладка</value>
+    <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">2</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/home/frost/netemul/trunk/basicnetlib-build-desktop</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">6</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">0</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
+   </valuemap>
+   <valuemap key="ProjectExplorer.Target.BuildConfiguration.3" type="QVariantMap">
+    <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.0" type="QVariantMap">
+     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">qmake</value>
+     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
+     <valuelist key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QVariantList"/>
+    </valuemap>
+    <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.1" type="QVariantMap">
+     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Сборка</value>
+     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
+     <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
+     <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList"/>
+     <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
+    </valuemap>
+    <value key="ProjectExplorer.BuildConfiguration.BuildStepsCount" type="int">2</value>
+    <valuemap key="ProjectExplorer.BuildConfiguration.CleanStep.0" type="QVariantMap">
+     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Сборка</value>
+     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
+     <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
+     <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList">
+      <value type="QString">clean</value>
+     </valuelist>
+     <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
+    </valuemap>
+    <value key="ProjectExplorer.BuildConfiguration.CleanStepsCount" type="int">1</value>
+    <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
+    <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
+    <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">4.5.0 Релиз</value>
+    <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">0</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/home/frost/netemul/trunk/basicnetlib-build-desktop</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">6</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">0</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
+   </valuemap>
+   <valuemap key="ProjectExplorer.Target.BuildConfiguration.4" type="QVariantMap">
+    <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.0" type="QVariantMap">
+     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">qmake</value>
+     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
+     <valuelist key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QVariantList"/>
+    </valuemap>
+    <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.1" type="QVariantMap">
+     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Сборка</value>
+     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
+     <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
+     <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList"/>
+     <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
+    </valuemap>
+    <value key="ProjectExplorer.BuildConfiguration.BuildStepsCount" type="int">2</value>
+    <valuemap key="ProjectExplorer.BuildConfiguration.CleanStep.0" type="QVariantMap">
+     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Сборка</value>
+     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
+     <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
+     <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList">
+      <value type="QString">clean</value>
+     </valuelist>
+     <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
+    </valuemap>
+    <value key="ProjectExplorer.BuildConfiguration.CleanStepsCount" type="int">1</value>
+    <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
+    <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
+    <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Qt 4.7.0 OpenSource Отладка</value>
+    <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">2</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/home/frost/netemul/trunk/basicnetlib-build-desktop</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">12</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">0</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
+   </valuemap>
+   <valuemap key="ProjectExplorer.Target.BuildConfiguration.5" type="QVariantMap">
+    <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.0" type="QVariantMap">
+     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">qmake</value>
+     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
+     <valuelist key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QVariantList"/>
+    </valuemap>
+    <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.1" type="QVariantMap">
+     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Сборка</value>
+     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
+     <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
+     <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList"/>
+     <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
+    </valuemap>
+    <value key="ProjectExplorer.BuildConfiguration.BuildStepsCount" type="int">2</value>
+    <valuemap key="ProjectExplorer.BuildConfiguration.CleanStep.0" type="QVariantMap">
+     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Сборка</value>
+     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
+     <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
+     <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList">
+      <value type="QString">clean</value>
+     </valuelist>
+     <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
+    </valuemap>
+    <value key="ProjectExplorer.BuildConfiguration.CleanStepsCount" type="int">1</value>
+    <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
+    <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
+    <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Qt 4.7.0 OpenSource Релиз</value>
+    <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">0</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/home/frost/netemul/trunk/basicnetlib-build-desktop</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">12</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">0</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
+   </valuemap>
+   <value key="ProjectExplorer.Target.BuildConfigurationCount" type="int">6</value>
    <valuemap key="ProjectExplorer.Target.RunConfiguration.0" type="QVariantMap">
     <valuelist key="ProjectExplorer.CustomExecutableRunConfiguration.Arguments" type="QVariantList"/>
     <value key="ProjectExplorer.CustomExecutableRunConfiguration.BaseEnvironmentBase" type="int">2</value>

Modified: trunk/ipedit/ipedit.pro
===================================================================
--- trunk/ipedit/ipedit.pro	2011-02-09 12:26:11 UTC (rev 236)
+++ trunk/ipedit/ipedit.pro	2011-02-09 12:47:59 UTC (rev 237)
@@ -8,7 +8,8 @@
 TARGET      = $$qtLibraryTarget($$TARGET)
 TEMPLATE    = lib
 QTDIR_build:DESTDIR     = $$QT_BUILD_TREE/plugins/designer
-INCLUDEPATH += "../src"
+INCLUDEPATH += "../src" \
+                ../basicnetlib
 HEADERS     = ../src/ipedit.h \
               ipeditdesignerplugin.h
 SOURCES     = ../src/ipedit.cpp \

Modified: trunk/ipedit/ipeditdesignerplugin.cpp
===================================================================
--- trunk/ipedit/ipeditdesignerplugin.cpp	2011-02-09 12:26:11 UTC (rev 236)
+++ trunk/ipedit/ipeditdesignerplugin.cpp	2011-02-09 12:47:59 UTC (rev 237)
@@ -33,7 +33,7 @@
 
 QWidget* ipEditDesignerPlugin::createWidget(QWidget *parent)
 {
-    return new ipEdit(parent,tr("Enter text: "));
+    return new IpEdit(parent,tr("Enter text: "));
 }
 
 Q_EXPORT_PLUGIN2(ipeditdesignerplugin , ipEditDesignerPlugin )

Modified: trunk/src/deviceport.cpp
===================================================================
--- trunk/src/deviceport.cpp	2011-02-09 12:26:11 UTC (rev 236)
+++ trunk/src/deviceport.cpp	2011-02-09 12:47:59 UTC (rev 237)
@@ -19,7 +19,7 @@
 ****************************************************************************************/
 #include "deviceport.h"
 #include "cabledev.h"
-#include "Frame.h"
+#include "frame.h"
 
 DevicePort::DevicePort(QObject *parent)
 {

Modified: trunk/src/deviceport.h
===================================================================
--- trunk/src/deviceport.h	2011-02-09 12:26:11 UTC (rev 236)
+++ trunk/src/deviceport.h	2011-02-09 12:47:59 UTC (rev 237)
@@ -21,7 +21,7 @@
 #define DEVICEPORT_H
 
 #include <QQueue>
-#include "Frame.h"
+#include "frame.h"
 
 class MacAddress;
 class Cable;

Modified: trunk/src/devices/smartdevice.cpp
===================================================================
--- trunk/src/devices/smartdevice.cpp	2011-02-09 12:26:11 UTC (rev 236)
+++ trunk/src/devices/smartdevice.cpp	2011-02-09 12:47:59 UTC (rev 237)
@@ -20,13 +20,11 @@
 #include <QtCore/QtDebug>
 #include <QMessageBox>
 #include "smartdevice.h"
-#ifndef __TESTING__
 #include "routeeditor.h"
 #include "adapterproperty.h"
 #include "tablearp.h"
 #include "programmdialog.h"
 #include "logdialog.h"
-#endif
 #include "routemodel.h"
 #include "abstractsocket.h"
 #include "socketfactory.h"
@@ -284,10 +282,8 @@
 //-------------------------------------------------------
 void SmartDevice::tableDialog()
 {
-#ifndef __TESTING__
     routeEditor *d = new routeEditor(this);
     d->show();
-#endif
 }
 
 void SmartDevice::showLogDialog(logDialog *log) const

Modified: trunk/src/dialogs/logdialog.cpp
===================================================================
--- trunk/src/dialogs/logdialog.cpp	2011-02-09 12:26:11 UTC (rev 236)
+++ trunk/src/dialogs/logdialog.cpp	2011-02-09 12:47:59 UTC (rev 237)
@@ -19,7 +19,7 @@
 ****************************************************************************************/
 #include <QtCore/QTime>
 #include "logdialog.h"
-#include "Frame.h"
+#include "frame.h"
 #include "ippacket.h"
 #include "arppacket.h"
 #include "appsetting.h"

Modified: trunk/src/dialogs/logdialog.h
===================================================================
--- trunk/src/dialogs/logdialog.h	2011-02-09 12:26:11 UTC (rev 236)
+++ trunk/src/dialogs/logdialog.h	2011-02-09 12:47:59 UTC (rev 237)
@@ -21,7 +21,7 @@
 #define LOGDIALOG_H
 
 #include "ui_logdialog.h"
-#include "Frame.h"
+#include "frame.h"
 
 static const QColor cl_frame = "#fbec5d";
 static const QColor cl_ipInternal = "#efaf8c";

Modified: trunk/src/programms/dhcpdemon.h
===================================================================
--- trunk/src/programms/dhcpdemon.h	2011-02-09 12:26:11 UTC (rev 236)
+++ trunk/src/programms/dhcpdemon.h	2011-02-09 12:47:59 UTC (rev 237)
@@ -20,7 +20,10 @@
     int time;
     int requestTimer;
     enum { WAIT_REQUEST = 0, IN_USE = 1, DECLINE = 2 };
-    ClientState(StaticDhcpRecord *rec);
+    ClientState(StaticDhcpRecord *rec) {
+
+    }
+
     ClientState() { }
 };
 

Modified: trunk/src/programms/spoofingprogramm.h
===================================================================
--- trunk/src/programms/spoofingprogramm.h	2011-02-09 12:26:11 UTC (rev 236)
+++ trunk/src/programms/spoofingprogramm.h	2011-02-09 12:47:59 UTC (rev 237)
@@ -4,7 +4,7 @@
 #include "programmrep.h"
 #include "ipaddress.h"
 #include "macaddress.h"
-#include "Frame.h"
+#include "frame.h"
 
 class ArpRecord;
 

Added: trunk/test/rect_cache_test/rect_cache_test.pro
===================================================================
--- trunk/test/rect_cache_test/rect_cache_test.pro	                        (rev 0)
+++ trunk/test/rect_cache_test/rect_cache_test.pro	2011-02-09 12:47:59 UTC (rev 237)
@@ -0,0 +1,19 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2011-02-09T14:45:12
+#
+#-------------------------------------------------
+
+QT       += testlib
+
+QT       -= gui
+
+TARGET = tst_rect_cache_testtest
+CONFIG   += console
+CONFIG   -= app_bundle
+
+TEMPLATE = app
+
+
+SOURCES += tst_rect_cache_testtest.cpp
+DEFINES += SRCDIR=\\\"$$PWD/\\\"

Added: trunk/test/rect_cache_test/tst_rect_cache_testtest.cpp
===================================================================
--- trunk/test/rect_cache_test/tst_rect_cache_testtest.cpp	                        (rev 0)
+++ trunk/test/rect_cache_test/tst_rect_cache_testtest.cpp	2011-02-09 12:47:59 UTC (rev 237)
@@ -0,0 +1,47 @@
+#include <QtCore/QString>
+#include <QtTest/QtTest>
+#include <QRectF>
+
+class Rect_cache_testTest : public QObject
+{
+    Q_OBJECT
+
+public:
+    Rect_cache_testTest();
+
+private Q_SLOTS:
+    void cacheTest();
+    void calculateTest();
+};
+
+Rect_cache_testTest::Rect_cache_testTest()
+{
+}
+
+QRectF getCalculateRect()
+{
+    return QRectF(10,10,100,100).normalized().adjusted(-3,-3,3,3);
+}
+
+QRectF getCachedRect() {
+    static QRectF cachedRect(10,10,100,100);
+    return cachedRect;
+}
+
+void Rect_cache_testTest::calculateTest()
+{
+    QBENCHMARK {
+        QRectF r = getCalculateRect();
+    }
+}
+
+void Rect_cache_testTest::cacheTest()
+{
+    QBENCHMARK {
+        QRectF r = getCachedRect();
+    }
+}
+
+QTEST_APPLESS_MAIN(Rect_cache_testTest);
+
+#include "tst_rect_cache_testtest.moc"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.