diff --git a/src/qtgui/reslist.cpp b/src/qtgui/reslist.cpp index db7db0dd..2183e600 100644 --- a/src/qtgui/reslist.cpp +++ b/src/qtgui/reslist.cpp @@ -1,5 +1,5 @@ #ifndef lint -static char rcsid[] = "@(#$Id: reslist.cpp,v 1.22 2007-02-06 10:18:58 dockes Exp $ (C) 2005 J.F.Dockes"; +static char rcsid[] = "@(#$Id: reslist.cpp,v 1.23 2007-02-08 09:03:28 dockes Exp $ (C) 2005 J.F.Dockes"; #endif #include @@ -20,6 +20,7 @@ static char rcsid[] = "@(#$Id: reslist.cpp,v 1.22 2007-02-06 10:18:58 dockes Exp #if (QT_VERSION < 0x040000) #include #else +#include #include #include #include @@ -86,7 +87,12 @@ void ResList::resetSearch() clear(); append("."); clear(); +#if (QT_VERSION < 0x040000) XFlush(qt_xdisplay()); +#else + XFlush(QX11Info::display()); +#endif + } void ResList::languageChange() diff --git a/src/qtgui/uiprefs_w.cpp b/src/qtgui/uiprefs_w.cpp index a1e77e97..3ee317cb 100644 --- a/src/qtgui/uiprefs_w.cpp +++ b/src/qtgui/uiprefs_w.cpp @@ -1,5 +1,5 @@ #ifndef lint -static char rcsid[] = "@(#$Id: uiprefs_w.cpp,v 1.14 2007-01-13 15:21:41 dockes Exp $ (C) 2005 J.F.Dockes"; +static char rcsid[] = "@(#$Id: uiprefs_w.cpp,v 1.15 2007-02-08 09:03:29 dockes Exp $ (C) 2005 J.F.Dockes"; #endif /* * This program is free software; you can redistribute it and/or modify @@ -43,7 +43,6 @@ static char rcsid[] = "@(#$Id: uiprefs_w.cpp,v 1.14 2007-01-13 15:21:41 dockes E #include #include #include -#include < #define QListView Q3ListView #define QCheckListItem Q3CheckListItem #define QFileDialog Q3FileDialog diff --git a/src/qtgui/uiprefs_w.h b/src/qtgui/uiprefs_w.h index 2a7ef6a2..91340e1d 100644 --- a/src/qtgui/uiprefs_w.h +++ b/src/qtgui/uiprefs_w.h @@ -1,4 +1,4 @@ -/* @(#$Id: uiprefs_w.h,v 1.7 2007-01-13 15:21:41 dockes Exp $ (C) 2006 J.F.Dockes */ +/* @(#$Id: uiprefs_w.h,v 1.8 2007-02-08 09:03:29 dockes Exp $ (C) 2006 J.F.Dockes */ /* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ */ #ifndef _UIPREFS_W_H_INCLUDED_ #define _UIPREFS_W_H_INCLUDED_ -/* @(#$Id: uiprefs_w.h,v 1.7 2007-01-13 15:21:41 dockes Exp $ (C) 2005 J.F.Dockes */ +/* @(#$Id: uiprefs_w.h,v 1.8 2007-02-08 09:03:29 dockes Exp $ (C) 2005 J.F.Dockes */ #include #include @@ -37,7 +37,7 @@ public: DummyUIPrefsDialogBase(QWidget* parent = 0) : UIPrefsDialogBase(parent) {} }; #else -class DummyUIPrefsDialogBase : public QDialog, protected Ui::UIPrefsDialogBase +class DummyUIPrefsDialogBase : public QDialog, public Ui::UIPrefsDialogBase { public: DummyUIPrefsDialogBase(QDialog *parent):QDialog(parent) {setupUi(this);} };