Skip to content

Commit

Permalink
Replace Qt3 stuff with Qt4
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk@6170 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
g_j_m committed Dec 2, 2006
1 parent 2034c47 commit f6053ce
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 22 deletions.
17 changes: 10 additions & 7 deletions src/helpviewer/qgshelpviewer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,19 @@

#include <cassert>
#include <iostream>
#include <qstring.h>
#include <qapplication.h>
#include <qmessagebox.h>
#include <qfileinfo.h>
#include <q3textbrowser.h>
#include <sqlite3.h>

#include <QString>
#include <QApplication>
#include <QMessageBox>
#include <QFileInfo>
#include <QTextCodec>
#include <QTextStream>
#include <QFile>

#include <sqlite3.h>

#include "qgshelpviewer.h"

QgsHelpViewer::QgsHelpViewer(const QString &contextId, QWidget *parent,
Qt::WFlags fl)
: QDialog(parent, fl)
Expand Down Expand Up @@ -122,7 +125,7 @@ void QgsHelpViewer::loadContext(const QString &contextId)
file.close();

// Set the browser text to the help contents
txtBrowser->setText(helpContents);
txtBrowser->setHtml(helpContents);
setCaption(tr("Quantum GIS Help"));

}
Expand Down
21 changes: 6 additions & 15 deletions src/helpviewer/qgshelpviewerbase.ui
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>QgsHelpViewerBase</class>
<widget class="QDialog" name="QgsHelpViewerBase" >
<property name="geometry" >
Expand All @@ -23,13 +20,17 @@
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>6</number>
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="0" >
<widget class="Q3TextBrowser" name="txtBrowser" />
<widget class="QTextBrowser" name="txtBrowser" >
<property name="acceptDrops" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="1" column="0" >
<layout class="QHBoxLayout" >
Expand Down Expand Up @@ -73,16 +74,6 @@
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
<pixmapfunction></pixmapfunction>
<customwidgets>
<customwidget>
<class>Q3TextBrowser</class>
<extends>QWidget</extends>
<header>q3textbrowser.h</header>
<container>1</container>
<pixmap></pixmap>
</customwidget>
</customwidgets>
<resources/>
<connections>
<connection>
Expand Down

0 comments on commit f6053ce

Please sign in to comment.