Skip to content

Commit 6e8f5d9

Browse files
author
g_j_m
committed
Replace Qt3 stuff with Qt4
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6170 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 933b26f commit 6e8f5d9

File tree

2 files changed

+16
-22
lines changed

2 files changed

+16
-22
lines changed

src/helpviewer/qgshelpviewer.cpp

+10-7
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,19 @@
1919

2020
#include <cassert>
2121
#include <iostream>
22-
#include <qstring.h>
23-
#include <qapplication.h>
24-
#include <qmessagebox.h>
25-
#include <qfileinfo.h>
26-
#include <q3textbrowser.h>
27-
#include <sqlite3.h>
22+
23+
#include <QString>
24+
#include <QApplication>
25+
#include <QMessageBox>
26+
#include <QFileInfo>
2827
#include <QTextCodec>
2928
#include <QTextStream>
3029
#include <QFile>
30+
31+
#include <sqlite3.h>
32+
3133
#include "qgshelpviewer.h"
34+
3235
QgsHelpViewer::QgsHelpViewer(const QString &contextId, QWidget *parent,
3336
Qt::WFlags fl)
3437
: QDialog(parent, fl)
@@ -122,7 +125,7 @@ void QgsHelpViewer::loadContext(const QString &contextId)
122125
file.close();
123126

124127
// Set the browser text to the help contents
125-
txtBrowser->setText(helpContents);
128+
txtBrowser->setHtml(helpContents);
126129
setCaption(tr("Quantum GIS Help"));
127130

128131
}

src/helpviewer/qgshelpviewerbase.ui

+6-15
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
<ui version="4.0" >
2-
<author></author>
3-
<comment></comment>
4-
<exportmacro></exportmacro>
52
<class>QgsHelpViewerBase</class>
63
<widget class="QDialog" name="QgsHelpViewerBase" >
74
<property name="geometry" >
@@ -23,13 +20,17 @@
2320
</property>
2421
<layout class="QGridLayout" >
2522
<property name="margin" >
26-
<number>6</number>
23+
<number>9</number>
2724
</property>
2825
<property name="spacing" >
2926
<number>6</number>
3027
</property>
3128
<item row="0" column="0" >
32-
<widget class="Q3TextBrowser" name="txtBrowser" />
29+
<widget class="QTextBrowser" name="txtBrowser" >
30+
<property name="acceptDrops" >
31+
<bool>false</bool>
32+
</property>
33+
</widget>
3334
</item>
3435
<item row="1" column="0" >
3536
<layout class="QHBoxLayout" >
@@ -73,16 +74,6 @@
7374
</layout>
7475
</widget>
7576
<layoutdefault spacing="6" margin="11" />
76-
<pixmapfunction></pixmapfunction>
77-
<customwidgets>
78-
<customwidget>
79-
<class>Q3TextBrowser</class>
80-
<extends>QWidget</extends>
81-
<header>q3textbrowser.h</header>
82-
<container>1</container>
83-
<pixmap></pixmap>
84-
</customwidget>
85-
</customwidgets>
8677
<resources/>
8778
<connections>
8879
<connection>

0 commit comments

Comments
 (0)