Re: [patch] remove qt2 support
Am Samstag, 18. März 2006 14:22 schrieb Georg Baum: Am Freitag, 17. März 2006 21:42 schrieb Leuven, E.: if qt2 goes, the attached should go (in) as well i think (i.e. remove qgridview.[Ch]) You are right. I did not know that we had these classes! The full patch would look like the attached. Dou you have commit privileges now, or should I commit it for you? I removed qgridview.[Ch] now. Georg
Re: [patch] remove qt2 support
Am Samstag, 18. März 2006 14:22 schrieb Georg Baum: > Am Freitag, 17. März 2006 21:42 schrieb Leuven, E.: > > if qt2 goes, the attached should go (in) as well i think (i.e. remove > qgridview.[Ch]) > > You are right. I did not know that we had these classes! The full patch > would look like the attached. Dou you have commit privileges now, or > should I commit it for you? I removed qgridview.[Ch] now. Georg
Re: [patch] remove qt2 support
Am Freitag, 17. März 2006 21:42 schrieb Leuven, E.:
if qt2 goes, the attached should go (in) as well i think (i.e. remove
qgridview.[Ch])
You are right. I did not know that we had these classes! The full patch
would look like the attached. Dou you have commit privileges now, or
should I commit it for you?
Georg
Index: src/frontends/qt2/qgridview.h
===
--- src/frontends/qt2/qgridview.h (Revision 13415)
+++ src/frontends/qt2/qgridview.h (Arbeitskopie)
@@ -1,134 +0,0 @@
-/**
-** $Id: qgridview.h,v 1.3 2004/12/14 11:05:44 leeming Exp $
-**
-** Definition of QGridView class
-**
-** Created: 2001.05.23
-**
-** Copyright (C) 1992-2001 Trolltech AS. All rights reserved.
-**
-** This file is part of the widgets module of the Qt GUI Toolkit.
-**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
-** Agreement provided with the Software.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/pricing.html or email [EMAIL PROTECTED] for
-** information about Qt Commercial License Agreements.
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact [EMAIL PROTECTED] if any conditions of this licensing are
-** not clear to you.
-**
-**/
-
-#ifndef QGRIDVIEW_H
-#define QGRIDVIEW_H
-
-#include qscrollview.h
-
-#ifndef QT_NO_GRIDVIEW
-
-class QGridViewPrivate;
-
-class QGridView : public QScrollView
-{
-Q_OBJECT
-Q_PROPERTY( int numRows READ numRows WRITE setNumRows )
-Q_PROPERTY( int numCols READ numCols WRITE setNumCols )
-Q_PROPERTY( int cellWidth READ cellWidth WRITE setCellWidth )
-Q_PROPERTY( int cellHeight READ cellHeight WRITE setCellHeight )
-public:
-
-QGridView( QWidget *parent=0, const char *name=0, WFlags f=0 );
- ~QGridView();
-
-int numRows() const;
-virtual void setNumRows( int );
-int numCols() const;
-virtual void setNumCols( int );
-
-int cellWidth() const;
-virtual void setCellWidth( int );
-int cellHeight() const;
-virtual void setCellHeight( int );
-
-QRect cellRect() const;
-QRect cellGeometry( int row, int column );
-QSize gridSize() const;
-
-int rowAt( int y ) const;
-int columnAt( int x ) const;
-
-void repaintCell( int row, int column, bool erase=TRUE );
-void updateCell( int row, int column );
-void ensureCellVisible( int row, int column );
-
-protected:
-virtual void paintCell( QPainter *, int row, int col ) = 0;
-virtual void paintEmptyArea( QPainter *p, int cx, int cy, int cw, int ch );
-
-void drawContents( QPainter *p, int cx, int cy, int cw, int ch );
-
-virtual void dimensionChange( int, int );
-
-private:
-void drawContents( QPainter* );
-void updateGrid();
-
-int nrows;
-int ncols;
-int cellw;
-int cellh;
-QGridViewPrivate* d;
-
-private: // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
-QGridView( const QGridView );
-QGridView operator=( const QGridView );
-#endif
-};
-
-inline int QGridView::cellWidth() const
-{ return cellw; }
-
-inline int QGridView::cellHeight() const
-{ return cellh; }
-
-inline int QGridView::rowAt( int y ) const
-{ return y / cellh; }
-
-inline int QGridView::columnAt( int x ) const
-{ return x / cellw; }
-
-inline int QGridView::numRows() const
-{ return nrows; }
-
-inline int QGridView::numCols() const
-{return ncols; }
-
-inline QRect QGridView::cellRect() const
-{ return QRect( 0, 0, cellw, cellh ); }
-
-inline QSize QGridView::gridSize() const
-{ return QSize( ncols * cellw, nrows * cellh ); }
-
-
-
-#endif // QT_NO_GRIDVIEW
-
-
-#endif // QTABLEVIEW_H
Index: src/frontends/qt2/Makefile.dialogs
===
--- src/frontends/qt2/Makefile.dialogs (Revision 13415)
+++ src/frontends/qt2/Makefile.dialogs (Arbeitskopie)
@@ -97,7 +97,6 @@ MOCFILES = \
QExternalDialog.C QExternalDialog.h \
QFloatDialog.C QFloatDialog.h \
QGraphicsDialog.C QGraphicsDialog.h \
- qgridview.C qgridview.h \
QIncludeDialog.C QIncludeDialog.h \
QIndexDialog.C QIndexDialog.h \
Re: [patch] remove qt2 support
Am Freitag, 17. März 2006 21:42 schrieb Leuven, E.:
> if qt2 goes, the attached should go (in) as well i think (i.e. remove
qgridview.[Ch])
You are right. I did not know that we had these classes! The full patch
would look like the attached. Dou you have commit privileges now, or
should I commit it for you?
Georg
Index: src/frontends/qt2/qgridview.h
===
--- src/frontends/qt2/qgridview.h (Revision 13415)
+++ src/frontends/qt2/qgridview.h (Arbeitskopie)
@@ -1,134 +0,0 @@
-/**
-** $Id: qgridview.h,v 1.3 2004/12/14 11:05:44 leeming Exp $
-**
-** Definition of QGridView class
-**
-** Created: 2001.05.23
-**
-** Copyright (C) 1992-2001 Trolltech AS. All rights reserved.
-**
-** This file is part of the widgets module of the Qt GUI Toolkit.
-**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
-** Agreement provided with the Software.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/pricing.html or email [EMAIL PROTECTED] for
-** information about Qt Commercial License Agreements.
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact [EMAIL PROTECTED] if any conditions of this licensing are
-** not clear to you.
-**
-**/
-
-#ifndef QGRIDVIEW_H
-#define QGRIDVIEW_H
-
-#include
-
-#ifndef QT_NO_GRIDVIEW
-
-class QGridViewPrivate;
-
-class QGridView : public QScrollView
-{
-Q_OBJECT
-Q_PROPERTY( int numRows READ numRows WRITE setNumRows )
-Q_PROPERTY( int numCols READ numCols WRITE setNumCols )
-Q_PROPERTY( int cellWidth READ cellWidth WRITE setCellWidth )
-Q_PROPERTY( int cellHeight READ cellHeight WRITE setCellHeight )
-public:
-
-QGridView( QWidget *parent=0, const char *name=0, WFlags f=0 );
- ~QGridView();
-
-int numRows() const;
-virtual void setNumRows( int );
-int numCols() const;
-virtual void setNumCols( int );
-
-int cellWidth() const;
-virtual void setCellWidth( int );
-int cellHeight() const;
-virtual void setCellHeight( int );
-
-QRect cellRect() const;
-QRect cellGeometry( int row, int column );
-QSize gridSize() const;
-
-int rowAt( int y ) const;
-int columnAt( int x ) const;
-
-void repaintCell( int row, int column, bool erase=TRUE );
-void updateCell( int row, int column );
-void ensureCellVisible( int row, int column );
-
-protected:
-virtual void paintCell( QPainter *, int row, int col ) = 0;
-virtual void paintEmptyArea( QPainter *p, int cx, int cy, int cw, int ch );
-
-void drawContents( QPainter *p, int cx, int cy, int cw, int ch );
-
-virtual void dimensionChange( int, int );
-
-private:
-void drawContents( QPainter* );
-void updateGrid();
-
-int nrows;
-int ncols;
-int cellw;
-int cellh;
-QGridViewPrivate* d;
-
-private: // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
-QGridView( const QGridView & );
-QGridView =( const QGridView & );
-#endif
-};
-
-inline int QGridView::cellWidth() const
-{ return cellw; }
-
-inline int QGridView::cellHeight() const
-{ return cellh; }
-
-inline int QGridView::rowAt( int y ) const
-{ return y / cellh; }
-
-inline int QGridView::columnAt( int x ) const
-{ return x / cellw; }
-
-inline int QGridView::numRows() const
-{ return nrows; }
-
-inline int QGridView::numCols() const
-{return ncols; }
-
-inline QRect QGridView::cellRect() const
-{ return QRect( 0, 0, cellw, cellh ); }
-
-inline QSize QGridView::gridSize() const
-{ return QSize( ncols * cellw, nrows * cellh ); }
-
-
-
-#endif // QT_NO_GRIDVIEW
-
-
-#endif // QTABLEVIEW_H
Index: src/frontends/qt2/Makefile.dialogs
===
--- src/frontends/qt2/Makefile.dialogs (Revision 13415)
+++ src/frontends/qt2/Makefile.dialogs (Arbeitskopie)
@@ -97,7 +97,6 @@ MOCFILES = \
QExternalDialog.C QExternalDialog.h \
QFloatDialog.C QFloatDialog.h \
QGraphicsDialog.C QGraphicsDialog.h \
- qgridview.C qgridview.h \
QIncludeDialog.C QIncludeDialog.h \
QIndexDialog.C QIndexDialog.h \
QLogDialog.C
[patch] remove qt2 support
This patch removes qt2 support as discussed two weeks ago. It does not
touch the ui files, these should IMHO only be converted if they are
edited anyway. It does neither remove deprecated function calls, e.g.
QApplication::clipboard()-setSelectionMode(true|false). We should/need
only do that in the qt4 frontend.
It was also discussed to rename the qt2 directory to qt3, but I am not
sure whether we should do that, it might have unforeseen side effects.
Opinions?
This patch is going in trunk now.
Georg
Log:
Remove qt2 support in the following files:
* src/frontends/qt2/qt_helpers.C
(makeFontName):
* src/frontends/qt2/QWorkArea.C
(QWorkArea::haveSelection):
(QWorkArea::haveSelection):
(QWorkArea::getClipboard):
* src/frontends/qt2/panelstack.C
(PanelStack::PanelStack):
* src/frontends/qt4/qt_helpers.C
(makeFontName):
* README: remove notice about qt2
* config/qt.m4: make 3.0 the minimum required qt version
Index: src/frontends/qt2/qt_helpers.C
===
--- src/frontends/qt2/qt_helpers.C (Revision 13413)
+++ src/frontends/qt2/qt_helpers.C (Arbeitskopie)
@@ -38,29 +38,17 @@ string makeFontName(string const famil
{
if (foundry.empty())
return family;
-#if QT_VERSION = 300
return family + [ + foundry + ']';
-#else
- return foundry + '-' + family;
-#endif
}
pairstring,string parseFontName(string const name)
{
-#if QT_VERSION = 300
string::size_type const idx = name.find('[');
if (idx == string::npos || idx == 0)
return make_pair(name, string());
return make_pair(name.substr(0, idx - 1),
name.substr(idx + 1, name.size() - idx - 2));
-#else
- string::size_type const idx = name.find('-');
- if (idx == string::npos || idx == 0)
- return make_pair(name, string());
- return make_pair(name.substr(idx + 1),
- name.substr(0, idx));
-#endif
}
Index: src/frontends/qt2/QWorkArea.C
===
--- src/frontends/qt2/QWorkArea.C (Revision 13413)
+++ src/frontends/qt2/QWorkArea.C (Arbeitskopie)
@@ -184,7 +184,6 @@ void QWorkArea::haveSelection(bool own)
{
wa_ptr = this;
-#if QT_VERSION = 300
if (!QApplication::clipboard()-supportsSelection())
return;
@@ -194,15 +193,12 @@ void QWorkArea::haveSelection(bool own)
}
// We don't need to do anything if own = false, as this case is
// handled by QT.
-#endif
}
string const QWorkArea::getClipboard() const
{
-#if QT_VERSION = 300
QApplication::clipboard()-setSelectionMode(true);
-#endif
QString str = QApplication::clipboard()-text();
if (str.isNull())
return string();
@@ -217,9 +213,7 @@ string const QWorkArea::getClipboard() c
void QWorkArea::putClipboard(string const str) const
{
-#if QT_VERSION = 300
QApplication::clipboard()-setSelectionMode(true);
-#endif
#ifdef Q_OS_MAC
// The MAC clipboard uses \r for lineendings, and we use \n
QApplication::clipboard()-setText(toqstr(subst(str, '\n', '\r')));
Index: src/frontends/qt2/panelstack.C
===
--- src/frontends/qt2/panelstack.C (Revision 13413)
+++ src/frontends/qt2/panelstack.C (Arbeitskopie)
@@ -37,9 +37,7 @@ PanelStack::PanelStack(QWidget * parent,
list_-setVScrollBarMode(QScrollView::AlwaysOff);
list_-addColumn();
list_-setColumnWidthMode(0, QListView::Maximum);
-#if QT_VERSION = 300
list_-setResizeMode(QListView::AllColumns);
-#endif
list_-setRootIsDecorated(true);
QWidget * w = static_castQWidget*(list_-child(list view header));
if (w)
Index: src/frontends/qt4/qt_helpers.C
===
--- src/frontends/qt4/qt_helpers.C (Revision 13413)
+++ src/frontends/qt4/qt_helpers.C (Arbeitskopie)
@@ -38,29 +38,17 @@ string makeFontName(string const famil
{
if (foundry.empty())
return family;
-#if QT_VERSION = 300
return family + [ + foundry + ']';
-#else
- return foundry + '-' + family;
-#endif
}
pairstring,string parseFontName(string const name)
{
-#if QT_VERSION = 300
string::size_type const idx = name.find('[');
if (idx == string::npos || idx == 0)
return make_pair(name, string());
return make_pair(name.substr(0, idx - 1),
name.substr(idx + 1, name.size() - idx - 2));
-#else
- string::size_type const idx = name.find('-');
- if (idx == string::npos || idx == 0)
- return make_pair(name, string());
- return make_pair(name.substr(idx + 1),
- name.substr(0, idx));
-#endif
}
Index: README
===
--- README (Revision 13413)
+++ README (Arbeitskopie)
@@ -83,8 +83,7 @@ What do I need to compile LyX from the s
* LibXpm, version 4.7 or newer.
Or:
-* The Qt library, version 3.0 or newer (although version 2.3
-may work).
+* The Qt library, version 3.0 or newer.
Read the file
Re: [patch] remove qt2 support
Georg Baum [EMAIL PROTECTED] writes: | This patch removes qt2 support as discussed two weeks ago. It does not | touch the ui files, these should IMHO only be converted if they are | edited anyway. It does neither remove deprecated function calls, e.g. | QApplication::clipboard()-setSelectionMode(true|false). We should/need | only do that in the qt4 frontend. | It was also discussed to rename the qt2 directory to qt3, but I am not | sure whether we should do that, it might have unforeseen side effects. | Opinions? | | This patch is going in trunk now. patch ok. I think we should rename the qt2 dir as well, I will handle that. -- Lgb
RE: [patch] remove qt2 support
Title: RE: [patch] remove qt2 support
if qt2 goes, the attached should go (in) as well i think (i.e. remove qgridview.[Ch])
edwin
Index: qgridview.h
===
--- qgridview.h (revision 13415)
+++ qgridview.h (working copy)
@@ -1,134 +0,0 @@
-/**
-** $Id: qgridview.h,v 1.3 2004/12/14 11:05:44 leeming Exp $
-**
-** Definition of QGridView class
-**
-** Created: 2001.05.23
-**
-** Copyright (C) 1992-2001 Trolltech AS. All rights reserved.
-**
-** This file is part of the widgets module of the Qt GUI Toolkit.
-**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
-** Agreement provided with the Software.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/pricing.html or email [EMAIL PROTECTED] for
-** information about Qt Commercial License Agreements.
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact [EMAIL PROTECTED] if any conditions of this licensing are
-** not clear to you.
-**
-**/
-
-#ifndef QGRIDVIEW_H
-#define QGRIDVIEW_H
-
-#include qscrollview.h
-
-#ifndef QT_NO_GRIDVIEW
-
-class QGridViewPrivate;
-
-class QGridView : public QScrollView
-{
-Q_OBJECT
-Q_PROPERTY( int numRows READ numRows WRITE setNumRows )
-Q_PROPERTY( int numCols READ numCols WRITE setNumCols )
-Q_PROPERTY( int cellWidth READ cellWidth WRITE setCellWidth )
-Q_PROPERTY( int cellHeight READ cellHeight WRITE setCellHeight )
-public:
-
-QGridView( QWidget *parent=0, const char *name=0, WFlags f=0 );
- ~QGridView();
-
-int numRows() const;
-virtual void setNumRows( int );
-int numCols() const;
-virtual void setNumCols( int );
-
-int cellWidth() const;
-virtual void setCellWidth( int );
-int cellHeight() const;
-virtual void setCellHeight( int );
-
-QRect cellRect() const;
-QRect cellGeometry( int row, int column );
-QSize gridSize() const;
-
-int rowAt( int y ) const;
-int columnAt( int x ) const;
-
-void repaintCell( int row, int column, bool erase=TRUE );
-void updateCell( int row, int column );
-void ensureCellVisible( int row, int column );
-
-protected:
-virtual void paintCell( QPainter *, int row, int col ) = 0;
-virtual void paintEmptyArea( QPainter *p, int cx, int cy, int cw, int ch );
-
-void drawContents( QPainter *p, int cx, int cy, int cw, int ch );
-
-virtual void dimensionChange( int, int );
-
-private:
-void drawContents( QPainter* );
-void updateGrid();
-
-int nrows;
-int ncols;
-int cellw;
-int cellh;
-QGridViewPrivate* d;
-
-private: // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
-QGridView( const QGridView );
-QGridView operator=( const QGridView );
-#endif
-};
-
-inline int QGridView::cellWidth() const
-{ return cellw; }
-
-inline int QGridView::cellHeight() const
-{ return cellh; }
-
-inline int QGridView::rowAt( int y ) const
-{ return y / cellh; }
-
-inline int QGridView::columnAt( int x ) const
-{ return x / cellw; }
-
-inline int QGridView::numRows() const
-{ return nrows; }
-
-inline int QGridView::numCols() const
-{return ncols; }
-
-inline QRect QGridView::cellRect() const
-{ return QRect( 0, 0, cellw, cellh ); }
-
-inline QSize QGridView::gridSize() const
-{ return QSize( ncols * cellw, nrows * cellh ); }
-
-
-
-#endif // QT_NO_GRIDVIEW
-
-
-#endif // QTABLEVIEW_H
Index: Makefile.dialogs
===
--- Makefile.dialogs (revision 13415)
+++ Makefile.dialogs (working copy)
@@ -97,7 +97,6 @@
QExternalDialog.C QExternalDialog.h \
QFloatDialog.C QFloatDialog.h \
QGraphicsDialog.C QGraphicsDialog.h \
- qgridview.C qgridview.h \
QIncludeDialog.C QIncludeDialog.h \
QIndexDialog.C QIndexDialog.h \
QLogDialog.C QLogDialog.h \
Index: QBrowseBox.h
===
--- QBrowseBox.h (revision 13415)
+++ QBrowseBox.h (working copy)
@@ -12,7 +12,7 @@
#ifndef QBROWSEBOX_H
#define QBROWSEBOX_H
-#include qgridview.h
+#include qgridview.h
class
[patch] remove qt2 support
This patch removes qt2 support as discussed two weeks ago. It does not
touch the ui files, these should IMHO only be converted if they are
edited anyway. It does neither remove deprecated function calls, e.g.
QApplication::clipboard()->setSelectionMode(true|false). We should/need
only do that in the qt4 frontend.
It was also discussed to rename the qt2 directory to qt3, but I am not
sure whether we should do that, it might have unforeseen side effects.
Opinions?
This patch is going in trunk now.
Georg
Log:
Remove qt2 support in the following files:
* src/frontends/qt2/qt_helpers.C
(makeFontName):
* src/frontends/qt2/QWorkArea.C
(QWorkArea::haveSelection):
(QWorkArea::haveSelection):
(QWorkArea::getClipboard):
* src/frontends/qt2/panelstack.C
(PanelStack::PanelStack):
* src/frontends/qt4/qt_helpers.C
(makeFontName):
* README: remove notice about qt2
* config/qt.m4: make 3.0 the minimum required qt version
Index: src/frontends/qt2/qt_helpers.C
===
--- src/frontends/qt2/qt_helpers.C (Revision 13413)
+++ src/frontends/qt2/qt_helpers.C (Arbeitskopie)
@@ -38,29 +38,17 @@ string makeFontName(string const & famil
{
if (foundry.empty())
return family;
-#if QT_VERSION >= 300
return family + " [" + foundry + ']';
-#else
- return foundry + '-' + family;
-#endif
}
pair parseFontName(string const & name)
{
-#if QT_VERSION >= 300
string::size_type const idx = name.find('[');
if (idx == string::npos || idx == 0)
return make_pair(name, string());
return make_pair(name.substr(0, idx - 1),
name.substr(idx + 1, name.size() - idx - 2));
-#else
- string::size_type const idx = name.find('-');
- if (idx == string::npos || idx == 0)
- return make_pair(name, string());
- return make_pair(name.substr(idx + 1),
- name.substr(0, idx));
-#endif
}
Index: src/frontends/qt2/QWorkArea.C
===
--- src/frontends/qt2/QWorkArea.C (Revision 13413)
+++ src/frontends/qt2/QWorkArea.C (Arbeitskopie)
@@ -184,7 +184,6 @@ void QWorkArea::haveSelection(bool own)
{
wa_ptr = this;
-#if QT_VERSION >= 300
if (!QApplication::clipboard()->supportsSelection())
return;
@@ -194,15 +193,12 @@ void QWorkArea::haveSelection(bool own)
}
// We don't need to do anything if own = false, as this case is
// handled by QT.
-#endif
}
string const QWorkArea::getClipboard() const
{
-#if QT_VERSION >= 300
QApplication::clipboard()->setSelectionMode(true);
-#endif
QString str = QApplication::clipboard()->text();
if (str.isNull())
return string();
@@ -217,9 +213,7 @@ string const QWorkArea::getClipboard() c
void QWorkArea::putClipboard(string const & str) const
{
-#if QT_VERSION >= 300
QApplication::clipboard()->setSelectionMode(true);
-#endif
#ifdef Q_OS_MAC
// The MAC clipboard uses \r for lineendings, and we use \n
QApplication::clipboard()->setText(toqstr(subst(str, '\n', '\r')));
Index: src/frontends/qt2/panelstack.C
===
--- src/frontends/qt2/panelstack.C (Revision 13413)
+++ src/frontends/qt2/panelstack.C (Arbeitskopie)
@@ -37,9 +37,7 @@ PanelStack::PanelStack(QWidget * parent,
list_->setVScrollBarMode(QScrollView::AlwaysOff);
list_->addColumn("");
list_->setColumnWidthMode(0, QListView::Maximum);
-#if QT_VERSION >= 300
list_->setResizeMode(QListView::AllColumns);
-#endif
list_->setRootIsDecorated(true);
QWidget * w = static_cast(list_->child("list view header"));
if (w)
Index: src/frontends/qt4/qt_helpers.C
===
--- src/frontends/qt4/qt_helpers.C (Revision 13413)
+++ src/frontends/qt4/qt_helpers.C (Arbeitskopie)
@@ -38,29 +38,17 @@ string makeFontName(string const & famil
{
if (foundry.empty())
return family;
-#if QT_VERSION >= 300
return family + " [" + foundry + ']';
-#else
- return foundry + '-' + family;
-#endif
}
pair parseFontName(string const & name)
{
-#if QT_VERSION >= 300
string::size_type const idx = name.find('[');
if (idx == string::npos || idx == 0)
return make_pair(name, string());
return make_pair(name.substr(0, idx - 1),
name.substr(idx + 1, name.size() - idx - 2));
-#else
- string::size_type const idx = name.find('-');
- if (idx == string::npos || idx == 0)
- return make_pair(name, string());
- return make_pair(name.substr(idx + 1),
- name.substr(0, idx));
-#endif
}
Index: README
===
--- README (Revision 13413)
+++ README (Arbeitskopie)
@@ -83,8 +83,7 @@ What do I need to compile LyX from the s
* LibXpm, version 4.7 or newer.
Or:
-* The Qt library, version 3.0 or newer (although version 2.3
-may work).
+* The Qt library, version
Re: [patch] remove qt2 support
Georg Baum <[EMAIL PROTECTED]> writes: | This patch removes qt2 support as discussed two weeks ago. It does not | touch the ui files, these should IMHO only be converted if they are | edited anyway. It does neither remove deprecated function calls, e.g. | QApplication::clipboard()->setSelectionMode(true|false). We should/need | only do that in the qt4 frontend. | It was also discussed to rename the qt2 directory to qt3, but I am not | sure whether we should do that, it might have unforeseen side effects. | Opinions? | | This patch is going in trunk now. patch ok. I think we should rename the qt2 dir as well, I will handle that. -- Lgb
RE: [patch] remove qt2 support
Title: RE: [patch] remove qt2 support
if qt2 goes, the attached should go (in) as well i think (i.e. remove qgridview.[Ch])
edwin
Index: qgridview.h
===
--- qgridview.h (revision 13415)
+++ qgridview.h (working copy)
@@ -1,134 +0,0 @@
-/**
-** $Id: qgridview.h,v 1.3 2004/12/14 11:05:44 leeming Exp $
-**
-** Definition of QGridView class
-**
-** Created: 2001.05.23
-**
-** Copyright (C) 1992-2001 Trolltech AS. All rights reserved.
-**
-** This file is part of the widgets module of the Qt GUI Toolkit.
-**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
-** Agreement provided with the Software.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/pricing.html or email [EMAIL PROTECTED] for
-** information about Qt Commercial License Agreements.
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact [EMAIL PROTECTED] if any conditions of this licensing are
-** not clear to you.
-**
-**/
-
-#ifndef QGRIDVIEW_H
-#define QGRIDVIEW_H
-
-#include
-
-#ifndef QT_NO_GRIDVIEW
-
-class QGridViewPrivate;
-
-class QGridView : public QScrollView
-{
-Q_OBJECT
-Q_PROPERTY( int numRows READ numRows WRITE setNumRows )
-Q_PROPERTY( int numCols READ numCols WRITE setNumCols )
-Q_PROPERTY( int cellWidth READ cellWidth WRITE setCellWidth )
-Q_PROPERTY( int cellHeight READ cellHeight WRITE setCellHeight )
-public:
-
-QGridView( QWidget *parent=0, const char *name=0, WFlags f=0 );
- ~QGridView();
-
-int numRows() const;
-virtual void setNumRows( int );
-int numCols() const;
-virtual void setNumCols( int );
-
-int cellWidth() const;
-virtual void setCellWidth( int );
-int cellHeight() const;
-virtual void setCellHeight( int );
-
-QRect cellRect() const;
-QRect cellGeometry( int row, int column );
-QSize gridSize() const;
-
-int rowAt( int y ) const;
-int columnAt( int x ) const;
-
-void repaintCell( int row, int column, bool erase=TRUE );
-void updateCell( int row, int column );
-void ensureCellVisible( int row, int column );
-
-protected:
-virtual void paintCell( QPainter *, int row, int col ) = 0;
-virtual void paintEmptyArea( QPainter *p, int cx, int cy, int cw, int ch );
-
-void drawContents( QPainter *p, int cx, int cy, int cw, int ch );
-
-virtual void dimensionChange( int, int );
-
-private:
-void drawContents( QPainter* );
-void updateGrid();
-
-int nrows;
-int ncols;
-int cellw;
-int cellh;
-QGridViewPrivate* d;
-
-private: // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
-QGridView( const QGridView & );
-QGridView =( const QGridView & );
-#endif
-};
-
-inline int QGridView::cellWidth() const
-{ return cellw; }
-
-inline int QGridView::cellHeight() const
-{ return cellh; }
-
-inline int QGridView::rowAt( int y ) const
-{ return y / cellh; }
-
-inline int QGridView::columnAt( int x ) const
-{ return x / cellw; }
-
-inline int QGridView::numRows() const
-{ return nrows; }
-
-inline int QGridView::numCols() const
-{return ncols; }
-
-inline QRect QGridView::cellRect() const
-{ return QRect( 0, 0, cellw, cellh ); }
-
-inline QSize QGridView::gridSize() const
-{ return QSize( ncols * cellw, nrows * cellh ); }
-
-
-
-#endif // QT_NO_GRIDVIEW
-
-
-#endif // QTABLEVIEW_H
Index: Makefile.dialogs
===
--- Makefile.dialogs (revision 13415)
+++ Makefile.dialogs (working copy)
@@ -97,7 +97,6 @@
QExternalDialog.C QExternalDialog.h \
QFloatDialog.C QFloatDialog.h \
QGraphicsDialog.C QGraphicsDialog.h \
- qgridview.C qgridview.h \
QIncludeDialog.C QIncludeDialog.h \
QIndexDialog.C QIndexDialog.h \
QLogDialog.C QLogDialog.h \
Index: QBrowseBox.h
===
--- QBrowseBox.h (revision 13415)
+++ QBrowseBox.h (working copy)
@@ -12,7 +12,7 @@
#ifndef QBROWSEBOX_H
#define QBROWSEBOX_H
-#include "qgridview.h"
+#include
class QString;
