summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-10-30 13:51:00 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-10-30 13:51:00 -0500
commit7b29b83606bd46489df68a8e429e62315ea91e28 (patch)
tree1e5749bf814f19ac3ea7653a19070037fcd6f907
parent756f3ebf21133d298ece3e8f1f52029ee40b5252 (diff)
downloadtdegames-7b29b83606bd46489df68a8e429e62315ea91e28.tar.gz
tdegames-7b29b83606bd46489df68a8e429e62315ea91e28.zip
Fix FTBFS on TQt3
-rw-r--r--kbounce/Makefile.am2
-rw-r--r--libtdegames/kgameprogress.h12
2 files changed, 7 insertions, 7 deletions
diff --git a/kbounce/Makefile.am b/kbounce/Makefile.am
index a2049744..78a19e48 100644
--- a/kbounce/Makefile.am
+++ b/kbounce/Makefile.am
@@ -13,7 +13,7 @@ KDE_CXXFLAGS = $(KDE_USE_FPIE)
bin_PROGRAMS = kbounce
kbounce_SOURCES = main.cpp kbounce.cpp game.cpp highscores.cpp
kbounce_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KDE_USE_PIE) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
-kbounce_LDADD = $(LIB_TDEGAMES) $(LIB_KFILE) $(LIB_ARTS) $(artslib)
+kbounce_LDADD = $(LIB_TDEGAMES) $(LIB_KFILE) $(LIB_ARTS) $(artslib) -lmcop
kbounce_DEPENDENCIES = $(LIB_TDEGAMES_DEP)
xdg_apps_DATA = kbounce.desktop
diff --git a/libtdegames/kgameprogress.h b/libtdegames/kgameprogress.h
index d337ec22..6aa987fb 100644
--- a/libtdegames/kgameprogress.h
+++ b/libtdegames/kgameprogress.h
@@ -56,7 +56,7 @@ class KDE_EXPORT KGameProgress : public TQFrame, public TQRangeControl
TQ_PROPERTY( BarStyle barStyle READ barStyle WRITE setBarStyle )
TQ_PROPERTY( TQColor barColor READ barColor WRITE setBarColor )
TQ_PROPERTY( TQPixmap barPixmap READ barPixmap WRITE setBarPixmap )
- TQ_PROPERTY( Qt::Orientation orientation READ orientation WRITE setOrientation )
+ TQ_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
TQ_PROPERTY( bool textEnabled READ textEnabled WRITE setTextEnabled )
public:
@@ -76,12 +76,12 @@ public:
/**
* Construct a progress bar with orientation @p orient.
*/
- KGameProgress(Qt::Orientation orient, TQWidget *parent=0, const char *name=0);
+ KGameProgress(Orientation orient, TQWidget *parent=0, const char *name=0);
/**
* Construct a progress bar with minimum, maximum and initial values.
*/
- KGameProgress(int minValue, int maxValue, int value, Qt::Orientation,
+ KGameProgress(int minValue, int maxValue, int value, Orientation,
TQWidget *parent=0, const char *name=0);
/**
@@ -111,7 +111,7 @@ public:
*
* Allowed values are @pQt::Horizontal and @pQt::Vertical.
*/
- void setOrientation(Qt::Orientation);
+ void setOrientation(Orientation);
/**
* If this is set to @p true, the progress text will be displayed.
@@ -150,7 +150,7 @@ public:
*
* @see setOrientation()
*/
- Qt::Orientation orientation() const;
+ Orientation orientation() const;
/**
* Returns @p true if progress text will be displayed,
@@ -240,7 +240,7 @@ private:
TQColor text_color;
TQRect fr;
BarStyle bar_style;
- Qt::Orientation orient;
+ Orientation orient;
bool text_enabled;
TQString format_;
void initialize();