tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

qt4 compilation glitches

Browse Source
This commit is contained in:
dockes 2007-02-08 09:03:29 +00:00
parent 78205fc5fe
commit 91f6467a9c
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qtgui/reslist.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #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 #endif
#include <time.h> #include <time.h>
@ -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) #if (QT_VERSION < 0x040000)
#include <qpopupmenu.h> #include <qpopupmenu.h>
#else #else
#include <qx11info_x11.h>
#include <q3popupmenu.h> #include <q3popupmenu.h>
#include <q3stylesheet.h> #include <q3stylesheet.h>
#include <q3mimefactory.h> #include <q3mimefactory.h>
@ -86,7 +87,12 @@ void ResList::resetSearch()
clear(); clear();
append("."); append(".");
clear(); clear();
#if (QT_VERSION < 0x040000)
XFlush(qt_xdisplay()); XFlush(qt_xdisplay());
#else
XFlush(QX11Info::display());
#endif
} }
void ResList::languageChange() void ResList::languageChange()

3
src/qtgui/uiprefs_w.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #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 #endif
/* /*
* This program is free software; you can redistribute it and/or modify * 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 <q3listbox.h> #include <q3listbox.h>
#include <q3listview.h> #include <q3listview.h>
#include <q3filedialog.h> #include <q3filedialog.h>
#include <
#define QListView Q3ListView #define QListView Q3ListView
#define QCheckListItem Q3CheckListItem #define QCheckListItem Q3CheckListItem
#define QFileDialog Q3FileDialog #define QFileDialog Q3FileDialog

6
src/qtgui/uiprefs_w.h
View File

@ -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 * 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 * it under the terms of the GNU General Public License as published by
@ -17,7 +17,7 @@
*/ */
#ifndef _UIPREFS_W_H_INCLUDED_ #ifndef _UIPREFS_W_H_INCLUDED_
#define _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 <qvariant.h> #include <qvariant.h>
#include <qdialog.h> #include <qdialog.h>
@ -37,7 +37,7 @@ public: DummyUIPrefsDialogBase(QWidget* parent = 0)
: UIPrefsDialogBase(parent) {} : UIPrefsDialogBase(parent) {}
}; };
#else #else
class DummyUIPrefsDialogBase : public QDialog, protected Ui::UIPrefsDialogBase class DummyUIPrefsDialogBase : public QDialog, public Ui::UIPrefsDialogBase
{ {
public: DummyUIPrefsDialogBase(QDialog *parent):QDialog(parent) {setupUi(this);} public: DummyUIPrefsDialogBase(QDialog *parent):QDialog(parent) {setupUi(this);}
}; };