diff options
| author | Reuben Thomas <rrt@sc3d.org> | 2005-05-16 18:59:03 +0000 |
|---|---|---|
| committer | Reuben Thomas <rrt@sc3d.org> | 2005-05-16 18:59:03 +0000 |
| commit | cb1800397460694106137fced4aca720f48d0d42 (patch) | |
| tree | c95ee68a172e5fa7a25987440865720737b1e9a1 | |
| parent | 4725c195ec7afdc4f047489fedb5676ce4e14816 (diff) | |
| download | plptools-cb1800397460694106137fced4aca720f48d0d42.tar.gz plptools-cb1800397460694106137fced4aca720f48d0d42.tar.bz2 plptools-cb1800397460694106137fced4aca720f48d0d42.zip | |
Enable --enable-kde in Makefile.cvs again.
qlist.h --> qptrlist.h
Remove #include <qobjcoll.h> from sample Qt program in
KDE_PRINT_QT_PROGRAM.m4
Fix configure.in.in not to call PLP_CHECK_COMPILERS, which isn't
needed any more (and didn't work).
| -rw-r--r-- | Makefile.cvs | 2 | ||||
| -rw-r--r-- | conf/configure.in.in | 1 | ||||
| -rw-r--r-- | conf/m4/kde/KDE_PRINT_QT_PROGRAM.m4 | 2 | ||||
| -rw-r--r-- | kde2/plugins/pie3dwidget.h | 18 | ||||
| -rw-r--r-- | kde2/plugins/plpprops.h | 2 |
5 files changed, 11 insertions, 14 deletions
diff --git a/Makefile.cvs b/Makefile.cvs index 2ce10c3..dbeb33d 100644 --- a/Makefile.cvs +++ b/Makefile.cvs @@ -31,7 +31,7 @@ devel: $(GETTEXT) $(LIBTOOLFILES) $(AUTOMAKEFILES) dist: $(GETTEXT) $(LIBTOOLFILES) $(AUTOMAKEFILES) autoconf touch include/stamp-h.in - ./configure # --enable-kde + ./configure --enable-kde $(MAKE) dist htmldoc: diff --git a/conf/configure.in.in b/conf/configure.in.in index c384b51..eeecc3f 100644 --- a/conf/configure.in.in +++ b/conf/configure.in.in @@ -3,7 +3,6 @@ AC_REVISION($Revision$)dnl revision of this configure.in script AC_INIT(Makefile.am) AC_CONFIG_AUX_DIR(conf) AC_CANONICAL_SYSTEM -PLP_CHECK_COMPILERS AM_CONFIG_HEADER(include/config.h) AM_INIT_AUTOMAKE(plptools, 0.13) AM_PROG_LIBTOOL diff --git a/conf/m4/kde/KDE_PRINT_QT_PROGRAM.m4 b/conf/m4/kde/KDE_PRINT_QT_PROGRAM.m4 index 0af7fad..8bbd3df 100644 --- a/conf/m4/kde/KDE_PRINT_QT_PROGRAM.m4 +++ b/conf/m4/kde/KDE_PRINT_QT_PROGRAM.m4 @@ -4,8 +4,6 @@ AC_DEFUN([KDE_PRINT_QT_PROGRAM],[ #include "confdefs.h" #include <qglobal.h> #include <qapplication.h> - #include <qapp.h> - #include <qobjcoll.h> EOF if test "$kde_qtver" = "2"; then cat >> conftest.$ac_ext <<-EOF diff --git a/kde2/plugins/pie3dwidget.h b/kde2/plugins/pie3dwidget.h index cda0868..d269989 100644 --- a/kde2/plugins/pie3dwidget.h +++ b/kde2/plugins/pie3dwidget.h @@ -17,14 +17,14 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * Pie3DWidget was inspired by Christian Poulter's KDiskFree - * + * ****************************************************************************/ #ifndef __PIE3DWIDGET_H #define __PIE3DWIDGET_H #include <qwidget.h> -#include <qlist.h> +#include <qptrlist.h> #include "pie3dpiece.h" @@ -32,22 +32,22 @@ class Pie3DWidget : public QWidget { public: - + Pie3DWidget(QWidget *parent = 0L, const char *name = 0L); ~Pie3DWidget() {} - + void addPiece(int size, const QColor&); - + virtual int heightForWidth(int w) const; virtual QSize minimumSizeHint() const; virtual QSize sizeHint() const; - + protected: - + virtual void paintEvent(QPaintEvent *); - + private: - + int _totalsize; QList<Pie3DPiece> _piecelist; }; diff --git a/kde2/plugins/plpprops.h b/kde2/plugins/plpprops.h index 38c1463..07c53a7 100644 --- a/kde2/plugins/plpprops.h +++ b/kde2/plugins/plpprops.h @@ -25,7 +25,7 @@ #define _PLPPROPS_H_ #include <qstring.h> -#include <qlist.h> +#include <qptrlist.h> #include <qgroupbox.h> #include <qmultilineedit.h> |