Fix FTBFS on TQt3

(cherry picked from commit 7b29b83606)
v3.5.13-sru
Timothy Pearson 12 years ago committed by Slávek Banko
parent 787c8d6168
commit 0ea1dc87b0

@ -13,7 +13,7 @@ KDE_CXXFLAGS = $(KDE_USE_FPIE)
bin_PROGRAMS = kbounce bin_PROGRAMS = kbounce
kbounce_SOURCES = main.cpp kbounce.cpp game.cpp highscores.cpp kbounce_SOURCES = main.cpp kbounce.cpp game.cpp highscores.cpp
kbounce_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KDE_USE_PIE) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) kbounce_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KDE_USE_PIE) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI)
kbounce_LDADD = $(LIB_KDEGAMES) $(LIB_KFILE) $(LIB_ARTS) $(artslib) kbounce_LDADD = $(LIB_KDEGAMES) $(LIB_KFILE) $(LIB_ARTS) $(artslib) -lmcop
kbounce_DEPENDENCIES = $(LIB_KDEGAMES_DEP) kbounce_DEPENDENCIES = $(LIB_KDEGAMES_DEP)
xdg_apps_DATA = kbounce.desktop xdg_apps_DATA = kbounce.desktop

@ -56,7 +56,7 @@ class KDE_EXPORT KGameProgress : public TQFrame, public TQRangeControl
TQ_PROPERTY( BarStyle barStyle READ barStyle WRITE setBarStyle ) TQ_PROPERTY( BarStyle barStyle READ barStyle WRITE setBarStyle )
TQ_PROPERTY( TQColor barColor READ barColor WRITE setBarColor ) TQ_PROPERTY( TQColor barColor READ barColor WRITE setBarColor )
TQ_PROPERTY( TQPixmap barPixmap READ barPixmap WRITE setBarPixmap ) 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 ) TQ_PROPERTY( bool textEnabled READ textEnabled WRITE setTextEnabled )
public: public:
@ -76,12 +76,12 @@ public:
/** /**
* Construct a progress bar with orientation @p orient. * 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. * 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); TQWidget *parent=0, const char *name=0);
/** /**
@ -111,7 +111,7 @@ public:
* *
* Allowed values are @pQt::Horizontal and @pQt::Vertical. * 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. * If this is set to @p true, the progress text will be displayed.
@ -150,7 +150,7 @@ public:
* *
* @see setOrientation() * @see setOrientation()
*/ */
Qt::Orientation orientation() const; Orientation orientation() const;
/** /**
* Returns @p true if progress text will be displayed, * Returns @p true if progress text will be displayed,
@ -240,7 +240,7 @@ private:
TQColor text_color; TQColor text_color;
TQRect fr; TQRect fr;
BarStyle bar_style; BarStyle bar_style;
Qt::Orientation orient; Orientation orient;
bool text_enabled; bool text_enabled;
TQString format_; TQString format_;
void initialize(); void initialize();

Loading…
Cancel
Save