--- ktechlab-0.3/src/gui/projectdlgs.cpp-- 2006-01-05 17:24:29.000000000 +0100
+++ ktechlab-0.3/src/gui/projectdlgs.cpp 2006-01-05 17:24:41.000000000 +0100
@@ -16,7 +16,7 @@
#include "processingoptionswidget.h"
#include "projectdlgs.h"
#include "projectmanager.h"
-
+#include "projectdlgs.moc"
#include <assert.h>
#include <kcombobox.h>
#include <kdeversion.h>
--- ktechlab-0.3/src/micro/microlibrary.h-- 2006-01-05 17:19:40.000000000 +0100
+++ ktechlab-0.3/src/micro/microlibrary.h 2006-01-05 17:19:51.000000000 +0100
@@ -9,7 +9,7 @@
***************************************************************************/
#ifndef MICRoLIBRARY_H
-#define PICLIBRARY_H
+#define MICRoLIBRARY_H
#include "asminfo.h"
#include "microinfo.h"
--- ktechlab-0.3/src/micro/picinfo12bit.cpp-- 2006-01-05 17:42:44.000000000 +0100
+++ ktechlab-0.3/src/micro/picinfo12bit.cpp 2006-01-05 17:42:54.000000000 +0100
@@ -15,11 +15,11 @@
#include <kstaticdeleter.h>
PicAsm12bit *PicAsm12bit::m_self = 0;
-static KStaticDeleter<PicAsm12bit> staticDeleter;
+static KStaticDeleter<PicAsm12bit> staticDeleter12;
PicAsm12bit *PicAsm12bit::self()
{
- if ( !m_self ) staticDeleter.setObject( m_self, new PicAsm12bit() );
+ if ( !m_self ) staticDeleter12.setObject( m_self, new PicAsm12bit() );
return m_self;
}
--- ktechlab-0.3/src/micro/picinfo14bit.cpp-- 2006-01-05 17:43:00.000000000 +0100
+++ ktechlab-0.3/src/micro/picinfo14bit.cpp 2006-01-05 17:43:12.000000000 +0100
@@ -15,11 +15,11 @@
#include <kstaticdeleter.h>
PicAsm14bit *PicAsm14bit::m_self = 0;
-static KStaticDeleter<PicAsm14bit> staticDeleter;
+static KStaticDeleter<PicAsm14bit> staticDeleter14;
PicAsm14bit *PicAsm14bit::self()
{
- if ( !m_self ) staticDeleter.setObject( m_self, new PicAsm14bit() );
+ if ( !m_self ) staticDeleter14.setObject( m_self, new PicAsm14bit() );
return m_self;
}
--- ktechlab-0.3/src/electronics/components/ecvoltagesignal.cpp-- 2006-01-05 17:33:29.000000000 +0100
+++ ktechlab-0.3/src/electronics/components/ecvoltagesignal.cpp 2006-01-05 17:33:37.000000000 +0100
@@ -18,7 +18,6 @@
#include <klocale.h>
#include <qpainter.h>
-const double conductance = 1e5; // Internal resistance
Item* ECVoltageSignal::construct( ItemDocument *itemDocument, bool newItem, const char *id )
{
--- ktechlab-0.3/src/electronics/components/ecvoltagesource.cpp-- 2006-01-05 17:33:43.000000000 +0100
+++ ktechlab-0.3/src/electronics/components/ecvoltagesource.cpp 2006-01-05 17:33:47.000000000 +0100
@@ -18,7 +18,6 @@
#include <klocale.h>
#include <qpainter.h>
-const double conductance = 1e5; // Internal resistance
Item* ECCell::construct( ItemDocument *itemDocument, bool newItem, const char *id )
{
--- ktechlab-0.3/src/electronics/ecnode.h-- 2006-01-05 17:32:49.000000000 +0100
+++ ktechlab-0.3/src/electronics/ecnode.h 2006-01-05 17:33:16.000000000 +0100
@@ -25,6 +25,8 @@
typedef QValueList<Element*> ElementList;
typedef QValueVector<Pin*> PinVector;
+const double conductance = 1e5; // Internal resistance
+
/**
@short Electrical node with voltage / current / etc properties
@author David Saxton
--- ktechlab-0.3/src/electronics/gpsimprocessor.h-- 2006-01-05 17:44:00.000000000 +0100
+++ ktechlab-0.3/src/electronics/gpsimprocessor.h 2006-01-05 17:51:48.000000000 +0100
@@ -29,7 +29,6 @@
class RegisterMemoryAccess;
typedef QMap<SourceLine, SourceLine> SourceLineMap;
-typedef QMap<int, QString> QStringMap;
typedef QValueList<int> IntList;
--- ktechlab-0.3/src/connector.cpp-- 2006-01-05 17:56:03.000000000 +0100
+++ ktechlab-0.3/src/connector.cpp 2006-01-06 14:10:40.000000000 +0100
@@ -15,40 +15,13 @@
#include "ecnode.h"
#include "itemdocumentdata.h"
#include "wire.h"
+#include "utils.h"
#include <kdebug.h>
#include <cmath>
-inline static int toCanvas( int pos )
-{
- return pos*8+4;
-}
-inline static int fromCanvas( int pos )
-{
- return (pos-4)/8;
-// return (pos>0) ? int((pos-3)/8) : int((pos-5)/8);
-}
-
-inline static QPoint toCanvas( const QPoint * const pos )
-{
- return QPoint( toCanvas(pos->x()), toCanvas(pos->y()) );
-}
-inline static QPoint fromCanvas( const QPoint * const pos )
-{
- return QPoint( fromCanvas(pos->x()), fromCanvas(pos->y()) );
-}
-
-inline static QPoint toCanvas( const QPoint &pos )
-{
- return QPoint( toCanvas(pos.x()), toCanvas(pos.y()) );
-}
-inline static QPoint fromCanvas( const QPoint &pos )
-{
- return QPoint( fromCanvas(pos.x()), fromCanvas(pos.y()) );
-}
-
//BEGIN class Connector
Connector::Connector( Node * startNode, Node * endNode, ICNDocument *icnDocument, QString *id )
--- ktechlab-0.3/src/conrouter.cpp-- 2006-01-06 14:09:08.000000000 +0100
+++ ktechlab-0.3/src/conrouter.cpp 2006-01-06 14:16:03.000000000 +0100
@@ -10,44 +10,11 @@
#include "conrouter.h"
#include "icndocument.h"
-
+#include "utils.h"
#include <kdebug.h>
#include <assert.h>
-#include <cmath>
-
-inline static int toCanvas( int pos )
-{
- return pos*8+4;
-}
-inline static int fromCanvas( int pos )
-{
- return (pos-4)/8;
-}
-
-inline static QPoint toCanvas( const QPoint * const pos )
-{
- return QPoint( toCanvas(pos->x()), toCanvas(pos->y()) );
-}
-inline static QPoint fromCanvas( const QPoint * const pos )
-{
- return QPoint( fromCanvas(pos->x()), fromCanvas(pos->y()) );
-}
-
-inline static QPoint toCanvas( const QPoint &pos )
-{
- return QPoint( toCanvas(pos.x()), toCanvas(pos.y()) );
-}
-inline static QPoint fromCanvas( const QPoint &pos )
-{
- return QPoint( fromCanvas(pos.x()), fromCanvas(pos.y()) );
-}
-
-static inline int roundDouble( const double x )
-{
- return int(std::floor(x+0.5));
-}
-
+#include <math.h>
ConRouter::ConRouter( ICNDocument *cv )
{
p_icnDocument = cv;
@@ -86,14 +53,6 @@
}
-static double qpoint_distance( const QPoint & p1, const QPoint & p2 )
-{
- double dx = p1.x() - p2.x();
- double dy = p1.y() - p2.y();
-
- return std::sqrt( dx*dx + dy*dy );
-}
-
QPointListList ConRouter::splitPoints( const QPoint &pos ) const
{
--- ktechlab-0.3/src/Makefile.am-- 2006-01-06 14:12:03.000000000 +0100
+++ ktechlab-0.3/src/Makefile.am 2006-01-06 14:12:16.000000000 +0100
@@ -32,7 +32,7 @@
viewcontainer.cpp circuitview.cpp flowcodeview.cpp eventinfo.cpp oscilloscopedata.cpp \
itemdocumentdata.cpp docmanageriface.cpp documentiface.cpp viewiface.cpp \
docmanageriface.skel viewiface.skel documentiface.skel simulator.cpp katemdi.cpp \
- debugmanager.cpp recentfilesaction.cpp variablelabel.cpp
+ debugmanager.cpp recentfilesaction.cpp variablelabel.cpp
ktechlab_PCH = AUTO
@@ -46,7 +46,7 @@
circuitdocument.h flowcodedocument.h icnview.h icndocument.h viewcontainer.h \
circuitview.h flowcodeview.h eventinfo.h oscilloscopedata.h itemdocumentdata.h \
docmanageriface.h documentiface.h viewiface.h simulator.h katemdi.h debugmanager.h \
- recentfilesaction.h variablelabel.h
+ recentfilesaction.h variablelabel.h utils.h
# client stuff
--- ktechlab-0.3/src/canvasmanipulator.cpp-- 2006-01-06 14:13:28.000000000 +0100
+++ ktechlab-0.3/src/canvasmanipulator.cpp 2006-01-06 14:16:29.000000000 +0100
@@ -507,15 +507,6 @@
}
-static double qpoint_distance( const QPoint & p1, const QPoint & p2 )
-{
- double dx = p1.x() - p2.x();
- double dy = p1.y() - p2.y();
-
- return std::sqrt( dx*dx + dy*dy );
-}
-
-
QPoint ConnectorDraw::toValidPos( const QPoint & clickPos, Connector * clickedConnector ) const
{
if ( !clickedConnector )
--- /dev/null 2005-10-10 22:04:13.000000000 +0200
+++ ktechlab-0.3/src/utils.h 2006-01-06 14:15:39.000000000 +0100
@@ -0,0 +1,49 @@
+
+#ifndef UTILS_H
+#define UTILS_H
+
+#include <qpoint.h>
+#include <cmath>
+
+inline static int toCanvas( int pos )
+{
+ return pos*8+4;
+}
+inline static int fromCanvas( int pos )
+{
+ return (pos-4)/8;
+// return (pos>0) ? int((pos-3)/8) : int((pos-5)/8);
+}
+
+inline static QPoint toCanvas( const QPoint * const pos )
+{
+ return QPoint( toCanvas(pos->x()), toCanvas(pos->y()) );
+}
+inline static QPoint fromCanvas( const QPoint * const pos )
+{
+ return QPoint( fromCanvas(pos->x()), fromCanvas(pos->y()) );
+}
+
+inline static QPoint toCanvas( const QPoint &pos )
+{
+ return QPoint( toCanvas(pos.x()), toCanvas(pos.y()) );
+}
+inline static QPoint fromCanvas( const QPoint &pos )
+{
+ return QPoint( fromCanvas(pos.x()), fromCanvas(pos.y()) );
+}
+
+static inline int roundDouble( const double x )
+{
+ return int(std::floor(x+0.5));
+}
+
+static double qpoint_distance( const QPoint & p1, const QPoint & p2 )
+{
+ double dx = p1.x() - p2.x();
+ double dy = p1.y() - p2.y();
+
+ return std::sqrt( dx*dx + dy*dy );
+}
+
+#endif
