Package: qub
Version: N/A; reported 2001-10-26
Note that the following patch is insufficient for g++ 3.0 (on hppa,
for example); I gave up on making that work, but may return to it
later.
The patch also includes a fix for an apparent bug with
GPixManager::addPixmap, where no return value was supplied
for one version of a method which acts as a redirect for
the same method with a different signature.
diff -Naur qub.orig/lib/libGCom/GComDrag.cpp qub-0.4.9/lib/libGCom/GComDrag.cpp
--- qub.orig/lib/libGCom/GComDrag.cpp Mon Jan 1 20:32:32 2001
+++ qub-0.4.9/lib/libGCom/GComDrag.cpp Thu Oct 25 14:00:58 2001
@@ -8,6 +8,7 @@
long GComDrag::ID = 0;
bool GComDrag::dragCentered = false;
+const char GComDrag::GCOM_KEY_DRAGDATA_GCOM[] = "gcom_drag_data";
GComDrag::GComDrag( GCom *gc = 0, QPoint pt ) : QTextDrag( gc )
{
@@ -112,4 +113,4 @@
{
dragPoint = pt;
DRAG_MSG( QString().sprintf("setDragPoint( %d,%d )drag point = %d,%d",
pt.x(), pt.y(), dragPoint.x(),dragPoint.y() ) );
-}
\ No newline at end of file
+}
diff -Naur qub.orig/lib/libGCom/GComDrag.h qub-0.4.9/lib/libGCom/GComDrag.h
--- qub.orig/lib/libGCom/GComDrag.h Mon Jan 1 20:32:32 2001
+++ qub-0.4.9/lib/libGCom/GComDrag.h Thu Oct 25 13:34:09 2001
@@ -75,7 +75,7 @@
/**
* This is the key used for sticking data into a SerialTree for serialization.
*/
- const static char GCOM_KEY_DRAGDATA_GCOM[] = "gcom_drag_data";
+ const static char GCOM_KEY_DRAGDATA_GCOM[];
QPoint &getDragPoint();
void setDragPoint( QPoint pt );
diff -Naur qub.orig/lib/libGCom/GPixManager.cpp
qub-0.4.9/lib/libGCom/GPixManager.cpp
--- qub.orig/lib/libGCom/GPixManager.cpp Mon Jan 1 20:32:32 2001
+++ qub-0.4.9/lib/libGCom/GPixManager.cpp Thu Oct 25 12:58:10 2001
@@ -80,7 +80,7 @@
QPixmap *
GPixManager::addPixmap( const QString &name,bool makeCurrent )
{
- addPixmap( name, 0, makeCurrent );
+ return addPixmap( name, 0, makeCurrent );
}
QPixmap *
GPixManager::addPixmap( const QString &name, QPixmap *image, bool makeCurrent
= false, bool cacheit )
@@ -187,4 +187,4 @@
if( ! listener ) return;
connect( this, SIGNAL( signalPixmapChanged( const QPixmap &, const QString
& ) ),
listener, SLOT( setBackgroundPixmap( const QPixmap &, const
QString & ) ) );
-}
\ No newline at end of file
+}
-- System Information
Debian Release: testing/unstable
Architecture: ia64
Kernel: Linux butthead 2.4.9-itanium-smp #1 SMP Mon Sep 17 20:48:35 MDT 2001
ia64
Locale: LANG=C, LC_CTYPE=
