summaryrefslogtreecommitdiffstats
path: root/tutorial
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-02-13 17:43:39 -0600
committerTimothy Pearson <[email protected]>2012-02-13 17:43:39 -0600
commit359640943bcf155faa9a067dde9e00a123276290 (patch)
treefb3d55ea5e18949042fb0064123fb73d2b1eb932 /tutorial
parenta829bcdc533e154000803d517200d32fe762e85c (diff)
downloadtqt3-359640943bcf155faa9a067dde9e00a123276290.tar.gz
tqt3-359640943bcf155faa9a067dde9e00a123276290.zip
Automated update from Qt3
Diffstat (limited to 'tutorial')
-rw-r--r--tutorial/t10/cannon.h2
-rw-r--r--tutorial/t10/lcdrange.h2
-rw-r--r--tutorial/t11/cannon.cpp2
-rw-r--r--tutorial/t11/cannon.h2
-rw-r--r--tutorial/t11/lcdrange.h2
-rw-r--r--tutorial/t12/cannon.cpp2
-rw-r--r--tutorial/t12/cannon.h2
-rw-r--r--tutorial/t12/lcdrange.h2
-rw-r--r--tutorial/t13/cannon.cpp2
-rw-r--r--tutorial/t13/cannon.h2
-rw-r--r--tutorial/t13/gamebrd.h2
-rw-r--r--tutorial/t13/lcdrange.h2
-rw-r--r--tutorial/t14/cannon.cpp4
-rw-r--r--tutorial/t14/cannon.h2
-rw-r--r--tutorial/t14/gamebrd.h2
-rw-r--r--tutorial/t14/lcdrange.h2
-rw-r--r--tutorial/t7/lcdrange.h2
-rw-r--r--tutorial/t8/cannon.h2
-rw-r--r--tutorial/t8/lcdrange.h2
-rw-r--r--tutorial/t9/cannon.h2
-rw-r--r--tutorial/t9/lcdrange.h2
21 files changed, 22 insertions, 22 deletions
diff --git a/tutorial/t10/cannon.h b/tutorial/t10/cannon.h
index 25464644d..a75678fad 100644
--- a/tutorial/t10/cannon.h
+++ b/tutorial/t10/cannon.h
@@ -12,7 +12,7 @@
class CannonField : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
CannonField( TQWidget *parent=0, const char *name=0 );
diff --git a/tutorial/t10/lcdrange.h b/tutorial/t10/lcdrange.h
index 2b689a3bf..cbb69b4b7 100644
--- a/tutorial/t10/lcdrange.h
+++ b/tutorial/t10/lcdrange.h
@@ -14,7 +14,7 @@ class TQSlider;
class LCDRange : public TQVBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
LCDRange( TQWidget *parent=0, const char *name=0 );
diff --git a/tutorial/t11/cannon.cpp b/tutorial/t11/cannon.cpp
index ad23174e7..bfbc12a10 100644
--- a/tutorial/t11/cannon.cpp
+++ b/tutorial/t11/cannon.cpp
@@ -145,7 +145,7 @@ TQRect CannonField::shotRect() const
double y = y0 + vely*time - 0.5*gravity*time*time;
TQRect r = TQRect( 0, 0, 6, 6 );
- r.moveCenter( TQPoint( qRound(x), height() - 1 - qRound(y) ) );
+ r.moveCenter( TQPoint( tqRound(x), height() - 1 - tqRound(y) ) );
return r;
}
diff --git a/tutorial/t11/cannon.h b/tutorial/t11/cannon.h
index 35af0527b..b3b79fb98 100644
--- a/tutorial/t11/cannon.h
+++ b/tutorial/t11/cannon.h
@@ -15,7 +15,7 @@ class TQTimer;
class CannonField : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
CannonField( TQWidget *parent=0, const char *name=0 );
diff --git a/tutorial/t11/lcdrange.h b/tutorial/t11/lcdrange.h
index 2b689a3bf..cbb69b4b7 100644
--- a/tutorial/t11/lcdrange.h
+++ b/tutorial/t11/lcdrange.h
@@ -14,7 +14,7 @@ class TQSlider;
class LCDRange : public TQVBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
LCDRange( TQWidget *parent=0, const char *name=0 );
diff --git a/tutorial/t12/cannon.cpp b/tutorial/t12/cannon.cpp
index e4552394b..597c54645 100644
--- a/tutorial/t12/cannon.cpp
+++ b/tutorial/t12/cannon.cpp
@@ -180,7 +180,7 @@ TQRect CannonField::shotRect() const
double y = y0 + vely*time - 0.5*gravity*time*time;
TQRect r = TQRect( 0, 0, 6, 6 );
- r.moveCenter( TQPoint( qRound(x), height() - 1 - qRound(y) ) );
+ r.moveCenter( TQPoint( tqRound(x), height() - 1 - tqRound(y) ) );
return r;
}
diff --git a/tutorial/t12/cannon.h b/tutorial/t12/cannon.h
index 33d5accc2..79e58ea38 100644
--- a/tutorial/t12/cannon.h
+++ b/tutorial/t12/cannon.h
@@ -15,7 +15,7 @@ class TQTimer;
class CannonField : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
CannonField( TQWidget *parent=0, const char *name=0 );
diff --git a/tutorial/t12/lcdrange.h b/tutorial/t12/lcdrange.h
index 41bf78fb7..d71bccb38 100644
--- a/tutorial/t12/lcdrange.h
+++ b/tutorial/t12/lcdrange.h
@@ -15,7 +15,7 @@ class TQLabel;
class LCDRange : public TQVBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
LCDRange( TQWidget *parent=0, const char *name=0 );
LCDRange( const char *s, TQWidget *parent=0,
diff --git a/tutorial/t13/cannon.cpp b/tutorial/t13/cannon.cpp
index f97ddd2fe..85a038f0c 100644
--- a/tutorial/t13/cannon.cpp
+++ b/tutorial/t13/cannon.cpp
@@ -206,7 +206,7 @@ TQRect CannonField::shotRect() const
double y = y0 + vely*time - 0.5*gravity*time*time;
TQRect r = TQRect( 0, 0, 6, 6 );
- r.moveCenter( TQPoint( qRound(x), height() - 1 - qRound(y) ) );
+ r.moveCenter( TQPoint( tqRound(x), height() - 1 - tqRound(y) ) );
return r;
}
diff --git a/tutorial/t13/cannon.h b/tutorial/t13/cannon.h
index adb28acdc..f64fd7df2 100644
--- a/tutorial/t13/cannon.h
+++ b/tutorial/t13/cannon.h
@@ -15,7 +15,7 @@ class TQTimer;
class CannonField : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
CannonField( TQWidget *parent=0, const char *name=0 );
diff --git a/tutorial/t13/gamebrd.h b/tutorial/t13/gamebrd.h
index 9ad0cedc3..b409ad16e 100644
--- a/tutorial/t13/gamebrd.h
+++ b/tutorial/t13/gamebrd.h
@@ -20,7 +20,7 @@ class CannonField;
class GameBoard : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
GameBoard( TQWidget *parent=0, const char *name=0 );
diff --git a/tutorial/t13/lcdrange.h b/tutorial/t13/lcdrange.h
index 80738533b..19bd019c4 100644
--- a/tutorial/t13/lcdrange.h
+++ b/tutorial/t13/lcdrange.h
@@ -15,7 +15,7 @@ class TQLabel;
class LCDRange : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
LCDRange( TQWidget *parent=0, const char *name=0 );
LCDRange( const char *s, TQWidget *parent=0, const char *name=0 );
diff --git a/tutorial/t14/cannon.cpp b/tutorial/t14/cannon.cpp
index d181f5b30..37bc274e6 100644
--- a/tutorial/t14/cannon.cpp
+++ b/tutorial/t14/cannon.cpp
@@ -146,7 +146,7 @@ void CannonField::mouseMoveEvent( TQMouseEvent *e )
if ( pnt.y() >= height() )
pnt.setY( height() - 1 );
double rad = atan(((double)rect().bottom()-pnt.y())/pnt.x());
- setAngle( qRound ( rad*180/3.14159265 ) );
+ setAngle( tqRound ( rad*180/3.14159265 ) );
}
@@ -245,7 +245,7 @@ TQRect CannonField::shotRect() const
double y = y0 + vely*time - 0.5*gravity*time*time;
TQRect r = TQRect( 0, 0, 6, 6 );
- r.moveCenter( TQPoint( qRound(x), height() - 1 - qRound(y) ) );
+ r.moveCenter( TQPoint( tqRound(x), height() - 1 - tqRound(y) ) );
return r;
}
diff --git a/tutorial/t14/cannon.h b/tutorial/t14/cannon.h
index f153cadc1..79d2cb571 100644
--- a/tutorial/t14/cannon.h
+++ b/tutorial/t14/cannon.h
@@ -15,7 +15,7 @@ class TQTimer;
class CannonField : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
CannonField( TQWidget *parent=0, const char *name=0 );
diff --git a/tutorial/t14/gamebrd.h b/tutorial/t14/gamebrd.h
index f9e03789d..c264b4b61 100644
--- a/tutorial/t14/gamebrd.h
+++ b/tutorial/t14/gamebrd.h
@@ -20,7 +20,7 @@ class CannonField;
class GameBoard : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
GameBoard( TQWidget *parent=0, const char *name=0 );
diff --git a/tutorial/t14/lcdrange.h b/tutorial/t14/lcdrange.h
index 80738533b..19bd019c4 100644
--- a/tutorial/t14/lcdrange.h
+++ b/tutorial/t14/lcdrange.h
@@ -15,7 +15,7 @@ class TQLabel;
class LCDRange : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
LCDRange( TQWidget *parent=0, const char *name=0 );
LCDRange( const char *s, TQWidget *parent=0, const char *name=0 );
diff --git a/tutorial/t7/lcdrange.h b/tutorial/t7/lcdrange.h
index 7cdc73be5..24ff8d4a6 100644
--- a/tutorial/t7/lcdrange.h
+++ b/tutorial/t7/lcdrange.h
@@ -14,7 +14,7 @@ class TQSlider;
class LCDRange : public TQVBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
LCDRange( TQWidget *parent=0, const char *name=0 );
diff --git a/tutorial/t8/cannon.h b/tutorial/t8/cannon.h
index d7b65975b..d31267719 100644
--- a/tutorial/t8/cannon.h
+++ b/tutorial/t8/cannon.h
@@ -12,7 +12,7 @@
class CannonField : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
CannonField( TQWidget *parent=0, const char *name=0 );
diff --git a/tutorial/t8/lcdrange.h b/tutorial/t8/lcdrange.h
index 2b689a3bf..cbb69b4b7 100644
--- a/tutorial/t8/lcdrange.h
+++ b/tutorial/t8/lcdrange.h
@@ -14,7 +14,7 @@ class TQSlider;
class LCDRange : public TQVBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
LCDRange( TQWidget *parent=0, const char *name=0 );
diff --git a/tutorial/t9/cannon.h b/tutorial/t9/cannon.h
index d7b65975b..d31267719 100644
--- a/tutorial/t9/cannon.h
+++ b/tutorial/t9/cannon.h
@@ -12,7 +12,7 @@
class CannonField : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
CannonField( TQWidget *parent=0, const char *name=0 );
diff --git a/tutorial/t9/lcdrange.h b/tutorial/t9/lcdrange.h
index 2b689a3bf..cbb69b4b7 100644
--- a/tutorial/t9/lcdrange.h
+++ b/tutorial/t9/lcdrange.h
@@ -14,7 +14,7 @@ class TQSlider;
class LCDRange : public TQVBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
LCDRange( TQWidget *parent=0, const char *name=0 );