Author: dmacvicar
Date: Fri Dec 7 15:42:24 2007
New Revision: 42812
URL: http://svn.opensuse.org/viewcvs/yast?rev=42812&view=rev
Log:
various compilation
Modified:
trunk/qt4/src/pkg/YQPkgChangeLogView.cc
trunk/qt4/src/pkg/YQPkgDependenciesView.cc
trunk/qt4/src/pkg/YQPkgDescriptionView.cc
trunk/qt4/src/pkg/YQPkgFileListView.cc
trunk/qt4/src/pkg/YQPkgGenericDetailsView.cc
trunk/qt4/src/pkg/YQPkgGenericDetailsView.h
trunk/qt4/src/pkg/YQPkgSelDescriptionView.cc
trunk/qt4/src/pkg/YQPkgTechnicalDetailsView.cc
Modified: trunk/qt4/src/pkg/YQPkgChangeLogView.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/pkg/YQPkgChangeLogView.cc?rev=42812&r1=42811&r2=42812&view=diff
==============================================================================
--- trunk/qt4/src/pkg/YQPkgChangeLogView.cc (original)
+++ trunk/qt4/src/pkg/YQPkgChangeLogView.cc Fri Dec 7 15:42:24 2007
@@ -66,8 +66,7 @@
html += "<p><i>" + _( "Information only available for installed packages." ) + "</i></p>";
}
- setTextFormat( Qt::RichText );
- setText( html );
+ setHtml( html );
}
Modified: trunk/qt4/src/pkg/YQPkgDependenciesView.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/pkg/YQPkgDependenciesView.cc?rev=42812&r1=42811&r2=42812&view=diff
==============================================================================
--- trunk/qt4/src/pkg/YQPkgDependenciesView.cc (original)
+++ trunk/qt4/src/pkg/YQPkgDependenciesView.cc Fri Dec 7 15:42:24 2007
@@ -68,8 +68,7 @@
html_text += simpleTable( installed );
}
- setTextFormat( Qt::RichText );
- setText( html_text );
+ setHtml( html_text );
}
Modified: trunk/qt4/src/pkg/YQPkgDescriptionView.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/pkg/YQPkgDescriptionView.cc?rev=42812&r1=42811&r2=42812&view=diff
==============================================================================
--- trunk/qt4/src/pkg/YQPkgDescriptionView.cc (original)
+++ trunk/qt4/src/pkg/YQPkgDescriptionView.cc Fri Dec 7 15:42:24 2007
@@ -21,9 +21,8 @@
#define y2log_component "qt-pkg"
#include
-#include
-//Added by qt3to4:
-#include
+#include <QRegExp>
+#include <QList>
#include "YQPkgDescriptionView.h"
#include "YQPkgDescriptionDialog.h"
#include "YQi18n.h"
@@ -36,7 +35,7 @@
YQPkgDescriptionView::YQPkgDescriptionView( QWidget * parent )
: YQPkgGenericDetailsView( parent )
{
- setMimeSourceFactory( 0 );
+ //FIXME setMimeSourceFactory( 0 );
}
@@ -67,9 +66,8 @@
html_text += description;
- setTextFormat( Qt::RichText );
- setText( html_text );
- ensureVisible( 0, 0 ); // Otherwise hyperlinks will be centered
+ setHtml( html_text );
+ //FIXME ensureVisible( 0, 0 ); // Otherwise hyperlinks will be centered
}
Modified: trunk/qt4/src/pkg/YQPkgFileListView.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/pkg/YQPkgFileListView.cc?rev=42812&r1=42811&r2=42812&view=diff
==============================================================================
--- trunk/qt4/src/pkg/YQPkgFileListView.cc (original)
+++ trunk/qt4/src/pkg/YQPkgFileListView.cc Fri Dec 7 15:42:24 2007
@@ -21,7 +21,7 @@
#define y2log_component "qt-pkg"
#include
-#include
+#include <QRegExp>
#include "YQPkgFileListView.h"
#include "YQPkgDescriptionDialog.h"
#include "YQi18n.h"
@@ -68,8 +68,7 @@
html += "<p><i>" + _( "Information only available for installed packages." ) + "</i></p>";
}
- setTextFormat( Qt::RichText );
- setText( html );
+ setHtml( html );
}
Modified: trunk/qt4/src/pkg/YQPkgGenericDetailsView.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/pkg/YQPkgGenericDetailsView.cc?rev=42812&r1=42811&r2=42812&view=diff
==============================================================================
--- trunk/qt4/src/pkg/YQPkgGenericDetailsView.cc (original)
+++ trunk/qt4/src/pkg/YQPkgGenericDetailsView.cc Fri Dec 7 15:42:24 2007
@@ -16,13 +16,11 @@
/-*/
-#define QT3_SUPPORT 1
-
#define y2log_component "qt-pkg"
#include
-#include
-#include
-#include
+#include <QTabWidget>
+#include <QRegExp>
+#include <QDateTime>
#include "YQPkgGenericDetailsView.h"
#include "YQi18n.h"
@@ -33,7 +31,7 @@
YQPkgGenericDetailsView::YQPkgGenericDetailsView( QWidget * parent )
- : Q3TextBrowser( parent )
+ : QTextBrowser( parent )
{
_selectable = 0;
_parentTab = dynamic_cast (parent);
@@ -69,7 +67,7 @@
if ( _parentTab ) // Is this view embedded into a tab widget?
{
- if ( _parentTab->currentPage() == this ) // Is this page the topmost?
+ if ( _parentTab->currentWidget() == this ) // Is this page the topmost?
{
showDetails( selectable );
}
Modified: trunk/qt4/src/pkg/YQPkgGenericDetailsView.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/pkg/YQPkgGenericDetailsView.h?rev=42812&r1=42811&r2=42812&view=diff
==============================================================================
--- trunk/qt4/src/pkg/YQPkgGenericDetailsView.h (original)
+++ trunk/qt4/src/pkg/YQPkgGenericDetailsView.h Fri Dec 7 15:42:24 2007
@@ -20,7 +20,7 @@
#ifndef YQPkgGenericDetailsView_h
#define YQPkgGenericDetailsView_h
-#include
+#include <QTextBrowser>
#include
#include
@@ -34,7 +34,7 @@
* HTML formatting, Qt slots and display only if this view is visible at all
* ( it may be hidden if it's part of a QTabWidget ).
**/
-class YQPkgGenericDetailsView : public Q3TextBrowser
+class YQPkgGenericDetailsView : public QTextBrowser
{
Q_OBJECT
@@ -125,7 +125,7 @@
* Show data for the last package.
**/
void reload( QWidget * newCurrent );
- virtual void reload() { Q3TextBrowser::reload(); }
+ virtual void reload() { QTextBrowser::reload(); }
protected:
Modified: trunk/qt4/src/pkg/YQPkgSelDescriptionView.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/pkg/YQPkgSelDescriptionView.cc?rev=42812&r1=42811&r2=42812&view=diff
==============================================================================
--- trunk/qt4/src/pkg/YQPkgSelDescriptionView.cc (original)
+++ trunk/qt4/src/pkg/YQPkgSelDescriptionView.cc Fri Dec 7 15:42:24 2007
@@ -63,9 +63,8 @@
html_text += description;
- setTextFormat( Qt::RichText );
- setText( html_text );
- ensureVisible( 0, 0 ); // Otherwise hyperlinks will be centered
+ setHtml( html_text );
+ //FIXME ensureVisible( 0, 0 ); // Otherwise hyperlinks will be centered
}
Modified: trunk/qt4/src/pkg/YQPkgTechnicalDetailsView.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/pkg/YQPkgTechnicalDetailsView.cc?rev=42812&r1=42811&r2=42812&view=diff
==============================================================================
--- trunk/qt4/src/pkg/YQPkgTechnicalDetailsView.cc (original)
+++ trunk/qt4/src/pkg/YQPkgTechnicalDetailsView.cc Fri Dec 7 15:42:24 2007
@@ -72,8 +72,7 @@
html_text += simpleTable( selectable, installed );
}
- setTextFormat( Qt::RichText );
- setText( html_text );
+ setHtml( html_text );
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
