Skip to content
Permalink
Browse files

Replace Qt3 stuff with Qt4

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6170 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
g_j_m
g_j_m committed Dec 2, 2006
1 parent 933b26f commit 6e8f5d9b986d3c21ab67faa50ddb2d3bb4c21302
Showing with 16 additions and 22 deletions.
  1. +10 −7 src/helpviewer/qgshelpviewer.cpp
  2. +6 −15 src/helpviewer/qgshelpviewerbase.ui
@@ -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)
@@ -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"));

}
@@ -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" >
@@ -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" >
@@ -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>

0 comments on commit 6e8f5d9

Please sign in to comment.
You can’t perform that action at this time.