diff options
Diffstat (limited to 'kspread/kspread_object.cpp')
| -rw-r--r-- | kspread/kspread_object.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kspread/kspread_object.cpp b/kspread/kspread_object.cpp index 2fce2696..6f397b52 100644 --- a/kspread/kspread_object.cpp +++ b/kspread/kspread_object.cpp @@ -56,7 +56,7 @@ class View; * **********************************************************/ EmbeddedObject::EmbeddedObject( Sheet *_sheet, const KoRect& _geometry ) - : m_geometry( _geometry), m_sheet(_sheet), m_objectName(""), m_selected(false), m_protect(false), m_keepRatio(false), pen( TQt::black, 1, Qt::SolidLine ) + : m_geometry( _geometry), m_sheet(_sheet), m_objectName(""), m_selected(false), m_protect(false), m_keepRatio(false), pen( TQt::black, 1, TQt::SolidLine ) { angle = 0.0; inObjList = true; @@ -691,7 +691,7 @@ EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, const KoRect& _geom : EmbeddedObject( _sheet, _geometry ) { imageCollection = _imageCollection; - pen = KoPen( TQt::black, 1.0, Qt::NoPen ); + pen = KoPen( TQt::black, 1.0, TQt::NoPen ); mirrorType = PM_NORMAL; depth = 0; swapRGB = false; @@ -712,7 +712,7 @@ EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, const KoRect& _geom imageCollection = _imageCollection; //ext = KoSize(); // invalid size means unset - pen = KoPen( TQt::black, 1.0, Qt::NoPen ); + pen = KoPen( TQt::black, 1.0, TQt::NoPen ); mirrorType = PM_NORMAL; depth = 0; swapRGB = false; @@ -734,7 +734,7 @@ EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, KoPictureCollection imageCollection = _imageCollection; //ext = KoSize(); // invalid size means unset - pen = KoPen( TQt::black, 1.0, Qt::NoPen ); + pen = KoPen( TQt::black, 1.0, TQt::NoPen ); mirrorType = PM_NORMAL; depth = 0; swapRGB = false; @@ -1015,7 +1015,7 @@ void EmbeddedPictureObject::loadOasis(const TQDomElement &element, KoOasisLoadin strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot. } TQString filename(href/*.mid(1)*/); - const KoPictureKey key(filename, TQDateTime::currentDateTime(Qt::UTC)); + const KoPictureKey key(filename, TQDateTime::currentDateTime(TQt::UTC)); image.setKey(key); KoStore* store = context.store(); @@ -1206,7 +1206,7 @@ TQPixmap EmbeddedPictureObject::toPixmap( double xZoom , double yZoom ) TQPixmap EmbeddedPictureObject::generatePixmap(KoZoomHandler*_zoomHandler) { - const double penw = _zoomHandler->zoomItX( ( ( pen.style() == Qt::NoPen ) ? 1 : pen.width() ) / 2.0 ); + const double penw = _zoomHandler->zoomItX( ( ( pen.style() == TQt::NoPen ) ? 1 : pen.width() ) / 2.0 ); TQSize size( _zoomHandler->zoomSize( m_geometry.size() /*ext*/ ) ); //kdDebug(33001) << "EmbeddedPictureObject::generatePixmap size= " << size << endl; @@ -1217,7 +1217,7 @@ TQPixmap EmbeddedPictureObject::generatePixmap(KoZoomHandler*_zoomHandler) pixmap.fill( TQt::white ); // Draw background - paint.setPen( Qt::NoPen ); + paint.setPen( TQt::NoPen ); paint.setBrush( getBrush() ); TQRect rect( (int)( penw ), (int)( penw ), @@ -1264,7 +1264,7 @@ void EmbeddedPictureObject::draw( TQPainter *_painter/*, KoZoomHandler*_zoomHand const double oy = /*orig*/m_geometry.y(); const double ow = /*ext*/m_geometry.width(); const double oh = /*ext*/m_geometry.height(); - //const double penw = _zoomHandler->zoomItX( ( ( pen.style() == Qt::NoPen ) ? 1.0 : pen.width() ) / 2.0 ); + //const double penw = _zoomHandler->zoomItX( ( ( pen.style() == TQt::NoPen ) ? 1.0 : pen.width() ) / 2.0 ); _painter->save(); @@ -1355,7 +1355,7 @@ void EmbeddedPictureObject::draw( TQPainter *_painter/*, KoZoomHandler*_zoomHand // } // else { // pen2 = pen; -// pen2.setWidth( _zoomHandler->zoomItX( ( pen.style() == Qt::NoPen ) ? 1.0 : (double)pen.width() ) ); +// pen2.setWidth( _zoomHandler->zoomItX( ( pen.style() == TQt::NoPen ) ? 1.0 : (double)pen.width() ) ); // } // _painter->setPen( pen2 ); // _painter->setBrush( TQt::NoBrush ); |