From e69e8b1d09fb579316595b4e6a850e717358a8b1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 19 Jun 2011 19:03:33 +0000 Subject: TQt4 port kdegraphics This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237557 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kviewshell/anchor.h | 2 +- kviewshell/documentPageCache.cpp | 8 +- kviewshell/documentPageCache.h | 5 +- kviewshell/documentRenderer.cpp | 4 +- kviewshell/documentRenderer.h | 17 +- kviewshell/documentWidget.cpp | 64 +++---- kviewshell/documentWidget.h | 13 +- kviewshell/emptyRenderer.cpp | 4 +- kviewshell/emptyRenderer.h | 3 +- kviewshell/empty_multipage.cpp | 4 +- kviewshell/empty_multipage.h | 5 +- kviewshell/history.cpp | 4 +- kviewshell/history.h | 11 +- kviewshell/hyperlink.h | 4 +- kviewshell/kmultipage.cpp | 142 +++++++-------- kviewshell/kmultipage.h | 23 +-- kviewshell/kprintDialogPage_pageoptions.cpp | 8 +- kviewshell/kprintDialogPage_pageoptions.h | 2 +- kviewshell/kviewpart.cpp | 160 ++++++++--------- kviewshell/kviewpart.h | 6 +- kviewshell/kviewpart_iface.h | 5 +- kviewshell/kviewshell.cpp | 24 +-- kviewshell/kviewshell.h | 3 +- kviewshell/main.cpp | 6 +- kviewshell/marklist.cpp | 56 +++--- kviewshell/marklist.h | 19 +- kviewshell/optionDialogAccessibilityWidget.ui | 60 +++---- kviewshell/optionDialogGUIWidget_base.ui | 20 +-- kviewshell/pageNumber.h | 16 +- kviewshell/pageSize.cpp | 12 +- kviewshell/pageSize.h | 7 +- kviewshell/pageSizeDialog.cpp | 6 +- kviewshell/pageSizeDialog.h | 3 +- kviewshell/pageSizeWidget.cpp | 16 +- kviewshell/pageSizeWidget.h | 3 +- kviewshell/pageSizeWidget_base.ui | 24 +-- kviewshell/pageView.cpp | 102 +++++------ kviewshell/pageView.h | 23 +-- kviewshell/plugins/djvu/djvumultipage.cpp | 30 ++-- kviewshell/plugins/djvu/djvumultipage.h | 3 +- kviewshell/plugins/djvu/djvurenderer.cpp | 62 +++---- kviewshell/plugins/djvu/djvurenderer.h | 5 +- .../kprintDialogPage_DJVUconversionoptions.cpp | 6 +- .../djvu/kprintDialogPage_DJVUconversionoptions.h | 2 +- ...tDialogPage_DJVUconversionoptions_basewidget.ui | 14 +- .../djvu/kprintDialogPage_DJVUpageoptions.cpp | 8 +- .../djvu/kprintDialogPage_DJVUpageoptions.h | 2 +- kviewshell/plugins/djvu/libdjvu/Arrays.cpp | 2 +- kviewshell/plugins/djvu/libdjvu/Arrays.h | 2 +- .../plugins/djvu/libdjvu/BSEncodeByteStream.cpp | 16 +- kviewshell/plugins/djvu/libdjvu/DataPool.cpp | 14 +- kviewshell/plugins/djvu/libdjvu/DataPool.h | 2 +- kviewshell/plugins/djvu/libdjvu/DjVmDir.cpp | 28 +-- kviewshell/plugins/djvu/libdjvu/DjVmDir0.cpp | 2 +- kviewshell/plugins/djvu/libdjvu/DjVmDoc.cpp | 24 +-- kviewshell/plugins/djvu/libdjvu/DjVmNav.cpp | 4 +- kviewshell/plugins/djvu/libdjvu/DjVmNav.h | 4 +- kviewshell/plugins/djvu/libdjvu/DjVuAnno.cpp | 64 +++---- kviewshell/plugins/djvu/libdjvu/DjVuAnno.h | 16 +- kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp | 126 +++++++------- kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.h | 2 +- kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp | 14 +- kviewshell/plugins/djvu/libdjvu/DjVuDocument.h | 2 +- kviewshell/plugins/djvu/libdjvu/DjVuDumpHelper.cpp | 2 +- kviewshell/plugins/djvu/libdjvu/DjVuErrorList.cpp | 14 +- kviewshell/plugins/djvu/libdjvu/DjVuErrorList.h | 20 +-- kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp | 40 ++--- kviewshell/plugins/djvu/libdjvu/DjVuFile.h | 12 +- kviewshell/plugins/djvu/libdjvu/DjVuGlobal.cpp | 18 +- kviewshell/plugins/djvu/libdjvu/DjVuGlobal.h | 2 +- kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp | 40 ++--- kviewshell/plugins/djvu/libdjvu/DjVuImage.h | 18 +- kviewshell/plugins/djvu/libdjvu/DjVuMessage.cpp | 12 +- .../plugins/djvu/libdjvu/DjVuMessageLite.cpp | 10 +- kviewshell/plugins/djvu/libdjvu/DjVuNavDir.cpp | 6 +- kviewshell/plugins/djvu/libdjvu/DjVuPalette.cpp | 14 +- kviewshell/plugins/djvu/libdjvu/DjVuPalette.h | 12 +- kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp | 48 +++--- kviewshell/plugins/djvu/libdjvu/DjVuPort.h | 22 +-- kviewshell/plugins/djvu/libdjvu/DjVuText.cpp | 128 +++++++------- kviewshell/plugins/djvu/libdjvu/DjVuText.h | 20 +-- kviewshell/plugins/djvu/libdjvu/DjVuToPS.cpp | 92 +++++----- kviewshell/plugins/djvu/libdjvu/DjVuToPS.h | 4 +- kviewshell/plugins/djvu/libdjvu/GBitmap.cpp | 28 +-- kviewshell/plugins/djvu/libdjvu/GBitmap.h | 4 +- kviewshell/plugins/djvu/libdjvu/GContainer.cpp | 2 +- kviewshell/plugins/djvu/libdjvu/GContainer.h | 16 +- kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp | 42 ++--- kviewshell/plugins/djvu/libdjvu/GIFFManager.h | 14 +- kviewshell/plugins/djvu/libdjvu/GMapAreas.cpp | 2 +- kviewshell/plugins/djvu/libdjvu/GMapAreas.h | 32 ++-- kviewshell/plugins/djvu/libdjvu/GOS.cpp | 6 +- kviewshell/plugins/djvu/libdjvu/GPixmap.h | 4 +- kviewshell/plugins/djvu/libdjvu/GRect.cpp | 2 +- kviewshell/plugins/djvu/libdjvu/GRect.h | 10 +- kviewshell/plugins/djvu/libdjvu/GSmartPointer.cpp | 2 +- kviewshell/plugins/djvu/libdjvu/GSmartPointer.h | 2 +- kviewshell/plugins/djvu/libdjvu/GString.cpp | 10 +- kviewshell/plugins/djvu/libdjvu/GString.h | 16 +- kviewshell/plugins/djvu/libdjvu/GThreads.cpp | 26 +-- kviewshell/plugins/djvu/libdjvu/GThreads.h | 58 +++---- kviewshell/plugins/djvu/libdjvu/GURL.h | 2 +- kviewshell/plugins/djvu/libdjvu/IFFByteStream.cpp | 2 +- .../plugins/djvu/libdjvu/IW44EncodeCodec.cpp | 90 +++++----- kviewshell/plugins/djvu/libdjvu/IW44Image.cpp | 4 +- kviewshell/plugins/djvu/libdjvu/IW44Image.h | 22 +-- kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp | 138 +++++++-------- kviewshell/plugins/djvu/libdjvu/JB2Image.cpp | 192 ++++++++++----------- kviewshell/plugins/djvu/libdjvu/JB2Image.h | 188 ++++++++++---------- kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp | 16 +- kviewshell/plugins/djvu/libdjvu/MMRDecoder.h | 4 +- kviewshell/plugins/djvu/libdjvu/XMLParser.cpp | 130 +++++++------- kviewshell/plugins/djvu/libdjvu/XMLTags.cpp | 6 +- kviewshell/plugins/djvu/libdjvu/XMLTags.h | 6 +- kviewshell/plugins/djvu/libdjvu/ZPCodec.h | 4 +- kviewshell/plugins/djvu/libdjvu/configure.in.in | 9 +- kviewshell/plugins/djvu/pageRangeWidget.cpp | 2 +- kviewshell/plugins/djvu/pageRangeWidget.h | 7 +- kviewshell/plugins/djvu/pageRangeWidget_base.ui | 8 +- kviewshell/renderedDocumentPage.cpp | 14 +- kviewshell/renderedDocumentPage.h | 9 +- kviewshell/renderedDocumentPagePixmap.cpp | 6 +- kviewshell/renderedDocumentPagePixmap.h | 3 +- kviewshell/searchWidget.cpp | 26 +-- kviewshell/searchWidget.h | 7 +- kviewshell/selection.cpp | 16 +- kviewshell/selection.h | 10 +- kviewshell/simplePageSize.cpp | 6 +- kviewshell/simplePageSize.h | 4 +- kviewshell/sizePreview.cpp | 14 +- kviewshell/sizePreview.h | 5 +- kviewshell/tableOfContents.cpp | 18 +- kviewshell/tableOfContents.h | 9 +- kviewshell/units.cpp | 2 +- kviewshell/zoom.cpp | 18 +- kviewshell/zoom.h | 3 +- 136 files changed, 1594 insertions(+), 1564 deletions(-) (limited to 'kviewshell') diff --git a/kviewshell/anchor.h b/kviewshell/anchor.h index f3faf13e..cee42b31 100644 --- a/kviewshell/anchor.h +++ b/kviewshell/anchor.h @@ -20,7 +20,7 @@ This very simple class contains a page number and a vertical position in physical coordiantes. The vertical position is given by the distance from the top of the page. Anchors are completely independent -of documents, there is no need for a document to exists that contains +of documents, there is no need for a document to exists that tqcontains the given page, nor does the page number need to be valid. @author Stefan Kebekus diff --git a/kviewshell/documentPageCache.cpp b/kviewshell/documentPageCache.cpp index b2322321..9fd55d59 100644 --- a/kviewshell/documentPageCache.cpp +++ b/kviewshell/documentPageCache.cpp @@ -119,7 +119,7 @@ bool DocumentPageCache::isPageCached(const PageNumber& pageNumber, const TQSize& // Check if the page that we are looking for is in the cache. // We are not accessing the page, so we don't want it to be moved into the front. - RenderedDocumentPagePixmap* page = LRUCache.find(key, false); + RenderedDocumentPagePixmap* page = LRUCache.tqfind(key, false); if (page) return true; @@ -191,7 +191,7 @@ RenderedDocumentPagePixmap* DocumentPageCache::getPage(const PageNumber& pageNr) // First check if the page that we are looking for is in the cache RenderedDocumentPagePixmap* page; - page = LRUCache.find(createKey(pageNr)); + page = LRUCache.tqfind(createKey(pageNr)); if (page) return page; @@ -220,7 +220,7 @@ RenderedDocumentPagePixmap* DocumentPageCache::getPage(const PageNumber& pageNr) // We always set the cache capacity to be at least n times the cost of the page we want to insert. // Where n is the number of pages that can be visible at the same time at very high zoomlevels. - // n depends on the layout mode. + // n depends on the tqlayout mode. // If these pages are not all in the cache, scrolling the view becomes very slow, because for each // paint event the pages need to be rerendered. // We set n for each viewmode differently so that the user is able to reduce memory consuption by @@ -237,7 +237,7 @@ RenderedDocumentPagePixmap* DocumentPageCache::getPage(const PageNumber& pageNr) default: n = 4; } - LRUCache.setMaxCost(QMAX(page->memory() * n, maxMemory)); + LRUCache.setMaxCost(TQMAX(page->memory() * n, maxMemory)); if (!LRUCache.insert(createKey(pageNr), page, page->memory())) { diff --git a/kviewshell/documentPageCache.h b/kviewshell/documentPageCache.h index 8477d152..35f8e084 100644 --- a/kviewshell/documentPageCache.h +++ b/kviewshell/documentPageCache.h @@ -24,9 +24,10 @@ class TQPixmap; class RenderedDocumentPage; -class DocumentPageCache: public QObject +class DocumentPageCache: public TQObject { Q_OBJECT + TQ_OBJECT public: DocumentPageCache(); @@ -113,7 +114,7 @@ class DocumentPageCache: public QObject private: /** The maximum of memory used by the cache. (32MB) TODO: make this configurable, or detact an appropriate value at startup. */ - Q_UINT32 maxMemory; + TQ_UINT32 maxMemory; /** This field contains resolution of the display device. In principle. In fact, kviewshell implements zooming by calling the diff --git a/kviewshell/documentRenderer.cpp b/kviewshell/documentRenderer.cpp index 34bf59ac..947bd10d 100644 --- a/kviewshell/documentRenderer.cpp +++ b/kviewshell/documentRenderer.cpp @@ -17,7 +17,7 @@ DocumentRenderer::DocumentRenderer(TQWidget* par) - : mutex(true), parentWidget(par), accessibilityBackground(false), + : mutex(true), tqparentWidget(par), accessibilityBackground(false), accessibilityBackgroundColor(TQColor(255,255,255)) { numPages = 0; @@ -122,7 +122,7 @@ Anchor DocumentRenderer::findAnchor(const TQString &locallink) // Wait for all access to this DocumentRenderer to finish TQMutexLocker locker(&mutex); - TQMap::Iterator it = anchorList.find(locallink); + TQMap::Iterator it = anchorList.tqfind(locallink); if (it != anchorList.end()) return *it; else diff --git a/kviewshell/documentRenderer.h b/kviewshell/documentRenderer.h index 9282d005..2329137a 100644 --- a/kviewshell/documentRenderer.h +++ b/kviewshell/documentRenderer.h @@ -48,13 +48,14 @@ thread-safe. @author Wilfried Huss, Stefan Kebekus */ -class DocumentRenderer : public QObject +class DocumentRenderer : public TQObject { Q_OBJECT + TQ_OBJECT public: /** \brief default constructor */ - DocumentRenderer(TQWidget* parent); + DocumentRenderer(TQWidget* tqparent); virtual ~DocumentRenderer(); @@ -151,7 +152,7 @@ public: virtual void clear(); - /* Returns true if the current document contains 0 pages. */ + /* Returns true if the current document tqcontains 0 pages. */ bool isEmpty() const {return numPages == 0;} /* Tells if the document was modified after is was loaded. */ @@ -261,7 +262,7 @@ public: display device. In principle. In fact, kviewshell implements zooming by using values that are not exactly the resolution of the display, but multiplied with the zoom factor. Bottom line: the - DocumentRenderer should act as if this field indeed contains + DocumentRenderer should act as if this field indeed tqcontains resolution of the display device. @param page pointer to a documentPage structure that this method @@ -361,7 +362,7 @@ signals: This signal can be emitted if the document or status of this class changed internally so that all associated widgets should be - repainted. This could be emitted, e.g. if pages are removed from a + tqrepainted. This could be emitted, e.g. if pages are removed from a document, or if some preferences change that have some direct influence on the way the document is rendered. @@ -400,7 +401,7 @@ protected: @warning Only the constructor and the methods setFile() and clear() may write to this member. */ - Q_UINT16 numPages; + TQ_UINT16 numPages; /** page sizes @@ -441,12 +442,12 @@ protected: */ TQMap anchorList; - /** pointer to the parent widget + /** pointer to the tqparent widget This pointer can be used by implementations e.g. to display error messages. This pointer can well be zero. */ - TQGuardedPtr parentWidget; + TQGuardedPtr tqparentWidget; /** specifies if accessibilityBackgroundColor should be used diff --git a/kviewshell/documentWidget.cpp b/kviewshell/documentWidget.cpp index 59316d7a..07897488 100644 --- a/kviewshell/documentWidget.cpp +++ b/kviewshell/documentWidget.cpp @@ -65,8 +65,8 @@ TQPixmap* BLShadow = 0; } // namespace anon -DocumentWidget::DocumentWidget(TQWidget *parent, PageView *sv, DocumentPageCache *cache, const char *name ) - : TQWidget( parent, name ), indexOfUnderlinedLink(-1) +DocumentWidget::DocumentWidget(TQWidget *tqparent, PageView *sv, DocumentPageCache *cache, const char *name ) + : TQWidget( tqparent, name ), indexOfUnderlinedLink(-1) { moveTool = true; @@ -83,10 +83,10 @@ DocumentWidget::DocumentWidget(TQWidget *parent, PageView *sv, DocumentPageCache scrollGuide = -1; setMouseTracking(true); - setFocusPolicy(TQWidget::ClickFocus); + setFocusPolicy(TQ_ClickFocus); connect(&clearStatusBarTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(clearStatusBar())); - setBackgroundMode(Qt::NoBackground); + setBackgroundMode(TQt::NoBackground); if (!busyIcon) { @@ -103,7 +103,7 @@ DocumentWidget::DocumentWidget(TQWidget *parent, PageView *sv, DocumentPageCache } -void DocumentWidget::setPageNumber(Q_UINT16 nr) +void DocumentWidget::setPageNumber(TQ_UINT16 nr) { pageNr = nr; @@ -147,7 +147,7 @@ void DocumentWidget::timerEvent( TQTimerEvent *e ) animationCounter = 0; } - repaint(flashRect, false); + tqrepaint(flashRect, false); } @@ -160,7 +160,7 @@ void DocumentWidget::flash(int fo) animationCounter = 10; TQRect flashRect = linkFlashRect(); flashRect.addCoords(-1, -1, 1, 1); - repaint(flashRect, false); + tqrepaint(flashRect, false); } animationCounter = 0; flashOffset = fo; @@ -195,15 +195,15 @@ void DocumentWidget::paintEvent(TQPaintEvent *e) p.setClipRegion(e->region()); // Paint a black border around the widget - p.setRasterOp(Qt::CopyROP); + p.setRasterOp(TQt::CopyROP); p.setBrush(NoBrush); - p.setPen(Qt::black); + p.setPen(TQt::black); TQRect outlineRect = pageRect(); outlineRect.addCoords(-1, -1, 1, 1); p.drawRect(outlineRect); // Paint page shadow - TQColor backgroundColor = colorGroup().mid(); + TQColor backgroundColor = tqcolorGroup().mid(); // (Re-)generate the Pixmaps for the shadow corners, if necessary if (backgroundColor != backgroundColorForCorners) @@ -247,7 +247,7 @@ void DocumentWidget::paintEvent(TQPaintEvent *e) if (KVSPrefs::changeColors() && KVSPrefs::renderMode() == KVSPrefs::EnumRenderMode::Paper) p.fillRect(destRect, KVSPrefs::paperColor()); else - p.fillRect(destRect, Qt::white); + p.fillRect(destRect, TQt::white); // Draw busy indicator. // Im not really sure if this is a good idea. @@ -273,7 +273,7 @@ void DocumentWidget::paintEvent(TQPaintEvent *e) return; } - TQMemArray damagedRects = e->region().rects(); + TQMemArray damagedRects = TQRegion(e->region()).tqrects(); for (unsigned int i = 0; i < damagedRects.count(); i++) { // Paint the page where it intersects with the damaged area. @@ -342,9 +342,9 @@ void DocumentWidget::paintEvent(TQPaintEvent *e) p.setPen(NoPen); p.setBrush(white); - p.setRasterOp(Qt::XorROP); + p.setRasterOp(TQt::XorROP); - TQMemArray selectionRects = selectedRegion.rects(); + TQMemArray selectionRects = selectedRegion.tqrects(); for (unsigned int i = 0; i < selectionRects.count(); i++) p.drawRect(selectionRects[i]); @@ -355,8 +355,8 @@ void DocumentWidget::paintEvent(TQPaintEvent *e) { // Don't draw over the page shadow p.setClipRegion(e->region().intersect(pageRect())); - p.setRasterOp(Qt::CopyROP); - p.setPen(Qt::red); + p.setRasterOp(TQt::CopyROP); + p.setPen(TQt::red); p.drawLine(1, scrollGuide, pageSize().width(), scrollGuide); } } @@ -449,23 +449,23 @@ void DocumentWidget::mousePressEvent ( TQMouseEvent * e ) } // Check if the mouse is pressed on a regular hyperlink - if (e->button() == LeftButton) { + if (e->button() == Qt::LeftButton) { if (pageData->hyperLinkList.size() > 0) for(unsigned int i = 0; i < pageData->hyperLinkList.size(); i++) { - if (pageData->hyperLinkList[i].box.contains(e->pos())) { + if (pageData->hyperLinkList[i].box.tqcontains(e->pos())) { emit(localLink(pageData->hyperLinkList[i].linkText)); return; } } if (moveTool) - setCursor(Qt::SizeAllCursor); + setCursor(TQt::SizeAllCursor); else - setCursor(Qt::IbeamCursor); + setCursor(TQt::IbeamCursor); } - if (e->button() == RightButton || (!moveTool && e->button() == LeftButton)) + if (e->button() == Qt::RightButton || (!moveTool && e->button() == Qt::LeftButton)) { - setCursor(Qt::IbeamCursor); + setCursor(TQt::IbeamCursor); // If Shift is not pressed clear the current selection, // otherwise modify the existing selection. if (!(e->state() & ShiftButton)) @@ -485,7 +485,7 @@ void DocumentWidget::mouseReleaseEvent ( TQMouseEvent *e ) // otherwise the mouse cursor in the centeringScrollview is wrong e->ignore(); - if (e->button() == RightButton || (!moveTool && e->button() == LeftButton)) + if (e->button() == Qt::RightButton || (!moveTool && e->button() == Qt::LeftButton)) { // If the selectedRectangle is empty then there was only a single right click. if (firstSelectedPoint == e->pos()) @@ -537,14 +537,14 @@ void DocumentWidget::mouseMoveEvent ( TQMouseEvent * e ) int lastUnderlinedLink = indexOfUnderlinedLink; // go through hyperlinks for(unsigned int i = 0; i < pageData->hyperLinkList.size(); i++) { - if (pageData->hyperLinkList[i].box.contains(e->pos())) { + if (pageData->hyperLinkList[i].box.tqcontains(e->pos())) { clearStatusBarTimer.stop(); setCursor(pointingHandCursor); TQString link = pageData->hyperLinkList[i].linkText; if ( link.startsWith("#") ) link = link.remove(0,1); - emit setStatusBarText( i18n("Link to %1").arg(link) ); + emit setStatusBarText( i18n("Link to %1").tqarg(link) ); indexOfUnderlinedLink = i; if (KVSPrefs::underlineLinks() == KVSPrefs::EnumUnderlineLinks::OnlyOnHover && @@ -588,7 +588,7 @@ void DocumentWidget::mouseMoveEvent ( TQMouseEvent * e ) clearStatusBarTimer.start(200, true); // clear the statusbar after 200 msec. // Left mouse button pressed -> Text scroll function - if ((e->state() & LeftButton) != 0 && moveTool) + if ((e->state() & Qt::LeftButton) != 0 && moveTool) { // Pass the mouse event on to the owner of this widget ---under // normal circumstances that is the centeringScrollView which will @@ -597,7 +597,7 @@ void DocumentWidget::mouseMoveEvent ( TQMouseEvent * e ) } // Right mouse button pressed -> Text copy function - if ((e->state() & RightButton) != 0 || (!moveTool && (e->state() & LeftButton != 0))) + if ((e->state() & Qt::RightButton) != 0 || (!moveTool && (e->state() & Qt::LeftButton != 0))) { if (selectedRectangle.isEmpty()) { firstSelectedPoint = e->pos(); @@ -660,10 +660,10 @@ void DocumentWidget::updateSelection(const TextSelection& newTextSelection) selectedRegion = newlySelectedRegion; - TQMemArray rectangles = updateRegion.rects(); + TQMemArray rectangles = updateRegion.tqrects(); for (unsigned int i = 0; i < rectangles.count(); i++) { - repaint(rectangles[i]); + tqrepaint(rectangles[i]); } } } @@ -672,7 +672,7 @@ void DocumentWidget::updateSelection(const TextSelection& newTextSelection) void DocumentWidget::clearStatusBar() { - emit setStatusBarText( TQString::null ); + emit setStatusBarText( TQString() ); } @@ -745,11 +745,11 @@ void DocumentWidget::setStandardCursor() { if (moveTool) { - setCursor(Qt::arrowCursor); + setCursor(TQt::arrowCursor); } else { - setCursor(Qt::IbeamCursor); + setCursor(TQt::IbeamCursor); } } diff --git a/kviewshell/documentWidget.h b/kviewshell/documentWidget.h index c568d11c..29a20b79 100644 --- a/kviewshell/documentWidget.h +++ b/kviewshell/documentWidget.h @@ -27,15 +27,16 @@ class TQPaintEvent; /* DocumentWidget */ -class DocumentWidget : public QWidget +class DocumentWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - DocumentWidget(TQWidget *parent, PageView *sv, DocumentPageCache *cache, const char *name); + DocumentWidget(TQWidget *tqparent, PageView *sv, DocumentPageCache *cache, const char *name); - void setPageNumber(Q_UINT16 pageNr); - Q_UINT16 getPageNumber() const {return pageNr;} + void setPageNumber(TQ_UINT16 pageNr); + TQ_UINT16 getPageNumber() const {return pageNr;} /** Returns the size of the widget without the page shadow. */ TQSize pageSize() const; @@ -121,7 +122,7 @@ protected: int animationCounter; int flashOffset; - Q_UINT16 pageNr; + TQ_UINT16 pageNr; /* This timer is used to delay clearing of the statusbar. Clearing the statusbar is delayed to avoid awful flickering when the mouse @@ -156,7 +157,7 @@ protected: virtual void setStandardCursor(); private slots: - /** This slot emits the signal setStatusBarText(TQString::null) to + /** This slot emits the signal setStatusBarText(TQString()) to clear the status bar. It is connected to the timeout slot of the clearStatusBarTimer. */ void clearStatusBar(); diff --git a/kviewshell/emptyRenderer.cpp b/kviewshell/emptyRenderer.cpp index deeef488..876f1995 100644 --- a/kviewshell/emptyRenderer.cpp +++ b/kviewshell/emptyRenderer.cpp @@ -21,8 +21,8 @@ #include "emptyRenderer.h" -EmptyRenderer::EmptyRenderer(TQWidget* parent) - : DocumentRenderer(parent) +EmptyRenderer::EmptyRenderer(TQWidget* tqparent) + : DocumentRenderer(tqparent) { } diff --git a/kviewshell/emptyRenderer.h b/kviewshell/emptyRenderer.h index 71cf30aa..4496a36b 100644 --- a/kviewshell/emptyRenderer.h +++ b/kviewshell/emptyRenderer.h @@ -29,9 +29,10 @@ class RenderedDocumentPage; class EmptyRenderer : public DocumentRenderer { Q_OBJECT + TQ_OBJECT public: - EmptyRenderer(TQWidget* parent); + EmptyRenderer(TQWidget* tqparent); virtual bool setFile(const TQString &, const KURL &) { return false; } diff --git a/kviewshell/empty_multipage.cpp b/kviewshell/empty_multipage.cpp index 8fc1a0f8..9ba61627 100644 --- a/kviewshell/empty_multipage.cpp +++ b/kviewshell/empty_multipage.cpp @@ -26,9 +26,9 @@ K_EXPORT_COMPONENT_FACTORY(emptymultipagepart, EmptyMultiPageFactory) -EmptyMultiPage::EmptyMultiPage(TQWidget* parentWidget, const char* widgetName, TQObject* parent, const char* name, +EmptyMultiPage::EmptyMultiPage(TQWidget* tqparentWidget, const char* widgetName, TQObject* tqparent, const char* name, const TQStringList& args) - : KMultiPage(parentWidget, widgetName, parent, name), emptyRenderer(parentWidget) + : KMultiPage(tqparentWidget, widgetName, tqparent, name), emptyRenderer(tqparentWidget) { Q_UNUSED(args); setInstance(EmptyMultiPageFactory::instance()); diff --git a/kviewshell/empty_multipage.h b/kviewshell/empty_multipage.h index 455474f1..5722e3e9 100644 --- a/kviewshell/empty_multipage.h +++ b/kviewshell/empty_multipage.h @@ -30,12 +30,13 @@ class EmptyMultiPage : public KMultiPage { Q_OBJECT + TQ_OBJECT public: - EmptyMultiPage(TQWidget* parentWidget, const char* widgetName, TQObject* parent, const char* name, + EmptyMultiPage(TQWidget* tqparentWidget, const char* widgetName, TQObject* tqparent, const char* name, const TQStringList& args = TQStringList()); - virtual TQStringList fileFormats() const { return TQString::null; } + virtual TQStringList fileFormats() const { return TQString(); } /// opens a file virtual bool openFile() { return false; } diff --git a/kviewshell/history.cpp b/kviewshell/history.cpp index 0452efc1..4aade99d 100644 --- a/kviewshell/history.cpp +++ b/kviewshell/history.cpp @@ -9,7 +9,7 @@ #include "history.h" -HistoryItem::HistoryItem(Q_UINT32 p, Q_UINT32 y) +HistoryItem::HistoryItem(TQ_UINT32 p, TQ_UINT32 y) : page(p), ypos(y) { } @@ -23,7 +23,7 @@ History::History() { } -void History::add(Q_UINT32 page, Q_UINT32 ypos) +void History::add(TQ_UINT32 page, TQ_UINT32 ypos) { HistoryItem item(page, ypos); diff --git a/kviewshell/history.h b/kviewshell/history.h index 822e31d7..6b4c2ccf 100644 --- a/kviewshell/history.h +++ b/kviewshell/history.h @@ -15,13 +15,13 @@ class HistoryItem { public: - HistoryItem(Q_UINT32, Q_UINT32); + HistoryItem(TQ_UINT32, TQ_UINT32); HistoryItem() {} bool operator== (const HistoryItem& item) const; - Q_UINT32 page; - Q_UINT32 ypos; + TQ_UINT32 page; + TQ_UINT32 ypos; }; inline @@ -31,14 +31,15 @@ bool operator!=(const HistoryItem& lhs, const HistoryItem& rhs) } -class History : public QObject +class History : public TQObject { Q_OBJECT + TQ_OBJECT public: History(); - void add(Q_UINT32 page, Q_UINT32 ypos); + void add(TQ_UINT32 page, TQ_UINT32 ypos); void clear(); HistoryItem* forward(); diff --git a/kviewshell/hyperlink.h b/kviewshell/hyperlink.h index 66de5c6f..d57843b8 100644 --- a/kviewshell/hyperlink.h +++ b/kviewshell/hyperlink.h @@ -39,7 +39,7 @@ public: @param re value for the box @param lT valus for the text field */ - Hyperlink(Q_UINT32 bl, const TQRect& re, const TQString& lT): baseline(bl), box(re), linkText(lT) {} + Hyperlink(TQ_UINT32 bl, const TQRect& re, const TQString& lT): baseline(bl), box(re), linkText(lT) {} /** \brief Base line of a hyperlink @@ -52,7 +52,7 @@ public: in the box contains characters with underlengths, such as 'y', 'j' or 'g'. */ - Q_UINT32 baseline; + TQ_UINT32 baseline; /** \brief Bounding box of the text or hyperlink diff --git a/kviewshell/kmultipage.cpp b/kviewshell/kmultipage.cpp index 679b0dcf..f927c62c 100644 --- a/kviewshell/kmultipage.cpp +++ b/kviewshell/kmultipage.cpp @@ -34,8 +34,8 @@ //#define DEBUG_KMULTIPAGE -KMultiPage::KMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name) - : DCOPObject("kmultipage"), KParts::ReadOnlyPart(parent, name) +KMultiPage::KMultiPage(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent, const char *name) + : DCOPObject("kmultipage"), KParts::ReadOnlyPart(tqparent, name) { // For reasons which I don't understand, the initialization of the // DCOPObject above does not work properly, the name is ignored. It @@ -43,18 +43,18 @@ KMultiPage::KMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject // This is because of the virtual inheritance. Get rid of it (but it's BC, and this is a lib...) -- DF setObjId("kmultipage"); - parentWdg = parentWidget; + tqparentWdg = tqparentWidget; lastCurrentPage = 0; timer_id = -1; searchInProgress = false; - TQVBox* verticalBox = new TQVBox(parentWidget); - verticalBox->setFocusPolicy(TQWidget::StrongFocus); + TQVBox* verticalBox = new TQVBox(tqparentWidget); + verticalBox->setFocusPolicy(TQ_StrongFocus); setWidget(verticalBox); splitterWidget = new TQSplitter(verticalBox, widgetName); splitterWidget->setOpaqueResize(false); - splitterWidget->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + splitterWidget->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); // Create SideBar sideBar = new TQToolBox(splitterWidget, "sidebar"); @@ -117,7 +117,7 @@ void KMultiPage::readSettings() void KMultiPage::writeSettings() { - // Save TOC layout + // Save TOC tqlayout tableOfContents->writeSettings(); KVSPrefs::setGuiLayout(splitterWidget->sizes()); @@ -146,27 +146,27 @@ void KMultiPage::slotSave() // Try to guess the proper ending... TQString formats; TQString ending; - int rindex = m_file.findRev("."); + int rindex = m_file.tqfindRev("."); if (rindex == -1) { - ending = TQString::null; - formats = TQString::null; + ending = TQString(); + formats = TQString(); } else { ending = m_file.mid(rindex); // e.g. ".dvi" formats = fileFormats().grep(ending).join("\n"); } - TQString fileName = KFileDialog::getSaveFileName(TQString::null, formats, 0, i18n("Save File As")); + TQString fileName = KFileDialog::getSaveFileName(TQString(), formats, 0, i18n("Save File As")); if (fileName.isEmpty()) return; // Add the ending to the filename. I hope the user likes it that // way. - if (!ending.isEmpty() && fileName.find(ending) == -1) + if (!ending.isEmpty() && fileName.tqfind(ending) == -1) fileName = fileName+ending; if (TQFile(fileName).exists()) { - int r = KMessageBox::warningContinueCancel (0, i18n("The file %1\nexists. Shall I overwrite that file?").arg(fileName), + int r = KMessageBox::warningContinueCancel (0, i18n("The file %1\nexists. Shall I overwrite that file?").tqarg(fileName), i18n("Overwrite File"), i18n("Overwrite")); if (r == KMessageBox::Cancel) return; @@ -198,7 +198,7 @@ bool KMultiPage::closeURL() document_history.clear(); // Close the file. - renderer->setFile(TQString::null, KURL()); + renderer->setFile(TQString(), KURL()); renderer->clear(); // Delete Page Widgets. @@ -207,7 +207,7 @@ bool KMultiPage::closeURL() widgetList.setAutoDelete(false); // Update ScrollView. - scrollView()->layoutPages(); + scrollView()->tqlayoutPages(); enableActions(false); // Clear Thumbnail List. @@ -216,8 +216,8 @@ bool KMultiPage::closeURL() // Clear Table of Contents tableOfContents->clear(); - // Clear Status Bar - emit setStatusBarText(TQString::null); + // Clear tqStatus Bar + emit setStatusBarText(TQString()); return true; } @@ -389,7 +389,7 @@ void KMultiPage::generateDocumentWidgets(const PageNumber& _startPage) // Find out how many widgets are needed, and resize the widgetList accordingly. widgetList.setAutoDelete(true); - Q_UINT16 oldwidgetListSize = widgetList.size(); + TQ_UINT16 oldwidgetListSize = widgetList.size(); if (numberOfPages() == 0) widgetList.resize(0); else @@ -406,7 +406,7 @@ void KMultiPage::generateDocumentWidgets(const PageNumber& _startPage) // Calculate the number of the first page in the tableau. tableauStartPage = startPage - ((startPage - 1) % visiblePages); // We cannot have more widgets then pages in the document. - visiblePages = QMIN(visiblePages, numberOfPages() - tableauStartPage + 1); + visiblePages = TQMIN(visiblePages, numberOfPages() - tableauStartPage + 1); if (widgetList.size() != visiblePages) widgetList.resize(visiblePages); break; @@ -428,7 +428,7 @@ void KMultiPage::generateDocumentWidgets(const PageNumber& _startPage) // Allocate DocumentWidget structures so that all entries of // widgetList point to a valid DocumentWidget. DocumentWidget *documentWidget; - for(Q_UINT16 i=0; isetPageNumber(tableauStartPage + i); } - scrollView()->layoutPages(); + scrollView()->tqlayoutPages(); } } // move scrollview to "page". // Make the widget pageWidget visible in the scrollview. Somehow this // doesn't seem to trigger the signal contentsMoved in the - // QScrollview, so that we better call setCurrentPage() ourselves. + // TQScrollview, so that we better call setCurrentPage() ourselves. pageWidget = (DocumentWidget*)(widgetList[page % visiblePages]); scrollView()->moveViewportToWidget(pageWidget, y); @@ -575,7 +575,7 @@ bool KMultiPage::gotoPage(const PageNumber& page, int y, bool isLink) } pageWidget->setPageNumber(page); - scrollView()->layoutPages(); + scrollView()->tqlayoutPages(); scrollView()->moveViewportToWidget(pageWidget, y); } else { // There are multiple widgets, then we are either in the @@ -689,9 +689,9 @@ void KMultiPage::renderModeChanged() pageCache->clear(); generateDocumentWidgets(); - scrollView()->layoutPages(); + scrollView()->tqlayoutPages(); - for (Q_UINT16 i=0; i < widgetList.size(); i++) + for (TQ_UINT16 i=0; i < widgetList.size(); i++) { DocumentWidget* documentWidget = widgetList[i]; if (documentWidget == 0) @@ -700,20 +700,20 @@ void KMultiPage::renderModeChanged() documentWidget->update(); } - markList()->repaintThumbnails(); + markList()->tqrepaintThumbnails(); } -void KMultiPage::repaintAllVisibleWidgets() +void KMultiPage::tqrepaintAllVisibleWidgets() { #ifdef DEBUG_KMULTIPAGE - kdDebug(1233) << "KMultiPage::repaintAllVisibleWidgets()" << endl; + kdDebug(1233) << "KMultiPage::tqrepaintAllVisibleWidgets()" << endl; #endif bool everResized = false; // Go through the list of widgets and resize them, if necessary - for(Q_UINT16 i=0; ilayoutPages(true); + scrollView()->tqlayoutPages(true); } @@ -767,7 +767,7 @@ void KMultiPage::print() return; // initialize the printer using the print dialog - if ( printer->setup(parentWdg, i18n("Print %1").arg(m_file.section('/', -1))) ) { + if ( printer->setup(tqparentWdg, i18n("Print %1").tqarg(m_file.section('/', -1))) ) { // Now do the printing. TQValueList pageList = printer->pageList(); if (pageList.isEmpty()) @@ -790,7 +790,7 @@ void KMultiPage::print() // Printing usually takes a while. This is to keep the GUI // updated. - qApp->processEvents(); + tqApp->processEvents(); TQPainter *paint = rdpp.getPainter(); if (paint != 0) { @@ -872,13 +872,13 @@ void KMultiPage::setRenderer(DocumentRenderer* _renderer) connect(pageCache, TQT_SIGNAL(paperSizeChanged()), this, TQT_SLOT(renderModeChanged())); connect(pageCache, TQT_SIGNAL(textSelected(bool)), this, TQT_SIGNAL(textSelected(bool))); connect(renderer, TQT_SIGNAL(documentIsChanged()), this, TQT_SLOT(renderModeChanged())); - connect(this, TQT_SIGNAL(zoomChanged()), this, TQT_SLOT(repaintAllVisibleWidgets())); + connect(this, TQT_SIGNAL(zoomChanged()), this, TQT_SLOT(tqrepaintAllVisibleWidgets())); } void KMultiPage::updateWidgetSize(const PageNumber& pageNumber) { - for(Q_UINT16 i=0; ipageSize()) { documentWidget->setPageSize(pageSize); - scrollView()->layoutPages(); + scrollView()->tqlayoutPages(); } // We have just one widget per page. break; @@ -1041,7 +1041,7 @@ double KMultiPage::calculateFitToWidthZoomValue() // of the viewport and scale the contents by a factor x so that it // fits the viewport exactly, then, depending on chosen papersize // (landscape, etc.), the contents may be higher than the viewport - // and the QScrollview may or may not insert a scrollbar at the + // and the TQScrollview may or may not insert a scrollbar at the // right. If the scrollbar appears, then the usable width of the // viewport becomes smaller, and scaling by x does not really fit // the (now smaller page) anymore. @@ -1081,8 +1081,8 @@ double KMultiPage::calculateFitToWidthZoomValue() void KMultiPage::prevPage() { - Q_UINT8 cols = scrollView()->getNrColumns(); - Q_UINT8 rows = scrollView()->getNrRows(); + TQ_UINT8 cols = scrollView()->getNrColumns(); + TQ_UINT8 rows = scrollView()->getNrRows(); PageNumber np = 1; if (cols*rows < currentPageNumber()) @@ -1096,10 +1096,10 @@ void KMultiPage::prevPage() void KMultiPage::nextPage() { - Q_UINT8 cols = scrollView()->getNrColumns(); - Q_UINT8 rows = scrollView()->getNrRows(); + TQ_UINT8 cols = scrollView()->getNrColumns(); + TQ_UINT8 rows = scrollView()->getNrRows(); - PageNumber np = QMIN(currentPageNumber() + cols*rows, (Q_UINT16)numberOfPages()); + PageNumber np = TQMIN(currentPageNumber() + cols*rows, (TQ_UINT16)numberOfPages()); gotoPage(np); } @@ -1117,7 +1117,7 @@ void KMultiPage::lastPage() } -void KMultiPage::scroll(Q_INT32 deltaInPixel) +void KMultiPage::scroll(TQ_INT32 deltaInPixel) { TQScrollBar* scrollBar = scrollView()->verticalScrollBar(); if (scrollBar == 0) { @@ -1393,8 +1393,8 @@ void KMultiPage::findNextText() // start. If nothing is selected, we start at the beginning of the // current page. Otherwise, start after the selected text. TODO: // Optimize this to get a better 'user feeling' - Q_UINT16 startingPage; - Q_UINT16 startingTextItem; + TQ_UINT16 startingPage; + TQ_UINT16 startingTextItem; TextSelection userSelection = pageCache->selectedText(); if (userSelection.isEmpty()) @@ -1427,7 +1427,7 @@ void KMultiPage::findNextText() if (i != 0) { - setStatusBarText(i18n("Search page %1 of %2").arg(pageNumber).arg(numberOfPages())); + setStatusBarText(i18n("Search page %1 of %2").tqarg(pageNumber).tqarg(numberOfPages())); kapp->processEvents(); } @@ -1461,7 +1461,7 @@ void KMultiPage::findNextText() if (searchPage->textBoxList.size() == 0) continue; - foundSelection = searchPage->find(searchText, startingTextItem, case_sensitive); + foundSelection = searchPage->tqfind(searchText, startingTextItem, case_sensitive); if (foundSelection.isEmpty()) { @@ -1474,12 +1474,12 @@ void KMultiPage::findNextText() int answ = KMessageBox::questionYesNo(scrollView(), i18n("The search string %1 could not be found by the " "end of the document. Should the search be restarted from the beginning " - "of the document?").arg(searchText), + "of the document?").tqarg(searchText), i18n("Text Not Found"), KStdGuiItem::cont(), KStdGuiItem::cancel()); if (answ != KMessageBox::Yes) { - setStatusBarText(TQString::null); + setStatusBarText(TQString()); searchInProgress = false; if (!cachedPage) delete searchPage; @@ -1491,7 +1491,7 @@ void KMultiPage::findNextText() { pageCache->selectText(foundSelection); gotoPage(pageCache->selectedText()); - setStatusBarText(TQString::null); + setStatusBarText(TQString()); searchInProgress = false; if (!cachedPage) delete searchPage; @@ -1499,8 +1499,8 @@ void KMultiPage::findNextText() } } - KMessageBox::sorry(scrollView(), i18n("The search string %1 could not be found.").arg(searchText)); - setStatusBarText(TQString::null); + KMessageBox::sorry(scrollView(), i18n("The search string %1 could not be found.").tqarg(searchText)); + setStatusBarText(TQString()); searchInProgress = false; if (!cachedPage) delete searchPage; @@ -1569,7 +1569,7 @@ void KMultiPage::findPrevText() if (i != 0) { - setStatusBarText(i18n("Search page %1 of %2").arg(pageNumber).arg(numberOfPages())); + setStatusBarText(i18n("Search page %1 of %2").tqarg(pageNumber).tqarg(numberOfPages())); kapp->processEvents(); } @@ -1603,7 +1603,7 @@ void KMultiPage::findPrevText() if (searchPage->textBoxList.size() == 0) continue; - foundSelection = searchPage->findRev(searchText, startingTextItem, case_sensitive); + foundSelection = searchPage->tqfindRev(searchText, startingTextItem, case_sensitive); if (foundSelection.isEmpty()) { @@ -1616,12 +1616,12 @@ void KMultiPage::findPrevText() int answ = KMessageBox::questionYesNo(scrollView(), i18n("The search string %1 could not be found by the " "beginning of the document. Should the search be restarted from the end " - "of the document?").arg(searchText), + "of the document?").tqarg(searchText), i18n("Text Not Found"), KStdGuiItem::cont(), KStdGuiItem::cancel()); if (answ != KMessageBox::Yes) { - setStatusBarText(TQString::null); + setStatusBarText(TQString()); searchInProgress = false; if (!cachedPage) delete searchPage; @@ -1633,7 +1633,7 @@ void KMultiPage::findPrevText() { pageCache->selectText(foundSelection); gotoPage(pageCache->selectedText()); - setStatusBarText(TQString::null); + setStatusBarText(TQString()); searchInProgress = false; if (!cachedPage) delete searchPage; @@ -1641,8 +1641,8 @@ void KMultiPage::findPrevText() } } - KMessageBox::sorry(scrollView(), i18n("The search string %1 could not be found.").arg(searchText)); - setStatusBarText(TQString::null); + KMessageBox::sorry(scrollView(), i18n("The search string %1 could not be found.").tqarg(searchText)); + setStatusBarText(TQString()); searchInProgress = false; if (!cachedPage) delete searchPage; @@ -1710,8 +1710,8 @@ void KMultiPage::reload() pageCache->clear(); pageCache->deselectText(); document_history.clear(); - emit setStatusBarText(i18n("Reloading file %1").arg(m_file)); - Q_INT32 pg = currentPageNumber(); + emit setStatusBarText(i18n("Reloading file %1").tqarg(m_file)); + TQ_INT32 pg = currentPageNumber(); killTimer(timer_id); timer_id = -1; @@ -1728,7 +1728,7 @@ void KMultiPage::reload() setCurrentPageNumber(pg); setFile(r); - emit setStatusBarText(TQString::null); + emit setStatusBarText(TQString()); } else { if (timer_id == -1) timer_id = startTimer(1000); @@ -1746,7 +1746,7 @@ bool KMultiPage::openFile() pageCache->deselectText(); document_history.clear(); pageCache->clear(); - emit setStatusBarText(i18n("Loading file %1").arg(m_file)); + emit setStatusBarText(i18n("Loading file %1").tqarg(m_file)); bool r = renderer->setFile(m_file, m_url); @@ -1765,13 +1765,13 @@ bool KMultiPage::openFile() // Set Table of Contents tableOfContents->setContents(renderer->getBookmarks()); } else - m_file = TQString::null; + m_file = TQString(); setFile(r); // Clear Statusbar - emit setStatusBarText(TQString::null); + emit setStatusBarText(TQString()); return r; } @@ -1810,7 +1810,7 @@ void KMultiPage::wheelEvent(TQWheelEvent *e) return; } - Q_INT32 pxl = -(e->delta()*sb->lineStep())/60; + TQ_INT32 pxl = -(e->delta()*sb->lineStep())/60; if (pxl == 0) { if (e->delta() > 0) @@ -1887,9 +1887,9 @@ KPrinter *KMultiPage::getPrinter(bool enablePageSizeFeatures) } else it++; if (endval == val) - range += TQString("%1").arg(val); + range += TQString("%1").tqarg(val); else - range += TQString("%1-%2").arg(val).arg(endval); + range += TQString("%1-%2").tqarg(val).tqarg(endval); } while (it != selectedPageNo.end() ); printer->setOption( "kde-range", range ); } @@ -1901,7 +1901,7 @@ void KMultiPage::doExportText() { // Generate a suggestion for a reasonable file name TQString suggestedName = url().filename(); - suggestedName = suggestedName.left(suggestedName.find(".")) + ".txt"; + suggestedName = suggestedName.left(suggestedName.tqfind(".")) + ".txt"; TQString fileName = KFileDialog::getSaveFileName(suggestedName, i18n("*.txt|Plain Text (Latin 1) (*.txt)"), scrollView(), i18n("Export File As")); @@ -1912,7 +1912,7 @@ void KMultiPage::doExportText() if (finfo.exists()) { int r = KMessageBox::warningContinueCancel (scrollView(), - i18n("The file %1\nexists. Do you want to overwrite that file?").arg(fileName), + i18n("The file %1\nexists. Do you want to overwrite that file?").tqarg(fileName), i18n("Overwrite File"), i18n("Overwrite")); if (r == KMessageBox::Cancel) @@ -1933,7 +1933,7 @@ void KMultiPage::doExportText() for(unsigned int page = 1; page <= renderer->totalPages(); page++) { progress.setProgress(page); - qApp->processEvents(); + tqApp->processEvents(); if (progress.wasCancelled()) break; diff --git a/kviewshell/kmultipage.h b/kviewshell/kmultipage.h index 285031ca..dc05200a 100644 --- a/kviewshell/kmultipage.h +++ b/kviewshell/kmultipage.h @@ -37,9 +37,10 @@ class SearchWidget; class KMultiPage : public KParts::ReadOnlyPart, virtual public kmultipageInterface { Q_OBJECT + TQ_OBJECT public: - KMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name); + KMultiPage(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent, const char *name); virtual ~KMultiPage(); /* returns the scrollview used for the display */ @@ -91,7 +92,7 @@ public: should) therefore be re-implemented if you have good code to convert your document to PostScript. - Example: If your document consists of a single A4 page that contains + Example: If your document consists of a single A4 page that tqcontains a DJVU image of 30KB, then the default implementation would render the image in 600dpi, i.e. in about 7000x5000 pixel, and then send this huge graphics uncompressed to the printer. A smart @@ -120,7 +121,7 @@ public: // Show the printer options dialog. Return immediately if the user // aborts. - if (!printer->setup(parentWdg, i18n("Print %1").arg(m_file.section('/', -1)) )) { + if (!printer->setup(tqparentWdg, i18n("Print %1").tqarg(m_file.section('/', -1)) )) { delete printer; return; } @@ -154,7 +155,7 @@ public: // Show the printer options dialog. Return immediately if the user // aborts. - if (!printer->setup(parentWdg, i18n("Print %1").arg(m_file.section('/', -1)) )) { + if (!printer->setup(tqparentWdg, i18n("Print %1").tqarg(m_file.section('/', -1)) )) { delete printer; return; } @@ -291,8 +292,8 @@ public: virtual double calculateFitToHeightZoomValue(); /* Returns the number of columns into which the widgets are aligned. */ - virtual Q_UINT8 getNrColumns() const { return _scrollView->getNrColumns(); } - virtual Q_UINT8 getNrRows() const { return _scrollView->getNrRows(); } + virtual TQ_UINT8 getNrColumns() const { return _scrollView->getNrColumns(); } + virtual TQ_UINT8 getNrRows() const { return _scrollView->getNrRows(); } virtual bool overviewMode() const { return _scrollView->overviewMode(); } @@ -425,9 +426,9 @@ public slots: */ void renderModeChanged(); - /* Empties the page cache and --as the name suggests-- repaints all + /* Empties the page cache and --as the name suggests-- tqrepaints all visible widgets. */ - void repaintAllVisibleWidgets(); + void tqrepaintAllVisibleWidgets(); /* Tells the multipage if scrollbars should be used. */ virtual void slotShowScrollbars(bool); @@ -485,7 +486,7 @@ public slots: makes it a little easier for the user to scroll with the mouse wheel or the keyboard without involuntarily moving to another page. */ - virtual void scroll(Q_INT32 deltaInPixel); + virtual void scroll(TQ_INT32 deltaInPixel); virtual void slotEnableMoveTool(bool enable); @@ -564,11 +565,11 @@ protected: KPrinter *getPrinter(bool enablePageSizeFeatures=true); - /** Pointer to the parent widget + /** Pointer to the tqparent widget This pointer is automatically set by the constructor. */ - TQGuardedPtr parentWdg; + TQGuardedPtr tqparentWdg; TQPtrVector widgetList; diff --git a/kviewshell/kprintDialogPage_pageoptions.cpp b/kviewshell/kprintDialogPage_pageoptions.cpp index c0c4b15e..77ff0949 100644 --- a/kviewshell/kprintDialogPage_pageoptions.cpp +++ b/kviewshell/kprintDialogPage_pageoptions.cpp @@ -20,8 +20,8 @@ #include "kprintDialogPage_pageoptions.h" -KPrintDialogPage_PageOptions::KPrintDialogPage_PageOptions( TQWidget *parent, const char *name ) - : KPrintDialogPage( parent, name ) +KPrintDialogPage_PageOptions::KPrintDialogPage_PageOptions( TQWidget *tqparent, const char *name ) + : KPrintDialogPage( tqparent, name ) { setTitle( i18n("Page Size & Placement") ); @@ -33,7 +33,7 @@ KPrintDialogPage_PageOptions::KPrintDialogPage_PageOptions( TQWidget *parent, co kprintDialogPage_pageoptions_baseLayout = new TQVBoxLayout( this, 11, 6, "kprintDialogPage_pageoptions_baseLayout"); if (kprintDialogPage_pageoptions_baseLayout == 0) { - kdError(1223) << "KPrintDialogPage_PageOptions::KPrintDialogPage_PageOptions() cannot create layout" << endl; + kdError(1223) << "KPrintDialogPage_PageOptions::KPrintDialogPage_PageOptions() cannot create tqlayout" << endl; return; } @@ -91,7 +91,7 @@ KPrintDialogPage_PageOptions::KPrintDialogPage_PageOptions( TQWidget *parent, co } - resize( TQSize(319, 166).expandedTo(minimumSizeHint()) ); + resize( TQSize(319, 166).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); } diff --git a/kviewshell/kprintDialogPage_pageoptions.h b/kviewshell/kprintDialogPage_pageoptions.h index 8fea375f..4ae81eb8 100644 --- a/kviewshell/kprintDialogPage_pageoptions.h +++ b/kviewshell/kprintDialogPage_pageoptions.h @@ -24,7 +24,7 @@ class TQVBoxLayout; class KPrintDialogPage_PageOptions : public KPrintDialogPage { public: - KPrintDialogPage_PageOptions( TQWidget *parent = 0, const char *name = 0 ); + KPrintDialogPage_PageOptions( TQWidget *tqparent = 0, const char *name = 0 ); void getOptions( TQMap& opts, bool incldef = false ); void setOptions( const TQMap& opts ); diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp index 56e13b64..eb981335 100644 --- a/kviewshell/kviewpart.cpp +++ b/kviewshell/kviewpart.cpp @@ -56,10 +56,10 @@ typedef KParts::GenericFactory KViewPartFactory; K_EXPORT_COMPONENT_FACTORY(kviewerpart, KViewPartFactory) -KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *parent, +KViewPart::KViewPart(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList& args) - : KViewPart_Iface(parent, name), showSidebar(0), saveAction(0), partManager(0), - multiPageLibrary(TQString::null), aboutDialog(0) + : KViewPart_Iface(tqparent, name), showSidebar(0), saveAction(0), partManager(0), + multiPageLibrary(TQString()), aboutDialog(0) { KGlobal::locale()->insertCatalogue("kviewshell"); @@ -71,12 +71,12 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p connect(watch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(fileChanged(const TQString&))); watch->startScan(); - mainWidget = new TQHBox(parentWidget, widgetName); - mainWidget->setFocusPolicy(TQWidget::StrongFocus); + mainWidget = new TQHBox(tqparentWidget, widgetName); + mainWidget->setFocusPolicy(TQ_StrongFocus); setWidget(mainWidget); // Setup part manager - partManager = new KParts::PartManager(parentWidget, "PartManager for kviewpart"); + partManager = new KParts::PartManager(tqparentWidget, "PartManager for kviewpart"); setManager(partManager); // Don't switch to another part when pressing a mouse button partManager->setActivationButtonMask(0); @@ -96,24 +96,24 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p // If a default MimeType is specified try to load a MultiPage supporting it. TQString defaultMimeType = args.first(); offers = KTrader::self()->query( - TQString::fromLatin1("KViewShell/MultiPage" ), + TQString::tqfromLatin1("KViewShell/MultiPage" ), TQString("([X-KDE-MultiPageVersion] == %1) and " - "([X-KDE-MimeTypes] == '%2')").arg(MULTIPAGE_VERSION).arg(defaultMimeType)); + "([X-KDE-MimeTypes] == '%2')").tqarg(MULTIPAGE_VERSION).tqarg(defaultMimeType)); } // If no default MimeType is given or no MultiPage has been found, try to load the Empty MultiPage. if (offers.isEmpty()) { offers = KTrader::self()->query( - TQString::fromLatin1("KViewShell/MultiPage" ), + TQString::tqfromLatin1("KViewShell/MultiPage" ), TQString("([X-KDE-MultiPageVersion] == %1) and " - "([X-KDE-EmptyMultiPage] == 1)").arg(MULTIPAGE_VERSION)); + "([X-KDE-EmptyMultiPage] == 1)").tqarg(MULTIPAGE_VERSION)); } // If still no MultiPage has been found, report an error and abort. if (offers.isEmpty()) { - KMessageBox::error(parentWidget, i18n("No MultiPage found.")); + KMessageBox::error(tqparentWidget, i18n("No MultiPage found.")); // return; } @@ -122,7 +122,7 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p // Try to load the multiPage int error; - multiPage = static_cast(KParts::ComponentFactory::createInstanceFromService(service, mainWidget, + multiPage = static_cast(KParts::ComponentFactory::createInstanceFromService(service, TQT_TQOBJECT(mainWidget), service->name().utf8(), TQStringList(), &error )); // If the loading of the MultiPage failed report and error and abort. @@ -137,7 +137,7 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p break; case KParts::ComponentFactory::ErrNoLibrary: reason = i18n("

The specified library %1 could not be loaded. The error message returned was:

" - "

%2

").arg(service->library()).arg(KLibLoader::self()->lastErrorMessage()); + "

%2

").tqarg(service->library()).tqarg(KLibLoader::self()->lastErrorMessage()); break; case KParts::ComponentFactory::ErrNoFactory: reason = i18n("The library does not export a factory for creating components."); @@ -155,13 +155,13 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p "question. If that does not help, you could file an error report, either to the " "provider of your software (e.g. the vendor of your Linux distribution), or " "directly to the authors of the software. The entry Report Bug... in the " - "Help menu helps you to contact the KDE programmers.

").arg(m_file).arg(service->library()); + "Help menu helps you to contact the KDE programmers.

").tqarg(m_file).tqarg(service->library()); TQString caption = i18n("Error Initializing Software Component"); KMessageBox::detailedError(mainWidget, text, reason, caption); - emit setStatusBarText(TQString::null); + emit setStatusBarText(TQString()); return; } - // Make the KViewPart the parent of the MultiPage. + // Make the KViewPart the tqparent of the MultiPage. // So the Partmanager treats it as a nested KPart. insertChild(multiPage); @@ -173,7 +173,7 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p exportTextAction = new KAction(i18n("Text..."), 0, this, TQT_SLOT(mp_exportText()), actionCollection(), "export_text"); // edit menu - findTextAction = KStdAction::find(this, TQT_SLOT(mp_showFindTextDialog()), actionCollection(), "find"); + findTextAction = KStdAction::find(this, TQT_SLOT(mp_showFindTextDialog()), actionCollection(), "tqfind"); findNextAction = KStdAction::findNext(this, TQT_SLOT(mp_findNextText()), actionCollection(), "findnext"); findNextAction->setEnabled(false); findPrevAction = KStdAction::findPrev(this, TQT_SLOT(mp_findPrevText()), actionCollection(), "findprev"); @@ -206,11 +206,11 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p viewModeAction = new KSelectAction (i18n("View Mode"), 0, 0, 0, actionCollection(), "viewmode"); viewModeAction->setItems(viewModes); - // Orientation menu + // Qt::Orientation menu TQStringList orientations; orientations.append(i18n("Portrait")); orientations.append(i18n("Landscape")); - orientation = new KSelectAction (i18n("Preferred &Orientation"), 0, 0, 0, actionCollection(), "view_orientation"); + orientation = new KSelectAction (i18n("Preferred &Qt::Orientation"), 0, 0, 0, actionCollection(), "view_orientation"); orientation->setItems(orientations); connect(orientation, TQT_SIGNAL(activated (int)), &userRequestedPaperSize, TQT_SLOT(setOrientation(int))); @@ -411,18 +411,18 @@ TQString KViewPart::pageSizeDescription() { PageNumber nr = multiPage->currentPageNumber(); if (!nr.isValid()) - return TQString::null; + return TQString(); SimplePageSize ss = multiPage->sizeOfPage(nr); if (!ss.isValid()) - return TQString::null; + return TQString(); pageSize s(ss); TQString size = " "; if (s.formatNumber() == -1) { if (KGlobal::locale()-> measureSystem() == KLocale::Metric) - size += TQString("%1x%2 mm").arg(s.width().getLength_in_mm(), 0, 'f', 0).arg(s.height().getLength_in_mm(), 0, 'f', 0); + size += TQString("%1x%2 mm").tqarg(s.width().getLength_in_mm(), 0, 'f', 0).tqarg(s.height().getLength_in_mm(), 0, 'f', 0); else - size += TQString("%1x%2 in").arg(s.width().getLength_in_inch(), 0, 'g', 2).arg(s.height().getLength_in_inch(), 0, 'g', 2); + size += TQString("%1x%2 in").tqarg(s.width().getLength_in_inch(), 0, 'g', 2).tqarg(s.height().getLength_in_inch(), 0, 'g', 2); } else { size += s.formatName() + "/"; if (s.getOrientation() == 0) @@ -459,7 +459,7 @@ void KViewPart::slotFileOpen() return; } - KURL url = KFileDialog::getOpenURL(TQString::null, supportedMimeTypes().join(" ")); + KURL url = KFileDialog::getOpenURL(TQString(), supportedMimeTypes().join(" ")); if (!url.isEmpty()) openURL(url); @@ -471,8 +471,8 @@ TQStringList KViewPart::supportedMimeTypes() // Search for service KTrader::OfferList offers = KTrader::self()->query( - TQString::fromLatin1("KViewShell/MultiPage"), - TQString("([X-KDE-MultiPageVersion] == %1)").arg(MULTIPAGE_VERSION) + TQString::tqfromLatin1("KViewShell/MultiPage"), + TQString("([X-KDE-MultiPageVersion] == %1)").tqarg(MULTIPAGE_VERSION) ); if (!offers.isEmpty()) @@ -516,8 +516,8 @@ TQStringList KViewPart::fileFormats() const // Search for service KTrader::OfferList offers = KTrader::self()->query( - TQString::fromLatin1("KViewShell/MultiPage"), - TQString("([X-KDE-MultiPageVersion] == %1)").arg(MULTIPAGE_VERSION) + TQString::tqfromLatin1("KViewShell/MultiPage"), + TQString("([X-KDE-MultiPageVersion] == %1)").tqarg(MULTIPAGE_VERSION) ); if (!offers.isEmpty()) @@ -553,10 +553,10 @@ TQStringList KViewPart::fileFormats() const for(TQStringList::Iterator it = supportedPattern.begin(); it != supportedPattern.end(); ++it ) { - if ((*it).find(".gz", -3) == -1) // Paranoia safety check + if ((*it).tqfind(".gz", -3) == -1) // Paranoia safety check compressedPattern.append(*it + ".gz"); - if ((bzip2Available) && ((*it).find(".bz2", -4) == -1)) // Paranoia safety check + if ((bzip2Available) && ((*it).tqfind(".bz2", -4) == -1)) // Paranoia safety check compressedPattern.append(*it + ".bz2"); } @@ -613,7 +613,7 @@ bool KViewPart::openFile() for (TQStringList::Iterator it = supportedPatterns.begin(); it != supportedPatterns.end(); ++it) { // Only consider patterns starting with "*." - if ((*it).find("*.") == 0) + if ((*it).tqfind("*.") == 0) { // Remove first Letter from string endings.append((*it).mid(2).stripWhiteSpace()); @@ -642,8 +642,8 @@ bool KViewPart::openFile() // If we still have not found a file. Show an error message and return. if (!fi.exists()) { - KMessageBox::error(mainWidget, i18n("File %1 does not exist.").arg(m_file)); - emit setStatusBarText(TQString::null); + KMessageBox::error(mainWidget, i18n("File %1 does not exist.").tqarg(m_file)); + emit setStatusBarText(TQString()); return false; } m_url.setPath(TQFileInfo(m_file).absFilePath()); @@ -651,7 +651,7 @@ bool KViewPart::openFile() // Set the window caption now, before we do any uncompression and generation of temporary files. tmpFileURL.setPath(m_file); - emit setStatusBarText(i18n("Loading '%1'...").arg(tmpFileURL.prettyURL())); + emit setStatusBarText(i18n("Loading '%1'...").tqarg(tmpFileURL.prettyURL())); emit setWindowCaption( tmpFileURL.prettyURL() ); // set Window caption WITHOUT the reference part! // Check if the file is compressed @@ -670,17 +670,17 @@ bool KViewPart::openFile() { KMessageBox::error(mainWidget, i18n("File Error! Could not create " "temporary file.")); - emit setWindowCaption(TQString::null); - emit setStatusBarText(TQString::null); + emit setWindowCaption(TQString()); + emit setStatusBarText(TQString()); return false; } tmpUnzipped->setAutoDelete(true); if(tmpUnzipped->status() != 0) { KMessageBox::error(mainWidget, i18n("File Error! Could not create temporary file " - "%1.").arg(strerror(tmpUnzipped->status()))); - emit setWindowCaption(TQString::null); - emit setStatusBarText(TQString::null); + "%1.").tqarg(strerror(tmpUnzipped->status()))); + emit setWindowCaption(TQString()); + emit setStatusBarText(TQString()); return false; } @@ -692,27 +692,27 @@ bool KViewPart::openFile() filterDev = KFilterDev::deviceForFile(m_file); if (filterDev == 0L) { - emit setWindowCaption(TQString::null); - emit setStatusBarText(TQString::null); + emit setWindowCaption(TQString()); + emit setStatusBarText(TQString()); return false; } if(!filterDev->open(IO_ReadOnly)) { KMessageBox::detailedError(mainWidget, i18n("File Error! Could not open the file " "%1 for uncompression. " - "The file will not be loaded.").arg(m_file), + "The file will not be loaded.").tqarg(m_file), i18n("This error typically occurs if you do not have enough permissions to read the file. " "You can check ownership and permissions if you right-click on the file in the Konqueror " "file manager and then choose the 'Properties' menu.")); - emit setWindowCaption(TQString::null); + emit setWindowCaption(TQString()); delete filterDev; - emit setStatusBarText(TQString::null); + emit setStatusBarText(TQString()); return false; } KProgressDialog* prog = new KProgressDialog(0L, "uncompress-progress", i18n("Uncompressing..."), - i18n("Uncompressing the file %1. Please wait.").arg(m_file)); + i18n("Uncompressing the file %1. Please wait.").tqarg(m_file)); prog->progressBar()->setTotalSteps((int) fi.size()/1024); prog->progressBar()->setProgress(0); @@ -739,18 +739,18 @@ bool KViewPart::openFile() tmpUnzipped->sync(); if (progress_dialog_was_cancelled) { - emit setStatusBarText(TQString::null); + emit setStatusBarText(TQString()); return false; } if ((read != 0) || (tmpUnzipped->file()->size() == 0)) { KMessageBox::detailedError(mainWidget, i18n("File Error! Could not uncompress " - "the file %1. The file will not be loaded.").arg( m_file ), + "the file %1. The file will not be loaded.").tqarg( m_file ), i18n("This error typically occurs if the file is corrupt. " "If you want to be sure, try to decompress the file manually using command-line tools.")); - emit setWindowCaption(TQString::null); - emit setStatusBarText(TQString::null); + emit setWindowCaption(TQString()); + emit setStatusBarText(TQString()); return false; } tmpUnzipped->close(); @@ -768,17 +768,17 @@ bool KViewPart::openFile() // Search for service KTrader::OfferList offers = KTrader::self()->query( - TQString::fromLatin1("KViewShell/MultiPage" ), + TQString::tqfromLatin1("KViewShell/MultiPage" ), TQString("([X-KDE-MultiPageVersion] == %1) and " - "([X-KDE-MimeTypes] == '%2')").arg(MULTIPAGE_VERSION).arg(mimetype->name())); + "([X-KDE-MimeTypes] == '%2')").tqarg(MULTIPAGE_VERSION).tqarg(mimetype->name())); if (offers.isEmpty()) { KMessageBox::detailedError(mainWidget, i18n("The document %1 cannot be shown because " - "its file type is not supported.").arg(m_file), + "its file type is not supported.").tqarg(m_file), i18n("The file has mime type %1 which is not supported by " - "any of the installed KViewShell plugins.").arg(mimetype->name())); - emit setWindowCaption(TQString::null); - emit setStatusBarText(TQString::null); + "any of the installed KViewShell plugins.").tqarg(mimetype->name())); + emit setWindowCaption(TQString()); + emit setStatusBarText(TQString()); return false; } @@ -800,7 +800,7 @@ bool KViewPart::openFile() // Try to load the multiPage int error; - multiPage = static_cast(KParts::ComponentFactory::createInstanceFromService(service, mainWidget, + multiPage = static_cast(KParts::ComponentFactory::createInstanceFromService(service, TQT_TQOBJECT(mainWidget), service->name().utf8(), TQStringList(), &error )); if (multiPage.isNull()) { @@ -813,7 +813,7 @@ bool KViewPart::openFile() reason = i18n("The specified service provides no shared library."); break; case KParts::ComponentFactory::ErrNoLibrary: - reason = i18n("

The specified library %1 could not be loaded. The error message returned was:

%2

").arg(service->library()).arg(KLibLoader::self()->lastErrorMessage()); + reason = i18n("

The specified library %1 could not be loaded. The error message returned was:

%2

").tqarg(service->library()).tqarg(KLibLoader::self()->lastErrorMessage()); break; case KParts::ComponentFactory::ErrNoFactory: reason = i18n("The library does not export a factory for creating components."); @@ -832,13 +832,13 @@ bool KViewPart::openFile() "question. If that does not help, you could file an error report, either to the " "provider of your software (e.g. the vendor of your Linux distribution), or " "directly to the authors of the software. The entry Report Bug... in the " - "Help menu helps you to contact the KDE programmers.

").arg(m_file).arg(service->library()).arg(mimetype->name()); + "Help menu helps you to contact the KDE programmers.

").tqarg(m_file).tqarg(service->library()).tqarg(mimetype->name()); TQString caption = i18n("Error Initializing Software Component"); if (reason.isEmpty()) KMessageBox::error(mainWidget, text, caption); else KMessageBox::detailedError(mainWidget, text, reason, caption); - emit setStatusBarText(TQString::null); + emit setStatusBarText(TQString()); return false; } @@ -895,13 +895,13 @@ bool KViewPart::openFile() // Notify the ViewShell about the newly opened file. emit fileOpened(); } else { - m_url = TQString::null; - emit setWindowCaption(TQString::null); + m_url = TQString(); + emit setWindowCaption(TQString()); } checkActions(); - emit zoomChanged(TQString("%1%").arg((int)(_zoomVal.value()*100.0+0.5))); - emit setStatusBarText(TQString::null); + emit zoomChanged(TQString("%1%").tqarg((int)(_zoomVal.value()*100.0+0.5))); + emit setStatusBarText(TQString()); return r; } @@ -946,7 +946,7 @@ bool KViewPart::closeURL() KParts::ReadOnlyPart::closeURL(); multiPage->closeURL(); - m_url = TQString::null; + m_url = TQString(); checkActions(); emit setWindowCaption(""); @@ -994,7 +994,7 @@ void KViewPart::pageInfo(int numpages, int currentpage) updateZoomLevel(); // ATTN: The string here must be the same as in setPage() below - TQString pageString = i18n("Page %1 of %2").arg(currentpage).arg(numpages); + TQString pageString = i18n("Page %1 of %2").tqarg(currentpage).tqarg(numpages); if (pageChangeIsConnected) { emit pageChanged(pageString); emit sizeChanged(pageSizeDescription()); @@ -1132,7 +1132,7 @@ void KViewPart::enableFitToHeight(bool enable) void KViewPart::fitToPage() { - double z = QMIN(multiPage->calculateFitToHeightZoomValue(), + double z = TQMIN(multiPage->calculateFitToHeightZoomValue(), multiPage->calculateFitToWidthZoomValue()); // Check if the methods returned usable values. Values that are not @@ -1382,7 +1382,7 @@ void KViewPart::writeSettings() void KViewPart::connectNotify ( const char *sig ) { - if (TQString(sig).contains("pageChanged")) + if (TQString(sig).tqcontains("pageChanged")) pageChangeIsConnected = true; } @@ -1392,12 +1392,12 @@ void KViewPart::setStatusBarTextFromMultiPage( const TQString &msg ) if (msg.isEmpty()) { if (pageChangeIsConnected) - emit setStatusBarText(TQString::null); + emit setStatusBarText(TQString()); else { int currentPage = multiPage->currentPageNumber(); int numberOfPages = multiPage->numberOfPages(); - emit setStatusBarText(i18n("Page %1 of %2").arg(currentPage).arg(numberOfPages)); + emit setStatusBarText(i18n("Page %1 of %2").tqarg(currentPage).tqarg(numberOfPages)); } } else @@ -1420,26 +1420,26 @@ void KViewPart::aboutKViewShell() aboutDialog = new KAboutDialog(mainWidget, "about_kviewshell"); aboutDialog->setTitle(I18N_NOOP("KViewShell")); aboutDialog->setVersion("0.6"); - aboutDialog->setAuthor("Matthias Hoelzer-Kluepfel", TQString::null, TQString::null, + aboutDialog->setAuthor("Matthias Hoelzer-Kluepfel", TQString(), TQString(), I18N_NOOP("Original Author")); - aboutDialog->addContributor("Matthias Hoelzer-Kluepfel", "mhk@caldera.de", TQString::null, + aboutDialog->addContributor("Matthias Hoelzer-Kluepfel", "mhk@caldera.de", TQString(), I18N_NOOP("Framework")); aboutDialog->addContributor("David Sweet", "dsweet@kde.org", "http://www.chaos.umd.edu/~dsweet", I18N_NOOP("Former KGhostView Maintainer")); - aboutDialog->addContributor("Mark Donohoe", TQString::null, TQString::null, + aboutDialog->addContributor("Mark Donohoe", TQString(), TQString(), I18N_NOOP("KGhostView Author")); - aboutDialog->addContributor("Markku Hihnala", TQString::null, TQString::null, + aboutDialog->addContributor("Markku Hihnala", TQString(), TQString(), I18N_NOOP("Navigation widgets")); - aboutDialog->addContributor("David Faure", TQString::null, TQString::null, + aboutDialog->addContributor("David Faure", TQString(), TQString(), I18N_NOOP("Basis for shell")); - aboutDialog->addContributor("Daniel Duley", TQString::null, TQString::null, + aboutDialog->addContributor("Daniel Duley", TQString(), TQString(), I18N_NOOP("Port to KParts")); - aboutDialog->addContributor("Espen Sand", TQString::null, TQString::null, + aboutDialog->addContributor("Espen Sand", TQString(), TQString(), I18N_NOOP("Dialog boxes")); - aboutDialog->addContributor("Stefan Kebekus", "kebekus@kde.org", TQString::null, + aboutDialog->addContributor("Stefan Kebekus", "kebekus@kde.org", TQString(), I18N_NOOP("DCOP-Interface, major improvements")); - aboutDialog->addContributor("Wilfried Huss", "Wilfried.Huss@gmx.at", TQString::null, + aboutDialog->addContributor("Wilfried Huss", "Wilfried.Huss@gmx.at", TQString(), I18N_NOOP("Interface enhancements")); } aboutDialog->show(); @@ -1491,8 +1491,8 @@ void KViewPart::slotEnableMoveTool(bool enable) } -KViewPartExtension::KViewPartExtension(KViewPart *parent) - : KParts::BrowserExtension( parent, "KViewPartExtension") +KViewPartExtension::KViewPartExtension(KViewPart *tqparent) + : KParts::BrowserExtension( tqparent, "KViewPartExtension") { } diff --git a/kviewshell/kviewpart.h b/kviewshell/kviewpart.h index 446fe47f..bbd6f72c 100644 --- a/kviewshell/kviewpart.h +++ b/kviewshell/kviewpart.h @@ -31,9 +31,10 @@ class TQSize; class KViewPart : public KViewPart_Iface { Q_OBJECT + TQ_OBJECT public: - KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *parent, + KViewPart(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList& args); virtual ~KViewPart(); @@ -239,11 +240,12 @@ private: class KViewPartExtension : public KParts::BrowserExtension { Q_OBJECT + TQ_OBJECT friend class KViewPart; public: - KViewPartExtension(KViewPart *parent); + KViewPartExtension(KViewPart *tqparent); virtual ~KViewPartExtension() {} }; diff --git a/kviewshell/kviewpart_iface.h b/kviewshell/kviewpart_iface.h index d5603b01..ac7869de 100644 --- a/kviewshell/kviewpart_iface.h +++ b/kviewshell/kviewpart_iface.h @@ -10,9 +10,10 @@ class TQStringList; class KViewPart_Iface : public KParts::ReadOnlyPart { Q_OBJECT + TQ_OBJECT public: - KViewPart_Iface(TQObject *parent, const char *name) - : KParts::ReadOnlyPart(parent, name) {} + KViewPart_Iface(TQObject *tqparent, const char *name) + : KParts::ReadOnlyPart(tqparent, name) {} virtual ~KViewPart_Iface() {} diff --git a/kviewshell/kviewshell.cpp b/kviewshell/kviewshell.cpp index 968fd365..e3bde285 100644 --- a/kviewshell/kviewshell.cpp +++ b/kviewshell/kviewshell.cpp @@ -53,15 +53,15 @@ KViewShell::KViewShell(const TQString& defaultMimeType) // Try to load KLibFactory *factory = KLibLoader::self()->factory("kviewerpart"); if (factory) { - if (defaultMimeType == TQString::null) + if (defaultMimeType == TQString()) { - view = (KViewPart_Iface*) factory->create(this, "kviewerpart", "KViewPart"); + view = (KViewPart_Iface*) factory->create(TQT_TQOBJECT(this), "kviewerpart", "KViewPart"); } else { TQStringList args; args << defaultMimeType; - view = (KViewPart_Iface*) factory->create(this, "kviewerpart", "KViewPart", args); + view = (KViewPart_Iface*) factory->create(TQT_TQOBJECT(this), "kviewerpart", "KViewPart", args); } if (!view) ::exit(-1); @@ -73,24 +73,24 @@ KViewShell::KViewShell(const TQString& defaultMimeType) setCentralWidget(view->widget()); // file menu - KStdAction::open(view, TQT_SLOT(slotFileOpen()), actionCollection()); - recent = KStdAction::openRecent (this, TQT_SLOT(openURL(const KURL &)), actionCollection()); + KStdAction::open(TQT_TQOBJECT(view), TQT_SLOT(slotFileOpen()), actionCollection()); + recent = KStdAction::openRecent (TQT_TQOBJECT(this), TQT_SLOT(openURL(const KURL &)), actionCollection()); reloadAction = new KAction(i18n("Reload"), "reload", CTRL + Key_R, view, TQT_SLOT(reload()), actionCollection(), "reload"); - closeAction = KStdAction::close(this, TQT_SLOT(slotFileClose()), actionCollection()); - KStdAction::quit (this, TQT_SLOT(slotQuit()), actionCollection()); + closeAction = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection()); + KStdAction::quit (TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection()); connect(view, TQT_SIGNAL(fileOpened()), this, TQT_SLOT(addRecentFile())); // view menu - fullScreenAction = KStdAction::fullScreen(this, TQT_SLOT(slotFullScreen()), actionCollection(), this, "fullscreen" ); + fullScreenAction = KStdAction::fullScreen(TQT_TQOBJECT(this), TQT_SLOT(slotFullScreen()), actionCollection(), this, "fullscreen" ); // settings menu createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); - KStdAction::keyBindings(this, TQT_SLOT(slotConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbar()), actionCollection()); + KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbar()), actionCollection()); // statusbar connects connect( view, TQT_SIGNAL( zoomChanged(const TQString &) ), this,TQT_SLOT( slotChangeZoomText(const TQString &) ) ); @@ -229,7 +229,7 @@ void KViewShell::addRecentFile() KURL actualURL = view->url(); // To store the URL in the list of recent files, we remove the // reference part. - actualURL.setRef(TQString::null); + actualURL.setRef(TQString()); recent->addURL(actualURL); checkActions(); } @@ -357,7 +357,7 @@ void KViewShell::keyPressEvent(TQKeyEvent *event) { // The Escape Key is used to return to normal mode from fullscreen // mode - if ((event->key() == Qt::Key_Escape) && (fullScreenAction->isChecked())) { + if ((event->key() == TQt::Key_Escape) && (fullScreenAction->isChecked())) { showNormal(); return; } diff --git a/kviewshell/kviewshell.h b/kviewshell/kviewshell.h index 89131db8..1da78c20 100644 --- a/kviewshell/kviewshell.h +++ b/kviewshell/kviewshell.h @@ -16,12 +16,13 @@ class TQLabel; class KViewShell : public KParts::MainWindow { Q_OBJECT + TQ_OBJECT public: KStatusBar *statusbar; KStatusBar *action; - KViewShell(const TQString& defaultMimeType = TQString::null); + KViewShell(const TQString& defaultMimeType = TQString()); virtual ~KViewShell(); public slots: diff --git a/kviewshell/main.cpp b/kviewshell/main.cpp index 1a858049..8c62efdd 100644 --- a/kviewshell/main.cpp +++ b/kviewshell/main.cpp @@ -88,13 +88,13 @@ int main(int argc, char **argv) KURL url(args->url(0)); if (!args->url(0).isValid()) { - kdError(1223) << TQString(I18N_NOOP("The URL %1 is not well-formed.")).arg(args->arg(0)) << endl; + kdError(1223) << TQString(I18N_NOOP("The URL %1 is not well-formed.")).tqarg(args->arg(0)) << endl; return -1; } if (!args->url(0).isLocalFile()) { kdError(1223) << TQString(I18N_NOOP("The URL %1 does not point to a local file. You can only specify local " - "files if you are using the '--unique' option.")).arg(args->arg(0)) << endl; + "files if you are using the '--unique' option.")).tqarg(args->arg(0)) << endl; return -1; } @@ -107,7 +107,7 @@ int main(int argc, char **argv) QCStringList apps = app.dcopClient()->registeredApplications(); for ( QCStringList::Iterator it = apps.begin(); it != apps.end(); ++it ) { - if ((*it).find("kviewshell") == 0) + if ((*it).tqfind("kviewshell") == 0) { TQByteArray data, replyData; TQCString replyType; diff --git a/kviewshell/marklist.cpp b/kviewshell/marklist.cpp index a9c7518a..041997f1 100644 --- a/kviewshell/marklist.cpp +++ b/kviewshell/marklist.cpp @@ -55,9 +55,9 @@ TQPixmap* waitIcon = 0; /****** ThumbnailWidget ******/ ThumbnailWidget::ThumbnailWidget(MarkListWidget* _parent, const PageNumber& _pageNumber, DocumentPageCache* _pageCache) - : TQWidget(_parent), pageNumber(_pageNumber), pageCache(_pageCache), parent(_parent) + : TQWidget(_parent), pageNumber(_pageNumber), pageCache(_pageCache), tqparent(_parent) { - setBackgroundMode(Qt::NoBackground); + setBackgroundMode(TQt::NoBackground); needsUpdating = true; @@ -69,11 +69,11 @@ ThumbnailWidget::ThumbnailWidget(MarkListWidget* _parent, const PageNumber& _pag void ThumbnailWidget::paintEvent(TQPaintEvent* e) { - // Only repaint if the widget is really visible. We need to check this because Qt + // Only tqrepaint if the widget is really visible. We need to check this because TQt // sends paintEvents to all widgets that have ever been visible in the Scrollview // whenever the ScrollView is resized. This also increases the percieved performance // only thumbnails that are really needed are rendered. - if (!parent->isVisible()) + if (!tqparent->isVisible()) { //kdDebug() << "Abort Thumbnail drawing for page " << pageNumber << endl; return; @@ -83,9 +83,9 @@ void ThumbnailWidget::paintEvent(TQPaintEvent* e) p.setClipRect(e->rect()); // Paint a black border around the widget - p.setRasterOp(Qt::CopyROP); + p.setRasterOp(TQt::CopyROP); p.setBrush(NoBrush); - p.setPen(Qt::black); + p.setPen(TQt::black); p.drawRect(rect()); // Remove 1 pixel from all sides of the rectangle, to eliminate overdraw with @@ -99,7 +99,7 @@ void ThumbnailWidget::paintEvent(TQPaintEvent* e) if (KVSPrefs::changeColors() && KVSPrefs::renderMode() == KVSPrefs::EnumRenderMode::Paper) p.fillRect(thumbRect, KVSPrefs::paperColor()); else - p.fillRect(thumbRect, Qt::white); + p.fillRect(thumbRect, TQt::white); // Draw busy indicator. // Im not really sure if this is a good idea. @@ -138,7 +138,7 @@ void ThumbnailWidget::resizeEvent(TQResizeEvent*) void ThumbnailWidget::setThumbnail() { - if (!parent->isVisible()) + if (!tqparent->isVisible()) { // We only want to calculate the thumbnail for widgets that are currently visible. // When we are fast scrolling thru the document. Many paint events are created, that @@ -169,23 +169,23 @@ MarkListWidget::MarkListWidget(TQWidget* _parent, MarkList* _markList, const Pag : TQWidget(_parent), showThumbnail(_showThumbnail), pageNumber(_pageNumber), pageCache(_pageCache), markList(_markList) { - TQBoxLayout* layout = new TQVBoxLayout(this, margin); + TQBoxLayout* tqlayout = new TQVBoxLayout(this, margin); thumbnailWidget = 0; if (showThumbnail) { thumbnailWidget = new ThumbnailWidget(this, pageNumber, pageCache); - layout->addWidget(thumbnailWidget, 1, Qt::AlignTop); + tqlayout->addWidget(thumbnailWidget, 1, TQt::AlignTop); } - TQBoxLayout* bottomLayout = new TQHBoxLayout(layout); + TQBoxLayout* bottomLayout = new TQHBoxLayout(tqlayout); - checkBox = new TQCheckBox(TQString::null, this ); - checkBox->setFocusPolicy(TQWidget::NoFocus); + checkBox = new TQCheckBox(TQString(), this ); + checkBox->setFocusPolicy(TQ_NoFocus); TQToolTip::add(checkBox, i18n("Select for printing")); - bottomLayout->addWidget(checkBox, 0, Qt::AlignAuto); + bottomLayout->addWidget(checkBox, 0, TQt::AlignAuto); - pageLabel = new TQLabel(TQString("%1").arg(pageNumber), this); + pageLabel = new TQLabel(TQString("%1").tqarg(pageNumber), this); bottomLayout->addWidget(pageLabel, 1); _backgroundColor = KGlobalSettings::baseColor(); @@ -217,18 +217,18 @@ void MarkListWidget::setChecked( bool checked ) void MarkListWidget::setSelected( bool selected ) { if (selected) - setPaletteBackgroundColor( TQApplication::palette().active().highlight() ); + setPaletteBackgroundColor( TQApplication::tqpalette().active().highlight() ); else setPaletteBackgroundColor( _backgroundColor ); } int MarkListWidget::setNewWidth(int width) { - int height = QMAX(checkBox->height(), pageLabel->height()) + 2*margin; + int height = TQMAX(checkBox->height(), pageLabel->height()) + 2*margin; if (showThumbnail) { // Calculate size of Thumbnail - int thumbnailWidth = QMIN(width, KVSPrefs::maxThumbnailWidth()); + int thumbnailWidth = TQMIN(width, KVSPrefs::maxThumbnailWidth()); int thumbnailHeight = (int)((thumbnailWidth - 2*margin - 2) / pageCache->sizeOfPage(pageNumber).aspectRatio() + 0.5) + 2; // Resize Thumbnail if necessary @@ -258,11 +258,11 @@ bool MarkListWidget::isVisible() void MarkListWidget::mousePressEvent(TQMouseEvent* e) { // Select Page - if (e->button() == LeftButton) + if (e->button() == Qt::LeftButton) { emit selected(pageNumber); } - else if (e->button() == RightButton) + else if (e->button() == Qt::RightButton) { emit showPopupMenu(pageNumber, e->globalPos()); } @@ -272,21 +272,21 @@ void MarkListWidget::mousePressEvent(TQMouseEvent* e) /****** MarkList ******/ -MarkList::MarkList(TQWidget* parent, const char* name) - : TQScrollView(parent, name), clickedThumbnail(0), showThumbnails(true), contextMenu(0) +MarkList::MarkList(TQWidget* tqparent, const char* name) + : TQScrollView(tqparent, name), clickedThumbnail(0), showThumbnails(true), contextMenu(0) { currentPage = PageNumber::invalidPage; widgetList.setAutoDelete(true); - setFocusPolicy( TQWidget::StrongFocus ); - //viewport()->setFocusPolicy( TQWidget::WheelFocus ); + setFocusPolicy( TQ_StrongFocus ); + //viewport()->setFocusPolicy( TQ_WheelFocus ); setResizePolicy(TQScrollView::Manual); setVScrollBarMode(TQScrollView::AlwaysOn); setHScrollBarMode(TQScrollView::AlwaysOff); - setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); - viewport()->setBackgroundMode(Qt::PaletteBase); + viewport()->setBackgroundMode(TQt::PaletteBase); enableClipper(true); } @@ -502,7 +502,7 @@ void MarkList::updateWidgetSize(const PageNumber& pageNumber) void MarkList::mousePressEvent(TQMouseEvent* e) { - if (e->button() == RightButton) + if (e->button() == Qt::RightButton) { // We call showPopupMenu with an invalid pageNumber to indicate that // the mouse does not point at a thumbnailWidget. @@ -542,7 +542,7 @@ void MarkList::slotShowThumbnails(bool show) } -void MarkList::repaintThumbnails() +void MarkList::tqrepaintThumbnails() { bool show = showThumbnails; int numOfPages = widgetList.count(); diff --git a/kviewshell/marklist.h b/kviewshell/marklist.h index dd8c07a4..5e51d694 100644 --- a/kviewshell/marklist.h +++ b/kviewshell/marklist.h @@ -40,12 +40,13 @@ class MarkListWidget; /****** ThumbnailWidget ******/ -class ThumbnailWidget : public QWidget +class ThumbnailWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - ThumbnailWidget(MarkListWidget* parent_, const PageNumber& _pageNumber, DocumentPageCache*); + ThumbnailWidget(MarkListWidget* tqparent_, const PageNumber& _pageNumber, DocumentPageCache*); private: virtual void paintEvent(TQPaintEvent*); @@ -61,7 +62,7 @@ private: DocumentPageCache* pageCache; - MarkListWidget* parent; + MarkListWidget* tqparent; TQPixmap thumbnail; }; @@ -70,9 +71,10 @@ private: /****** MarkListWidget ******/ -class MarkListWidget : public QWidget +class MarkListWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: MarkListWidget(TQWidget* _parent, MarkList*, const PageNumber& _pageNumber, DocumentPageCache*, bool _showThumbnail = true); @@ -121,12 +123,13 @@ private: /****** MarkList ******/ -class MarkList: public QScrollView +class MarkList: public TQScrollView { Q_OBJECT + TQ_OBJECT public: - MarkList(TQWidget* parent = 0, const char* name = 0); + MarkList(TQWidget* tqparent = 0, const char* name = 0); virtual ~MarkList(); void setPageCache(DocumentPageCache*); @@ -137,7 +140,7 @@ public: PageNumber numberOfPages() { return widgetList.count(); } - virtual TQSize sizeHint() const { return TQSize(); } + virtual TQSize tqsizeHint() const { return TQSize(); } public slots: void setNumberOfPages(int numberOfPages, bool showThumbnails = true); @@ -148,7 +151,7 @@ public slots: void clear(); void slotShowThumbnails(bool); - void repaintThumbnails(); + void tqrepaintThumbnails(); void updateWidgetSize(const PageNumber&); diff --git a/kviewshell/optionDialogAccessibilityWidget.ui b/kviewshell/optionDialogAccessibilityWidget.ui index 43490028..aec982e2 100644 --- a/kviewshell/optionDialogAccessibilityWidget.ui +++ b/kviewshell/optionDialogAccessibilityWidget.ui @@ -1,6 +1,6 @@ optionDialogAccessibilityWidget - + optionDialogAccessibilityWidget @@ -19,7 +19,7 @@ 0 - + kcfg_ChangeColors @@ -44,7 +44,7 @@ unnamed - + warn @@ -70,7 +70,7 @@ PlainText - + kcfg_RenderMode @@ -101,7 +101,7 @@ 0 - + radioInverted @@ -112,7 +112,7 @@ true - + radioNormal @@ -120,9 +120,9 @@ Change &paper color - + - layout5 + tqlayout5 @@ -138,14 +138,14 @@ Fixed - + 16 20 - + textLabel1 @@ -180,7 +180,7 @@ Expanding - + 30 20 @@ -189,7 +189,7 @@ - + radioRecolor @@ -197,9 +197,9 @@ &Change dark and light colors - + - layout2 + tqlayout2 @@ -218,7 +218,7 @@ Expanding - + 48 21 @@ -246,7 +246,7 @@ Fixed - + 16 20 @@ -274,14 +274,14 @@ Expanding - + 48 21 - + textLabel3_2 @@ -302,14 +302,14 @@ Fixed - + 16 20 - + textLabel3 @@ -322,7 +322,7 @@ - + radioContrast @@ -330,15 +330,15 @@ Convert to &black and white - + - layout5 + tqlayout5 unnamed - + textLabel2_2 @@ -359,7 +359,7 @@ Fixed - + 16 20 @@ -376,14 +376,14 @@ Fixed - + 16 20 - + kcfg_BWContrast @@ -405,7 +405,7 @@ Horizontal - + kcfg_BWThreshold @@ -427,7 +427,7 @@ Horizontal - + textLabel2 @@ -519,7 +519,7 @@ kdialog.h - + kcolorbutton.h kcolorbutton.h diff --git a/kviewshell/optionDialogGUIWidget_base.ui b/kviewshell/optionDialogGUIWidget_base.ui index cd8fba19..1d37dd34 100644 --- a/kviewshell/optionDialogGUIWidget_base.ui +++ b/kviewshell/optionDialogGUIWidget_base.ui @@ -1,6 +1,6 @@ optionDialogGUIWidget_base - + optionDialogGUIWidget_base @@ -19,7 +19,7 @@ 0 - + Enabled @@ -47,7 +47,7 @@ </ul></qt> - + textLabel1 @@ -63,7 +63,7 @@ Underline links: - + kcfg_ShowThumbnails @@ -71,7 +71,7 @@ Show &thumbnail previews - + groupBox1 @@ -82,7 +82,7 @@ unnamed - + rowLabel @@ -98,7 +98,7 @@ Rows: - + kcfg_OverviewModeColumns @@ -109,7 +109,7 @@ 3 - + kcfg_OverviewModeRows @@ -120,7 +120,7 @@ 1 - + columnLabel @@ -144,5 +144,5 @@ kcfg_OverviewModeRows kcfg_OverviewModeColumns - + diff --git a/kviewshell/pageNumber.h b/kviewshell/pageNumber.h index 161760fc..9fd48dc6 100644 --- a/kviewshell/pageNumber.h +++ b/kviewshell/pageNumber.h @@ -17,8 +17,8 @@ /** \brief Class to represent a page number -The class PageNumber is really nothing but an alias for Q_UINT16, and -can be casted to and from Q_UINT16. It is used in kviewshell to remind +The class PageNumber is really nothing but an alias for TQ_UINT16, and +can be casted to and from TQ_UINT16. It is used in kviewshell to remind the programmer of the convention that page numbers start at '1' (for 'first page'), and that the value '0' means 'illegal page number' or 'no page number'. Accordingly, the value '0' is also named @@ -43,13 +43,13 @@ class PageNumber @param num page number that is set initially */ - PageNumber(Q_UINT16 num) {pgNum = num;} + PageNumber(TQ_UINT16 num) {pgNum = num;} - /** \brief this method implements typecasts from Q_UINT16 */ - PageNumber &operator=(const Q_UINT16 p) { pgNum = p; return *this; } + /** \brief this method implements typecasts from TQ_UINT16 */ + PageNumber &operator=(const TQ_UINT16 p) { pgNum = p; return *this; } - /** \brief This method implements typecasts to Q_UINT16 */ - operator Q_UINT16() const { return pgNum; } + /** \brief This method implements typecasts to TQ_UINT16 */ + operator TQ_UINT16() const { return pgNum; } /** \brief Checks if the page number is invalid @@ -59,7 +59,7 @@ class PageNumber private: /** \brief Single number that represents the page number */ - Q_UINT16 pgNum; + TQ_UINT16 pgNum; }; #endif diff --git a/kviewshell/pageSize.cpp b/kviewshell/pageSize.cpp index 43e21f74..a3e65459 100644 --- a/kviewshell/pageSize.cpp +++ b/kviewshell/pageSize.cpp @@ -77,10 +77,10 @@ bool pageSize::setPageSize(const TQString& name) } } - // Check if the string contains 'x'. If yes, we assume it is of type + // Check if the string tqcontains 'x'. If yes, we assume it is of type // "x". If yes, the first number is interpreted as // the width in mm, the second as the height in mm - if (name.find('x') >= 0) { + if (name.tqfind('x') >= 0) { bool wok, hok; float pageWidth_tmp = name.section('x',0,0).toFloat(&wok); float pageHeight_tmp = name.section('x',1,1).toFloat(&hok); @@ -95,10 +95,10 @@ bool pageSize::setPageSize(const TQString& name) } } - // Check if the string contains ','. If yes, we assume it is of type + // Check if the string tqcontains ','. If yes, we assume it is of type // ",". The first number is supposed to // be the width, the second the height. - if (name.find(',') >= 0) { + if (name.tqfind(',') >= 0) { bool wok, hok; float pageWidth_tmp = distance::convertToMM(name.section(',',0,0), &wok); float pageHeight_tmp = distance::convertToMM(name.section(',',1,1), &hok); @@ -263,7 +263,7 @@ TQString pageSize::formatName() const if (currentSize >= 0) return staticList[currentSize].name; else - return TQString::null; + return TQString(); } @@ -304,7 +304,7 @@ TQString pageSize::serialize() const if ((currentSize >= 0) && (fabs(staticList[currentSize].height-pageHeight.getLength_in_mm()) <= 0.5)) return staticList[currentSize].name; else - return TQString("%1x%2").arg(pageWidth.getLength_in_mm()).arg(pageHeight.getLength_in_mm()); + return TQString("%1x%2").tqarg(pageWidth.getLength_in_mm()).tqarg(pageHeight.getLength_in_mm()); } diff --git a/kviewshell/pageSize.h b/kviewshell/pageSize.h index 27b30501..fe0f8c62 100644 --- a/kviewshell/pageSize.h +++ b/kviewshell/pageSize.h @@ -41,6 +41,7 @@ The main difference to the SimplePageSize class are the following. class pageSize : public TQObject, public SimplePageSize { Q_OBJECT + TQ_OBJECT public: /** \brief Default constructor, initializes the pageSize with a @@ -64,7 +65,7 @@ public: call pageSizeNames() more than once, it is guaranteed that the same list of strings will be returned. - @returns TQStringList that contains + @returns TQStringList that tqcontains */ TQStringList pageSizeNames(); @@ -188,8 +189,8 @@ public: 297x210. @returns A name for the current page size, if the format has a - name, or TQString::null otherwise. If the result is not - TQString::null, it is guaranteed to be one of the strings + name, or TQString() otherwise. If the result is not + TQString(), it is guaranteed to be one of the strings returned by the pageSizeNames() method. */ TQString formatName() const; diff --git a/kviewshell/pageSizeDialog.cpp b/kviewshell/pageSizeDialog.cpp index 75c4409d..a059804a 100644 --- a/kviewshell/pageSizeDialog.cpp +++ b/kviewshell/pageSizeDialog.cpp @@ -25,13 +25,13 @@ #include "pageSizeWidget.h" -pageSizeDialog::pageSizeDialog( TQWidget *parent, pageSize *userPrefdPageSize, const char *name, bool modal) - :KDialogBase( parent, name, modal, i18n("Page Size"), Ok|Apply|Cancel, Ok, +pageSizeDialog::pageSizeDialog( TQWidget *tqparent, pageSize *userPrefdPageSize, const char *name, bool modal) + :KDialogBase( tqparent, name, modal, i18n("Page Size"), Ok|Apply|Cancel, Ok, true ) { userPreferredPageSize = userPrefdPageSize; pageSizeW = new pageSizeWidget(this, "PageSizeWidget"); - pageSizeW->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)3, 0, 0, + pageSizeW->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)3, 0, 0, pageSizeW->sizePolicy().hasHeightForWidth() ) ); setMainWidget(pageSizeW); } diff --git a/kviewshell/pageSizeDialog.h b/kviewshell/pageSizeDialog.h index 50e8c0b6..f1b45a56 100644 --- a/kviewshell/pageSizeDialog.h +++ b/kviewshell/pageSizeDialog.h @@ -29,6 +29,7 @@ class pageSize; class pageSizeDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: // Constructs the page size Dialog. The pointer userPrefdPageSize @@ -36,7 +37,7 @@ public: // value whenever the user clicks on 'accept' or 'ok'. Programmers // can then connect to the signal sizeChanged() of the object to be // informed about the changes. - pageSizeDialog( TQWidget *parent=0, pageSize *userPrefdPageSize=0, const char *name=0, bool modal=true); + pageSizeDialog( TQWidget *tqparent=0, pageSize *userPrefdPageSize=0, const char *name=0, bool modal=true); void setPageSize(const TQString&); protected slots: diff --git a/kviewshell/pageSizeWidget.cpp b/kviewshell/pageSizeWidget.cpp index a745d1ef..5446fd53 100644 --- a/kviewshell/pageSizeWidget.cpp +++ b/kviewshell/pageSizeWidget.cpp @@ -21,18 +21,18 @@ -// Constructs a pageSizeWidget_base which is a child of 'parent', with +// Constructs a pageSizeWidget_base which is a child of 'tqparent', with // the name 'name' and widget flags set to 'f'. -pageSizeWidget::pageSizeWidget( TQWidget* parent, const char* name, WFlags fl ) - : pageSizeWidget_base( parent, name, fl ) +pageSizeWidget::pageSizeWidget( TQWidget* tqparent, const char* name, WFlags fl ) + : pageSizeWidget_base( tqparent, name, fl ) { connect(&chosenSize, TQT_SIGNAL(sizeChanged(const SimplePageSize&)), previewer, TQT_SLOT(setSize(const SimplePageSize&))); - // Set up the formatChoice QComboBox + // Set up the formatChoice TQComboBox formatChoice->insertItem(i18n("Custom Size")); formatChoice->insertStringList(chosenSize.pageSizeNames()); - // Activate the proper entry in the QComboBox + // Activate the proper entry in the TQComboBox if (chosenSize.formatName().isNull()) { orientationChoice->setEnabled(false); formatChoice->setCurrentItem(0); @@ -57,8 +57,8 @@ pageSizeWidget::pageSizeWidget( TQWidget* parent, const char* name, WFlags fl ) // Allow entries between 0 and 1200. More filtering is done by the // pageSize class, which silently ignores values which are out of // range. - widthInput->setValidator(new TQDoubleValidator(0.0, 1200.0, 1, this, "widthValidator")); - heightInput->setValidator(new TQDoubleValidator(0.0, 1200.0, 1, this, "heightValidator")); + widthInput->setValidator(new TQDoubleValidator(0.0, 1200.0, 1, TQT_TQOBJECT(this), "widthValidator")); + heightInput->setValidator(new TQDoubleValidator(0.0, 1200.0, 1, TQT_TQOBJECT(this), "heightValidator")); } @@ -120,7 +120,7 @@ void pageSizeWidget::unitsChanged(int) if (formatChoice->currentItem() != 0) fillTextFields(); else - input(TQString::null); + input(TQString()); } diff --git a/kviewshell/pageSizeWidget.h b/kviewshell/pageSizeWidget.h index ac95dd4e..987dd3d3 100644 --- a/kviewshell/pageSizeWidget.h +++ b/kviewshell/pageSizeWidget.h @@ -19,9 +19,10 @@ class TQDoubleValidator; class pageSizeWidget : public pageSizeWidget_base { Q_OBJECT + TQ_OBJECT public: - pageSizeWidget( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + pageSizeWidget( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); // Sets the page size. If the dialog is already shown, updates all // the GUI. Accepts the same strings as input as the setPageSize() diff --git a/kviewshell/pageSizeWidget_base.ui b/kviewshell/pageSizeWidget_base.ui index 25cdc648..c5ca5981 100644 --- a/kviewshell/pageSizeWidget_base.ui +++ b/kviewshell/pageSizeWidget_base.ui @@ -1,6 +1,6 @@ pageSizeWidget_base - + pageSizeWidget_base @@ -33,7 +33,7 @@ 6 - + GroupBox5 @@ -56,7 +56,7 @@ 6 - + TextLabel3 @@ -64,7 +64,7 @@ Format: - + TextLabel1 @@ -72,7 +72,7 @@ Width: - + TextLabel2 @@ -80,7 +80,7 @@ Height: - + widthInput @@ -88,7 +88,7 @@ Width of the chosen paper size in portrait orientation - + heightInput @@ -136,12 +136,12 @@ widthUnits - + TextLabel4 - Orientation: + Qt::Orientation: @@ -166,7 +166,7 @@ - + GroupBox6 @@ -209,7 +209,7 @@ 0 - + 250 50 @@ -250,7 +250,7 @@ widthUnits heightInput - + kcombobox.h kcombobox.h diff --git a/kviewshell/pageView.cpp b/kviewshell/pageView.cpp index 884d7288..81e3ed9b 100644 --- a/kviewshell/pageView.cpp +++ b/kviewshell/pageView.cpp @@ -30,20 +30,20 @@ #include "pageView.h" #include "pageNumber.h" -PageView::PageView( TQWidget* parent, const char* name ) - : TQScrollView( parent, name, WStaticContents | WNoAutoErase) +PageView::PageView( TQWidget* tqparent, const char* name ) + : TQScrollView( tqparent, name, WStaticContents | WNoAutoErase) { moveTool = true; widgetList = 0; - viewport()->setFocusPolicy(TQWidget::StrongFocus); + viewport()->setFocusPolicy(TQ_StrongFocus); setResizePolicy(TQScrollView::Manual); setVScrollBarMode(TQScrollView::Auto); setHScrollBarMode(TQScrollView::Auto); - viewport()->setBackgroundMode(Qt::NoBackground); + viewport()->setBackgroundMode(TQt::NoBackground); setResizePolicy(Manual); setDragAutoScroll(false); @@ -66,7 +66,7 @@ void PageView::addChild( TQPtrVector *wdgList ) } widgetList = wdgList; - layoutPages(); + tqlayoutPages(); } @@ -93,7 +93,7 @@ bool PageView::readUp() DocumentWidget* widget = 0; // Find the widget(s) that intersect the top of the viewport // TODO: It would be better to use a binary search. - for(Q_UINT16 i=0; isize(); i++) + for(TQ_UINT16 i=0; isize(); i++) { widget = widgetList->at(i); if (childY(widget) < top && childY(widget) + widget->height() > top) @@ -103,7 +103,7 @@ bool PageView::readUp() } } - int newValue = QMAX( verticalScrollBar()->value() - (int)(height() * 0.9), + int newValue = TQMAX( verticalScrollBar()->value() - (int)(height() * 0.9), verticalScrollBar()->minValue() ); verticalScrollBar()->setValue( newValue ); return true; @@ -122,7 +122,7 @@ bool PageView::readDown() DocumentWidget* widget = 0; // Find the widget(s) that intersect the bottom of the viewport // TODO: It would be better to use a binary search. - for(Q_UINT16 i=0; isize(); i++) + for(TQ_UINT16 i=0; isize(); i++) { widget = widgetList->at(i); if (childY(widget) < bottom && childY(widget) + widget->height() > bottom) @@ -132,7 +132,7 @@ bool PageView::readDown() } } - int newValue = QMIN( verticalScrollBar()->value() + (int)(height() * 0.9), + int newValue = TQMIN( verticalScrollBar()->value() + (int)(height() * 0.9), verticalScrollBar()->maxValue() ); verticalScrollBar()->setValue( newValue ); @@ -195,11 +195,11 @@ void PageView::keyPressEvent( TQKeyEvent* e ) void PageView::contentsMousePressEvent( TQMouseEvent* e ) { - if (e->button() == LeftButton) + if (e->button() == Qt::LeftButton) { if (moveTool) { - setCursor(Qt::SizeAllCursor); + setCursor(TQt::SizeAllCursor); dragGrabPos = e->globalPos(); } else @@ -209,20 +209,20 @@ void PageView::contentsMousePressEvent( TQMouseEvent* e ) } else { - setCursor(Qt::arrowCursor); + setCursor(TQt::arrowCursor); } } void PageView::contentsMouseReleaseEvent( TQMouseEvent* ) { - setCursor(Qt::arrowCursor); + setCursor(TQt::arrowCursor); } void PageView::contentsMouseMoveEvent( TQMouseEvent* e ) { TQPoint newPos = e->globalPos(); - if (e->state() == LeftButton && moveTool) + if (e->state() == Qt::LeftButton && moveTool) { TQPoint delta = dragGrabPos - newPos; scrollBy(delta.x(), delta.y()); @@ -237,17 +237,17 @@ void PageView::viewportResizeEvent( TQResizeEvent* e ) if (!widgetList) return; - layoutPages(); + tqlayoutPages(); emit viewSizeChanged( viewport()->size() ); } -void PageView::setNrColumns( Q_UINT8 cols ) +void PageView::setNrColumns( TQ_UINT8 cols ) { nrCols = cols; } -void PageView::setNrRows( Q_UINT8 rows ) +void PageView::setNrRows( TQ_UINT8 rows ) { nrRows = rows; } @@ -285,7 +285,7 @@ void PageView::setFullScreenMode(bool fullScreen) backgroundColor = viewport()->paletteBackgroundColor(); if (singlePageFullScreenMode()) { - viewport()->setPaletteBackgroundColor( Qt::black ) ; + viewport()->setPaletteBackgroundColor( TQt::black ) ; } } else @@ -295,7 +295,7 @@ void PageView::setFullScreenMode(bool fullScreen) } } -void PageView::layoutPages(bool zoomChanged) +void PageView::tqlayoutPages(bool zoomChanged) { // Paranoid safety check if (widgetList == 0) @@ -321,29 +321,29 @@ void PageView::layoutPages(bool zoomChanged) distance = 0; } - TQMemArray colWidth(nrCols); - for(Q_UINT8 i=0; i colWidth(nrCols); + for(TQ_UINT8 i=0; isize()+2*nrCols-2) / nrCols; } else { - numRows = (Q_INT16)ceil(((double)widgetList->size()) / nrCols); + numRows = (TQ_INT16)ceil(((double)widgetList->size()) / nrCols); } - TQMemArray rowHeight(numRows); - for(Q_UINT16 i=0; i rowHeight(numRows); + for(TQ_UINT16 i=0; isize(); i++) + for(TQ_UINT16 i=0; isize(); i++) { - Q_UINT8 col; - Q_UINT16 row; + TQ_UINT8 col; + TQ_UINT16 row; if (nrCols == 2) { // In two-column display, start with the right column @@ -354,31 +354,31 @@ void PageView::layoutPages(bool zoomChanged) row = (i+nrCols) / nrCols - 1; } - colWidth[col] = QMAX(colWidth[col], (Q_UINT32)widgetList->at(i)->pageSize().width()); - rowHeight[row] = QMAX(rowHeight[row], (Q_UINT32)widgetList->at(i)->pageSize().height()); + colWidth[col] = TQMAX(colWidth[col], (TQ_UINT32)widgetList->at(i)->pageSize().width()); + rowHeight[row] = TQMAX(rowHeight[row], (TQ_UINT32)widgetList->at(i)->pageSize().height()); } // Calculate the total width and height of the display - Q_UINT32 totalHeight = 0; - for(Q_UINT16 i=0; i totalWidth ) + TQ_UINT32 centeringLeft = 0; + if( (TQ_UINT32)newViewportSize.width() > totalWidth ) centeringLeft = ( newViewportSize.width() - totalWidth )/2; - Q_UINT32 centeringTop = 0; - if( (Q_UINT32)newViewportSize.height() > totalHeight ) + TQ_UINT32 centeringTop = 0; + if( (TQ_UINT32)newViewportSize.height() > totalHeight ) centeringTop = ( newViewportSize.height() - totalHeight)/2; // Resize the viewport - if (((Q_UINT32)contentsWidth() != totalWidth) || ((Q_UINT32)contentsHeight() != totalHeight)) + if (((TQ_UINT32)contentsWidth() != totalWidth) || ((TQ_UINT32)contentsHeight() != totalHeight)) { // Calculate the point in the coordinates of the contents which is currently at the center of the viewport. TQPoint midPoint = TQPoint(visibleWidth() / 2 + contentsX(), visibleHeight() / 2 + contentsY()); @@ -394,20 +394,20 @@ void PageView::layoutPages(bool zoomChanged) // Finally, calculate the left and top coordinates of each row and // column, respectively - TQMemArray colLeft(nrCols); + TQMemArray colLeft(nrCols); colLeft[0] = distance; - for(Q_UINT8 i=1; i rowTop(numRows); + TQMemArray rowTop(numRows); rowTop[0] = distance; - for(Q_UINT16 i=1; isize(); i++) + for(TQ_UINT16 i=0; isize(); i++) { - Q_UINT8 col; - Q_UINT16 row; + TQ_UINT8 col; + TQ_UINT16 row; if (nrCols == 2) { // In two column-mode start with the right column. @@ -499,10 +499,10 @@ void PageView::viewportPaintEvent(TQPaintEvent* e) DocumentWidget* item = widgetList->at(i); // Check if the Widget needs to be updated. - if (!item->geometry().intersects(e->rect())) + if (!item->tqgeometry().intersects(e->rect())) continue; - TQRect widgetGeometry = item->geometry(); + TQRect widgetGeometry = item->tqgeometry(); // Draw the widget. if (e->rect().intersects(widgetGeometry)) @@ -521,10 +521,10 @@ void PageView::viewportPaintEvent(TQPaintEvent* e) // Paint the background. TQPainter p(viewport()); - TQMemArray backgroundRects = backgroundArea.rects(); + TQMemArray backgroundRects = backgroundArea.tqrects(); for (unsigned int i = 0; i < backgroundRects.count(); i++) - p.fillRect(backgroundRects[i], colorGroup().mid()); + p.fillRect(backgroundRects[i], tqcolorGroup().mid()); } @@ -542,7 +542,7 @@ void PageView::calculateCurrentPageNumber(int x, int y) int maxVisiblePixels = 0; DocumentWidget* _currentWidget = 0; - for (Q_UINT16 i = 0; i < widgetList->size(); i++) + for (TQ_UINT16 i = 0; i < widgetList->size(); i++) { DocumentWidget* documentWidget = widgetList->at(i); // Safety check diff --git a/kviewshell/pageView.h b/kviewshell/pageView.h index e2dfd59e..a7d2ad15 100644 --- a/kviewshell/pageView.h +++ b/kviewshell/pageView.h @@ -34,20 +34,21 @@ class PageNumber; * PageView is a customized TQScrollView, which can hold one * page. This page will be centered on the viewport. */ -class PageView : public QScrollView +class PageView : public TQScrollView { Q_OBJECT + TQ_OBJECT public: - PageView( TQWidget* parent = 0, const char* name = 0 ); + PageView( TQWidget* tqparent = 0, const char* name = 0 ); ~PageView() {} void addChild( TQPtrVector *wdgList ); /** Sets the number of columns into which the widgets are aligned. If nothing is set, '2' is the default. */ - void setNrColumns( Q_UINT8 cols ); - void setNrRows( Q_UINT8 rows ); + void setNrColumns( TQ_UINT8 cols ); + void setNrRows( TQ_UINT8 rows ); void setContinuousViewMode(bool continuous); bool fullScreenMode() { return fullScreen; } @@ -71,9 +72,9 @@ public: widgets. The number i returned always satisfies 1 <= i <= nrCols, where nrCols is the private variable of the same nane. */ - Q_UINT8 getNrColumns() const { return (widgetList==0) ? 1 : QMIN(nrCols, QMAX(1, widgetList->size())); } + TQ_UINT8 getNrColumns() const { return (widgetList==0) ? 1 : TQMIN(nrCols, TQMAX(1, widgetList->size())); } - Q_UINT8 getNrRows() const { return nrRows; } + TQ_UINT8 getNrRows() const { return nrRows; } bool isContinuous() const { return continuousViewmode; } /** Return true if the top resp. bottom of the page is visible. */ @@ -105,9 +106,9 @@ public slots: /** Turn the scrollbars on/off. */ void slotShowScrollbars(bool); - /** Set layout of the page widgets according to the current viewmode and zoomlevel. - Set zoomChanged = true if the the layout needs updateing because the zoomlevel has changed. */ - void layoutPages(bool zoomChanged = false); + /** Set tqlayout of the page widgets according to the current viewmode and zoomlevel. + Set zoomChanged = true if the the tqlayout needs updateing because the zoomlevel has changed. */ + void tqlayoutPages(bool zoomChanged = false); void slotEnableMoveTool(bool enable); @@ -150,8 +151,8 @@ private: /** Used internally by the centerContents()-method. Set with the setNrColumns() method */ - Q_UINT8 nrCols; - Q_UINT8 nrRows; + TQ_UINT8 nrCols; + TQ_UINT8 nrRows; bool continuousViewmode; bool fullScreen; diff --git a/kviewshell/plugins/djvu/djvumultipage.cpp b/kviewshell/plugins/djvu/djvumultipage.cpp index 0f0c7074..dbe68aaa 100644 --- a/kviewshell/plugins/djvu/djvumultipage.cpp +++ b/kviewshell/plugins/djvu/djvumultipage.cpp @@ -47,9 +47,9 @@ typedef KParts::GenericFactory DjVuMultiPageFactory; K_EXPORT_COMPONENT_FACTORY(djvuviewpart, DjVuMultiPageFactory) -DjVuMultiPage::DjVuMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *parent, +DjVuMultiPage::DjVuMultiPage(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList&) - : KMultiPage(parentWidget, widgetName, parent, name), djvuRenderer(parentWidget) + : KMultiPage(tqparentWidget, widgetName, tqparent, name), djvuRenderer(tqparentWidget) { /* This is kparts wizardry that cannot be understood by man. Simply change the names to match your implementation. */ @@ -162,7 +162,7 @@ void DjVuMultiPage::slotDeletePages() if (numberOfPages() == 0) return; - KDialogBase dialog( parentWdg, "urldialog", true, i18n("Delete Pages"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ); + KDialogBase dialog( tqparentWdg, "urldialog", true, i18n("Delete Pages"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ); PageRangeWidget range( 1, numberOfPages(), currentPageNumber(), &dialog, "range widget" ); TQToolTip::add( &range, i18n( "Select the pages you wish to delete." ) ); dialog.setButtonOK(i18n("Delete Pages")); @@ -188,7 +188,7 @@ void DjVuMultiPage::slotDeletePages() //@@@@@@@@@@ tableOfContents->setContents(renderer->getBookmarks()); // Clear Statusbar - emit setStatusBarText(TQString::null); + emit setStatusBarText(TQString()); } @@ -220,7 +220,7 @@ void DjVuMultiPage::print() printer->addDialogPage( conversionOptions ); // initialize the printer using the print dialog - if ( printer->setup(parentWdg, i18n("Print %1").arg(m_file.section('/', -1))) ) { + if ( printer->setup(tqparentWdg, i18n("Print %1").tqarg(m_file.section('/', -1))) ) { // Now do the printing. TQValueList pageList = printer->pageList(); if (pageList.isEmpty()) @@ -228,7 +228,7 @@ void DjVuMultiPage::print() else { // Printing usually takes a while. This is to keep the GUI // updated. - qApp->processEvents(); + tqApp->processEvents(); // Printing... DjVuToPS converter; @@ -279,7 +279,7 @@ void DjVuMultiPage::print() else options.set_zoom(100); - KTempFile tmpPSFile(TQString::null, "ps"); + KTempFile tmpPSFile(TQString(), "ps"); tmpPSFile.close(); tmpPSFile.setAutoDelete(true); @@ -314,27 +314,27 @@ void DjVuMultiPage::slotSave() // Try to guess the proper ending... TQString formats; TQString ending; - int rindex = m_file.findRev("."); + int rindex = m_file.tqfindRev("."); if (rindex == -1) { - ending = TQString::null; - formats = TQString::null; + ending = TQString(); + formats = TQString(); } else { ending = m_file.mid(rindex); // e.g. ".dvi" formats = fileFormats().grep(ending).join("\n"); } - TQString fileName = KFileDialog::getSaveFileName(TQString::null, formats, 0, i18n("Save File As")); + TQString fileName = KFileDialog::getSaveFileName(TQString(), formats, 0, i18n("Save File As")); if (fileName.isEmpty()) return; // Add the ending to the filename. I hope the user likes it that // way. - if (!ending.isEmpty() && fileName.find(ending) == -1) + if (!ending.isEmpty() && fileName.tqfind(ending) == -1) fileName = fileName+ending; if (TQFile(fileName).exists()) { - int r = KMessageBox::warningContinueCancel(parentWdg, i18n("The file %1\nalready exists. Do you want to overwrite it?").arg(fileName), + int r = KMessageBox::warningContinueCancel(tqparentWdg, i18n("The file %1\nalready exists. Do you want to overwrite it?").tqarg(fileName), i18n("Overwrite File"), i18n("Overwrite")); if (r == KMessageBox::Cancel) return; @@ -344,8 +344,8 @@ void DjVuMultiPage::slotSave() /* if (!djvuRenderer.save(fileName) == false) - KMessageBox::error( parentWdg, - i18n("File error. Unable to write to the specified file '%1'. The document is not saved.").arg(fileName), + KMessageBox::error( tqparentWdg, + i18n("File error. Unable to write to the specified file '%1'. The document is not saved.").tqarg(fileName), i18n("File Error")); */ diff --git a/kviewshell/plugins/djvu/djvumultipage.h b/kviewshell/plugins/djvu/djvumultipage.h index c460e6b3..83e94e40 100644 --- a/kviewshell/plugins/djvu/djvumultipage.h +++ b/kviewshell/plugins/djvu/djvumultipage.h @@ -87,6 +87,7 @@ required. class DjVuMultiPage : public KMultiPage { Q_OBJECT + TQ_OBJECT public: /** Constructor @@ -95,7 +96,7 @@ public: kmultipage. Please have a look at the constructor's source code to see how to adjust this for your implementation. */ - DjVuMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *parent, + DjVuMultiPage(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList& args = TQStringList()); /** Destructor diff --git a/kviewshell/plugins/djvu/djvurenderer.cpp b/kviewshell/plugins/djvu/djvurenderer.cpp index 49413818..e1cbd044 100644 --- a/kviewshell/plugins/djvu/djvurenderer.cpp +++ b/kviewshell/plugins/djvu/djvurenderer.cpp @@ -44,14 +44,14 @@ //#define KF_DEBUG -inline GUTF8String GStringFromQString(const TQString& x) +inline GUTF8String GStringFromTQString(const TQString& x) { GUTF8String retval=(const char*)x.utf8(); return retval; } -inline TQString QStringFromGString(const GUTF8String& x) +inline TQString TQStringFromGString(const GUTF8String& x) { TQString retval=TQString::fromUtf8((const char*)x); return retval; @@ -62,7 +62,7 @@ DjVuRenderer::DjVuRenderer(TQWidget* par) : DocumentRenderer(par) { #ifdef KF_DEBUG - kdError() << "DjVuRenderer( parent=" << par << " )" << endl; + kdError() << "DjVuRenderer( tqparent=" << par << " )" << endl; #endif PPMstream = ByteStream::create(); @@ -168,7 +168,7 @@ void DjVuRenderer::drawPage(double resolution, RenderedDocumentPage* page) { kdError() << "loading failed" << endl; //draw an empty page - foreGroundPaint->fillRect(0, 0, pageWidth, pageHeight, Qt::white); + foreGroundPaint->fillRect(0, 0, pageWidth, pageHeight, TQt::white); } foreGroundPaint->drawPixmap(0, 0, pixmap); delete[] buf; @@ -206,7 +206,7 @@ void DjVuRenderer::drawPage(double resolution, RenderedDocumentPage* page) { kdError() << "loading failed" << endl; //draw an empty page - foreGroundPaint->fillRect(0, 0, pageWidth, pageHeight, Qt::white); + foreGroundPaint->fillRect(0, 0, pageWidth, pageHeight, TQt::white); } foreGroundPaint->drawPixmap(0, 0, pixmap); delete[] buf; @@ -225,7 +225,7 @@ void DjVuRenderer::drawPage(double resolution, RenderedDocumentPage* page) else { //draw an empty page - foreGroundPaint->fillRect(0, 0, pageWidth, pageHeight, Qt::white); + foreGroundPaint->fillRect(0, 0, pageWidth, pageHeight, TQt::white); } } @@ -270,8 +270,8 @@ bool DjVuRenderer::setFile(const TQString &fname, const KURL &) TQFileInfo fi(fname); TQString filename = fi.absFilePath(); if (!fi.exists() || fi.isDir()) { - KMessageBox::error( parentWidget, - i18n("File error. The specified file '%1' does not exist.").arg(filename), + KMessageBox::error( tqparentWidget, + i18n("File error. The specified file '%1' does not exist.").tqarg(filename), i18n("File Error")); // the return value 'false' indicates that this operation was not successful. return false; @@ -282,7 +282,7 @@ bool DjVuRenderer::setFile(const TQString &fname, const KURL &) // Now we assume that the file is fine and load the file. G_TRY { - document = DjVuDocEditor::create_wait(GURL::Filename::UTF8(GStringFromQString(filename))); + document = DjVuDocEditor::create_wait(GURL::Filename::UTF8(GStringFromTQString(filename))); } G_CATCH(ex) { ; @@ -292,8 +292,8 @@ bool DjVuRenderer::setFile(const TQString &fname, const KURL &) // If the above assumption was false. if (!document) { - KMessageBox::error( parentWidget, - i18n("File error. The specified file '%1' could not be loaded.").arg(filename), + KMessageBox::error( tqparentWidget, + i18n("File error. The specified file '%1' could not be loaded.").tqarg(filename), i18n("File Error")); clear(); @@ -348,7 +348,7 @@ void DjVuRenderer::getAnnotations(RenderedDocumentPage* page, GP djvu for (GPosition pos = map; pos; ++pos) { // Currently we only support rectangular links - if (!map[pos]->get_shape_type() == GMapArea::RECT) + if (!map[pos]->get_tqshape_type() == GMapArea::RECT) continue; GRect rect = map[pos]->get_bound_rect(); @@ -361,7 +361,7 @@ void DjVuRenderer::getAnnotations(RenderedDocumentPage* page, GP djvu TQString comment((const char*)map[pos]->comment); // Create an anchor for this link. - if (!anchorList.contains(url)) + if (!anchorList.tqcontains(url)) { // For now we only accept links to pages in the same document. if(url[0] == '#' && target == "_self") @@ -400,7 +400,7 @@ bool DjVuRenderer::initializeDocument() // very long documents if (numPages > 100) emit setStatusBarText(i18n("Loading file. Computing page sizes...")); - for(Q_UINT16 i=0; iprocessEvents(); @@ -418,7 +418,7 @@ bool DjVuRenderer::initializeDocument() pageSizes[i].setPageSize(w, h); } } - emit setStatusBarText(TQString::null); + emit setStatusBarText(TQString()); // We will also generate a list of hyperlink-anchors in the document. // So declare the existing lists empty. @@ -461,7 +461,7 @@ GP DjVuRenderer::getText(PageNumber pageNumber) void DjVuRenderer::fillInText(RenderedDocumentPage* page, const GP& text, DjVuTXT::Zone& zone, TQSize& djvuPageSize) { - if (zone.children.isempty()) + if (zone.tqchildren.isempty()) { int pageWidth = page->width(); int pageHeight = page->height(); @@ -469,7 +469,7 @@ void DjVuRenderer::fillInText(RenderedDocumentPage* page, const GP& tex double scaleX = pageWidth / (double)djvuPageSize.width(); double scaleY = pageHeight / (double)djvuPageSize.height(); - TQString zoneString = QStringFromGString(text->textUTF8.substr(zone.text_start, zone.text_length)); + TQString zoneString = TQStringFromGString(text->textUTF8.substr(zone.text_start, zone.text_length)); //kdDebug() << "zone text: " << zoneString << endl; @@ -481,9 +481,9 @@ void DjVuRenderer::fillInText(RenderedDocumentPage* page, const GP& tex } else { - for (GPosition pos=zone.children; pos; ++pos) + for (GPosition pos=zone.tqchildren; pos; ++pos) { - fillInText(page, text, zone.children[pos], djvuPageSize); + fillInText(page, text, zone.tqchildren[pos], djvuPageSize); } } } @@ -577,14 +577,14 @@ bool DjVuRenderer::convertToPSFile( DjVuToPS &converter, TQString filename, TQVa TQMutexLocker locker( &mutex ); // Set up progress dialog - KProgressDialog *pdialog = new KProgressDialog(parentWidget, "Printing-ProgressDialog", i18n("Printing..."), i18n("Preparing pages for printing..."), true); + KProgressDialog *pdialog = new KProgressDialog(tqparentWidget, "Printing-ProgressDialog", i18n("Printing..."), i18n("Preparing pages for printing..."), true); pdialog->setButtonText(i18n("Abort")); pdialog->showCancelButton(true); pdialog->progressBar()->setTotalSteps(pageList.size()); - pdialog->progressBar()->setFormat(TQString::null); + pdialog->progressBar()->setFormat(TQString()); // Open output file - GURL outname = GURL::Filename::UTF8(GStringFromQString(filename)); + GURL outname = GURL::Filename::UTF8(GStringFromTQString(filename)); GP obs = ByteStream::create(outname, "w"); TQString pagename; @@ -596,7 +596,7 @@ bool DjVuRenderer::convertToPSFile( DjVuToPS &converter, TQString filename, TQVa break; pagename += ","; } - GUTF8String pages = GStringFromQString(pagename); + GUTF8String pages = GStringFromTQString(pagename); converter.set_info_cb(printerInfoCallBack, (void*)pdialog); bool iscancelled = false; @@ -618,7 +618,7 @@ bool DjVuRenderer::convertToPSFile( DjVuToPS &converter, TQString filename, TQVa } -void DjVuRenderer::deletePages(Q_UINT16 from, Q_UINT16 to) +void DjVuRenderer::deletePages(TQ_UINT16 from, TQ_UINT16 to) { // Paranoia security checks if (document == 0) { @@ -634,10 +634,10 @@ void DjVuRenderer::deletePages(Q_UINT16 from, Q_UINT16 to) KProgressDialog *pdialog = 0; if (to-from > 9) { - pdialog = new KProgressDialog(parentWidget, "Printing-ProgressDialog", i18n("Deleting pages..."), i18n("Please wait while pages are removed..."), true); + pdialog = new KProgressDialog(tqparentWidget, "Printing-ProgressDialog", i18n("Deleting pages..."), i18n("Please wait while pages are removed..."), true); pdialog->showCancelButton(false); pdialog->progressBar()->setTotalSteps(to-from+1); - pdialog->progressBar()->setFormat(TQString::null); + pdialog->progressBar()->setFormat(TQString()); pdialog->show(); kapp->processEvents(); } @@ -650,14 +650,14 @@ void DjVuRenderer::deletePages(Q_UINT16 from, Q_UINT16 to) // Delete pages if (pdialog == 0) { GList pageList; - for(Q_UINT16 i=from; i<= to; i++) + for(TQ_UINT16 i=from; i<= to; i++) pageList.append(i-1); document_new->remove_pages(pageList); } else { - for(Q_UINT16 i=from; i<=to; i++) { + for(TQ_UINT16 i=from; i<=to; i++) { document_new->remove_page(from-1); pdialog->progressBar()->setProgress(i-from); - pdialog->progressBar()->setFormat(i18n("deleting page %1").arg(i)); + pdialog->progressBar()->setFormat(i18n("deleting page %1").tqarg(i)); kapp->processEvents(); } delete pdialog; @@ -679,7 +679,7 @@ bool DjVuRenderer::save(const TQString &filename) TQMutexLocker locker( &mutex ); G_TRY { - document->save_as(GURL::Filename::UTF8(GStringFromQString(filename)), true); + document->save_as(GURL::Filename::UTF8(GStringFromTQString(filename)), true); } G_CATCH(ex) { return false; @@ -705,7 +705,7 @@ void DjVuRenderer::printerInfoCallBack(int page_num, int page_count, int, DjVuTo KProgressDialog *pdialog = (KProgressDialog *)pd; pdialog->progressBar()->setProgress(page_count); - pdialog->progressBar()->setFormat(i18n("processing page %1").arg(page_num+1)); + pdialog->progressBar()->setFormat(i18n("processing page %1").tqarg(page_num+1)); pdialog->show(); if (pdialog->wasCancelled()) diff --git a/kviewshell/plugins/djvu/djvurenderer.h b/kviewshell/plugins/djvu/djvurenderer.h index 85b40626..31d69e83 100644 --- a/kviewshell/plugins/djvu/djvurenderer.h +++ b/kviewshell/plugins/djvu/djvurenderer.h @@ -51,13 +51,14 @@ with 10 empty pages of A4 size and a few anchors and bookmarks. class DjVuRenderer : public DocumentRenderer { Q_OBJECT + TQ_OBJECT public: /** Default constructor This constructor simply prints a message and calls the default constructor. */ - DjVuRenderer(TQWidget* parent); + DjVuRenderer(TQWidget* tqparent); /** Destructor @@ -113,7 +114,7 @@ public: bool convertToPSFile( DjVuToPS &converter, TQString filename, TQValueList &pageList ); /** Deletes pages from the document */ - void deletePages(Q_UINT16 from, Q_UINT16 to); + void deletePages(TQ_UINT16 from, TQ_UINT16 to); /** Saves the file */ bool save(const TQString &filename); diff --git a/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.cpp b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.cpp index 24b7dfbb..0a32ed95 100644 --- a/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.cpp +++ b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.cpp @@ -29,14 +29,14 @@ #include "kprintDialogPage_DJVUconversionoptions.h" #include "kprintDialogPage_DJVUconversionoptions_basewidget.h" -KPrintDialogPage_DJVUConversionOptions::KPrintDialogPage_DJVUConversionOptions( TQWidget *parent, const char *name ) - : KPrintDialogPage( parent, name ) +KPrintDialogPage_DJVUConversionOptions::KPrintDialogPage_DJVUConversionOptions( TQWidget *tqparent, const char *name ) + : KPrintDialogPage( tqparent, name ) { setTitle( i18n("DJVU to PS Conversion") ); kprintDialogPage_pageoptions_baseLayout = new TQVBoxLayout( this, 11, 6, "kprintDialogPage_pageoptions_baseLayout"); if (kprintDialogPage_pageoptions_baseLayout == 0) { - kdError(1223) << "KPrintDialogPage_DJVUPageOptions::KPrintDialogPage_DJVUPageOptions() cannot create layout" << endl; + kdError(1223) << "KPrintDialogPage_DJVUPageOptions::KPrintDialogPage_DJVUPageOptions() cannot create tqlayout" << endl; return; } diff --git a/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.h b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.h index c1ec4b3c..f9ff0c14 100644 --- a/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.h +++ b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.h @@ -34,7 +34,7 @@ class kprintDialogPage_DJVUconversionoptions_basewidget; class KPrintDialogPage_DJVUConversionOptions : public KPrintDialogPage { public: - KPrintDialogPage_DJVUConversionOptions( TQWidget *parent = 0, const char *name = 0 ); + KPrintDialogPage_DJVUConversionOptions( TQWidget *tqparent = 0, const char *name = 0 ); void getOptions( TQMap& opts, bool incldef = false ); void setOptions( const TQMap& opts ); diff --git a/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions_basewidget.ui b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions_basewidget.ui index fbc48750..416b7b36 100644 --- a/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions_basewidget.ui +++ b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions_basewidget.ui @@ -1,6 +1,6 @@ kprintDialogPage_DJVUconversionoptions_basewidget - + kprintDialogPage_DJVUconversionoptions_basewidget @@ -16,7 +16,7 @@ unnamed - + textLabel1 @@ -32,7 +32,7 @@ PostScript language level: - + textLabel2 @@ -48,7 +48,7 @@ Render mode: - + Level 1 (almost obsolete) @@ -82,7 +82,7 @@ <p><b>Level 3:</b> Level 3 PostScript files are much smaller and print even faster than Level 2 files. However, Level 3 files are supported only by some modern printers. If Level 3 works for you, this is the best option.</p> - + Print Full Page (default) @@ -132,7 +132,7 @@ Expanding - + 20 40 @@ -141,5 +141,5 @@ - + diff --git a/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp b/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp index e6872648..f93d6b0f 100644 --- a/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp +++ b/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp @@ -28,8 +28,8 @@ #include "kprintDialogPage_DJVUpageoptions.h" -KPrintDialogPage_DJVUPageOptions::KPrintDialogPage_DJVUPageOptions( TQWidget *parent, const char *name ) - : KPrintDialogPage( parent, name ) +KPrintDialogPage_DJVUPageOptions::KPrintDialogPage_DJVUPageOptions( TQWidget *tqparent, const char *name ) + : KPrintDialogPage( tqparent, name ) { setTitle( i18n("Page Size & Placement") ); @@ -40,7 +40,7 @@ KPrintDialogPage_DJVUPageOptions::KPrintDialogPage_DJVUPageOptions( TQWidget *pa kprintDialogPage_pageoptions_baseLayout = new TQVBoxLayout( this, 11, 6, "kprintDialogPage_pageoptions_baseLayout"); if (kprintDialogPage_pageoptions_baseLayout == 0) { - kdError(1223) << "KPrintDialogPage_DJVUPageOptions::KPrintDialogPage_DJVUPageOptions() cannot create layout" << endl; + kdError(1223) << "KPrintDialogPage_DJVUPageOptions::KPrintDialogPage_DJVUPageOptions() cannot create tqlayout" << endl; return; } @@ -70,7 +70,7 @@ KPrintDialogPage_DJVUPageOptions::KPrintDialogPage_DJVUPageOptions( TQWidget *pa kprintDialogPage_pageoptions_baseLayout->addStretch(); - resize( TQSize(319, 166).expandedTo(minimumSizeHint()) ); + resize( TQSize(319, 166).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); } diff --git a/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.h b/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.h index 5bb5833e..fb6493e9 100644 --- a/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.h +++ b/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.h @@ -25,7 +25,7 @@ class TQCheckBox; class KPrintDialogPage_DJVUPageOptions : public KPrintDialogPage { public: - KPrintDialogPage_DJVUPageOptions( TQWidget *parent = 0, const char *name = 0 ); + KPrintDialogPage_DJVUPageOptions( TQWidget *tqparent = 0, const char *name = 0 ); void getOptions( TQMap& opts, bool incldef = false ); void setOptions( const TQMap& opts ); diff --git a/kviewshell/plugins/djvu/libdjvu/Arrays.cpp b/kviewshell/plugins/djvu/libdjvu/Arrays.cpp index 5cb7b04c..30038734 100644 --- a/kviewshell/plugins/djvu/libdjvu/Arrays.cpp +++ b/kviewshell/plugins/djvu/libdjvu/Arrays.cpp @@ -190,7 +190,7 @@ ArrayRep::resize(int lo, int hi) init1(ndata, hibound+1-nminlo, hi-nminlo); destroy(data, lobound-minlo, hibound-minlo); - // free and replace + // free and tqreplace void *tmp=data; data = ndata; ndata=tmp; diff --git a/kviewshell/plugins/djvu/libdjvu/Arrays.h b/kviewshell/plugins/djvu/libdjvu/Arrays.h index b2676d5a..c0bc75a3 100644 --- a/kviewshell/plugins/djvu/libdjvu/Arrays.h +++ b/kviewshell/plugins/djvu/libdjvu/Arrays.h @@ -319,7 +319,7 @@ public: /** Erases the array contents. All elements in the array are destroyed. The valid subscript range is set to the empty range. */ void empty(); - /** Extends the subscript range so that is contains #n#. + /** Extends the subscript range so that is tqcontains #n#. This function does nothing if #n# is already int the valid subscript range. If the valid range was empty, both the lower bound and the upper bound are set to #n#. Otherwise the valid subscript range is extended diff --git a/kviewshell/plugins/djvu/libdjvu/BSEncodeByteStream.cpp b/kviewshell/plugins/djvu/libdjvu/BSEncodeByteStream.cpp index 9d5b726d..350d792d 100644 --- a/kviewshell/plugins/djvu/libdjvu/BSEncodeByteStream.cpp +++ b/kviewshell/plugins/djvu/libdjvu/BSEncodeByteStream.cpp @@ -104,7 +104,7 @@ static const int OVERFLOW=32; // Sorting tresholds static const int RANKSORT_THRESH=10; -static const int QUICKSORT_STACK=512; +static const int TQUICKSORT_STACK=512; static const int PRESORT_THRESH=10; static const int PRESORT_DEPTH=8; static const int RADIX_THRESH=32768; @@ -283,8 +283,8 @@ void _BSort::quicksort3r(int lo, int hi, int depth) { /* Initialize stack */ - int slo[QUICKSORT_STACK]; - int shi[QUICKSORT_STACK]; + int slo[TQUICKSORT_STACK]; + int shi[TQUICKSORT_STACK]; int sp = 1; slo[0] = lo; shi[0] = hi; @@ -342,7 +342,7 @@ _BSort::quicksort3r(int lo, int hi, int depth) vswap(hi-tmp+1, h+1, tmp, posn); h1 = hi - (h1-h); // -- process segments - ASSERT(sp+2 &pool) DEBUG_MSG("DataPool::OpenFiles_File::add_pool: pool=" << (void *) pool << "\n"); DEBUG_MAKE_INDENT(3); GCriticalSectionLock lock(&pools_lock); - if (!pools_list.contains(pool)) + if (!pools_list.tqcontains(pool)) pools_list.append(pool); return pools_list.size(); } @@ -381,14 +381,14 @@ FCPools::add_pool(const GURL &url, GP pool) if (url.is_local_file_url()) { GPList list; - GPosition pos(map.contains(url)); + GPosition pos(map.tqcontains(url)); if (! pos) { map[url]=list; - pos=map.contains(url); + pos=map.tqcontains(url); } GPList &plist=map[pos]; - if (!plist.contains(pool)) + if (!plist.tqcontains(pool)) plist.append(pool); } clean(); @@ -403,7 +403,7 @@ FCPools::get_pool(const GURL &url, int start, int length) if (url.is_local_file_url()) { GCriticalSectionLock lock(&map_lock); - GPosition pos(map.contains(url)); + GPosition pos(map.tqcontains(url)); if (pos) { GPList &plist=map[pos]; @@ -433,7 +433,7 @@ FCPools::del_pool(const GURL &url, GP pool) if (url.is_local_file_url()) { GPosition pos; - if (map.contains(url, pos)) + if (map.tqcontains(url, pos)) { GPList &list=map[pos]; GPosition list_pos; @@ -458,7 +458,7 @@ FCPools::load_file(const GURL &url) if (url.is_local_file_url()) { GPosition pos; - if (map.contains(url, pos)) + if (map.tqcontains(url, pos)) { // We make here a copy of the list because DataPool::load_file() // will call FCPools::del_pool(), which will modify the list diff --git a/kviewshell/plugins/djvu/libdjvu/DataPool.h b/kviewshell/plugins/djvu/libdjvu/DataPool.h index fb4bea4e..4202ef7d 100644 --- a/kviewshell/plugins/djvu/libdjvu/DataPool.h +++ b/kviewshell/plugins/djvu/libdjvu/DataPool.h @@ -116,7 +116,7 @@ class ByteStream; Access to data in a #DataPool# may be direct (Using \Ref{get_data}() function) or sequential (See \Ref{get_stream}() function). - If the #DataPool# is not connected to anything, that is it contains + If the #DataPool# is not connected to anything, that is it tqcontains some real data, this data can be added to it by means of two \Ref{add_data}() functions. One of them adds data sequentially maintaining the offset of the last block of data added by it. The other can store diff --git a/kviewshell/plugins/djvu/libdjvu/DjVmDir.cpp b/kviewshell/plugins/djvu/libdjvu/DjVmDir.cpp index 83f9df78..2d8d2467 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVmDir.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVmDir.cpp @@ -363,7 +363,7 @@ DjVmDir::decode(const GP &gstr) for(pos=files_list;pos;++pos) { GP file=files_list[pos]; - if (name2file.contains(file->name)) + if (name2file.tqcontains(file->name)) G_THROW( ERR_MSG("DjVmDir.dupl_name") "\t" + file->name ); name2file[file->name]=file; } @@ -372,7 +372,7 @@ DjVmDir::decode(const GP &gstr) for(pos=files_list;pos;++pos) { GP file=files_list[pos]; - if (id2file.contains(file->id)) + if (id2file.tqcontains(file->id)) G_THROW( ERR_MSG("DjVmDir.dupl_id") "\t" + file->id); id2file[file->id]=file; } @@ -383,7 +383,7 @@ DjVmDir::decode(const GP &gstr) GP file=files_list[pos]; if (file->title.length()) { - if (title2file.contains(file->title)) + if (title2file.tqcontains(file->title)) G_THROW( ERR_MSG("DjVmDir.dupl_title") "\t" + file->title); title2file[file->title]=file; } @@ -542,7 +542,7 @@ DjVmDir::name_to_file(const GUTF8String & name) const GCriticalSectionLock lock((GCriticalSection *) &class_lock); GPosition pos; - return (name2file.contains(name, pos))?name2file[pos]:(GP(0)); + return (name2file.tqcontains(name, pos))?name2file[pos]:(GP(0)); } GP @@ -551,7 +551,7 @@ DjVmDir::id_to_file(const GUTF8String &id) const GCriticalSectionLock lock((GCriticalSection *) &class_lock); GPosition pos; - return (id2file.contains(id, pos))?id2file[pos]:(GP(0)); + return (id2file.tqcontains(id, pos))?id2file[pos]:(GP(0)); } GP @@ -560,7 +560,7 @@ DjVmDir::title_to_file(const GUTF8String &title) const GCriticalSectionLock lock((GCriticalSection *) &class_lock); GPosition pos; - return (title2file.contains(title, pos))?title2file[pos]:(GP(0)); + return (title2file.tqcontains(title, pos))?title2file[pos]:(GP(0)); } GPList @@ -636,15 +636,15 @@ DjVmDir::insert_file(const GP & file, int pos_num) // Modify maps // if (! File::is_legal_id(file->id)) // G_THROW( ERR_MSG("DjVmDir.bad_file") "\t" + file->id); - if (id2file.contains(file->id)) + if (id2file.tqcontains(file->id)) G_THROW( ERR_MSG("DjVmDir.dupl_id2") "\t" + file->id); - if (name2file.contains(file->name)) + if (name2file.tqcontains(file->name)) G_THROW( ERR_MSG("DjVmDir.dupl_name2") "\t" + file->name); name2file[file->name]=file; id2file[file->id]=file; if (file->title.length()) { - if (title2file.contains(file->title)) // duplicate titles may become ok some day + if (title2file.tqcontains(file->title)) // duplicate titles may become ok some day G_THROW( ERR_MSG("DjVmDir.dupl_title2") "\t" + file->title); title2file[file->title]=file; } @@ -749,7 +749,7 @@ DjVmDir::set_file_name(const GUTF8String &id, const GUTF8String &name) } // Check if ID is valid - if (!id2file.contains(id, pos)) + if (!id2file.tqcontains(id, pos)) G_THROW( ERR_MSG("DjVmDir.no_info") "\t" + GUTF8String(id)); GP file=id2file[pos]; name2file.del(file->name); @@ -776,7 +776,7 @@ DjVmDir::set_file_title(const GUTF8String &id, const GUTF8String &title) } // Check if ID is valid - if (!id2file.contains(id, pos)) + if (!id2file.tqcontains(id, pos)) G_THROW( ERR_MSG("DjVmDir.no_info") "\t" + GUTF8String(id)); GP file=id2file[pos]; title2file.del(file->title); @@ -795,7 +795,7 @@ DjVmDir::resolve_duplicates(const bool save_as_bundled) for(pos=files_list;pos;++pos) { const GUTF8String save_name=files_list[pos]->check_save_name(save_as_bundled).downcase(); - if(save_map.contains(save_name)) + if(save_map.tqcontains(save_name)) { conflicts[save_name].append(files_list[pos]); }else @@ -813,7 +813,7 @@ DjVmDir::resolve_duplicates(const bool save_as_bundled) { GUTF8String new_name=cfiles[qpos]->get_load_name(); if((new_name != GUTF8String(GNativeString(new_name))) - ||conflicts.contains(new_name)) + ||conflicts.tqcontains(new_name)) { do { @@ -821,7 +821,7 @@ DjVmDir::resolve_duplicates(const bool save_as_bundled) ?(save_name+"-"+GUTF8String(count++)) :(save_name.substr(0,dot)+"-"+GUTF8String(count++)+ save_name.substr(dot,(unsigned int)(-1))); - } while(save_map.contains(new_name.downcase())); + } while(save_map.tqcontains(new_name.downcase())); } cfiles[qpos]->set_save_name(new_name); save_map[new_name]=0; diff --git a/kviewshell/plugins/djvu/libdjvu/DjVmDir0.cpp b/kviewshell/plugins/djvu/libdjvu/DjVmDir0.cpp index 62694098..ca255ea5 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVmDir0.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVmDir0.cpp @@ -132,7 +132,7 @@ DjVmDir0::decode(ByteStream & bs) GP DjVmDir0::get_file(const GUTF8String &name) { - if (name2file.contains(name)) + if (name2file.tqcontains(name)) return name2file[name]; return 0; } diff --git a/kviewshell/plugins/djvu/libdjvu/DjVmDoc.cpp b/kviewshell/plugins/djvu/libdjvu/DjVmDoc.cpp index 5b851d6e..b24b43b1 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVmDoc.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVmDoc.cpp @@ -109,7 +109,7 @@ save_file( { incl_str.setat(incl_str.length()-1, 0); } - GPosition pos=incl.contains(incl_str); + GPosition pos=incl.tqcontains(incl_str); if(pos) { iff_out.get_bytestream()->writestring(incl[pos]); @@ -174,7 +174,7 @@ DjVmDoc::insert_file(const GP & f, if (!f) G_THROW( ERR_MSG("DjVmDoc.no_zero_file") ); - if (data.contains(f->get_load_name())) + if (data.tqcontains(f->get_load_name())) G_THROW( ERR_MSG("DjVmDoc.no_duplicate") ); char buffer[4]; @@ -224,7 +224,7 @@ DjVmDoc::delete_file(const GUTF8String &id) DEBUG_MSG("DjVmDoc::delete_file(): deleting file '" << id << "'\n"); DEBUG_MAKE_INDENT(3); - if (!data.contains(id)) + if (!data.tqcontains(id)) G_THROW(GUTF8String( ERR_MSG("DjVmDoc.cant_delete") "\t") + id); data.del(id); @@ -243,8 +243,8 @@ GP DjVmDoc::get_data(const GUTF8String &id) const { GPosition pos; - if (!data.contains(id, pos)) - G_THROW(GUTF8String( ERR_MSG("DjVmDoc.cant_find") "\t") + id); + if (!data.tqcontains(id, pos)) + G_THROW(GUTF8String( ERR_MSG("DjVmDoc.cant_tqfind") "\t") + id); const GP pool(data[pos]); // First check that the file is in IFF format G_TRY @@ -298,8 +298,8 @@ DjVmDoc::write(const GP &gstr, for(pos=files_list;pos;++pos) { GP file=files_list[pos]; - if((do_rename=(reserved.contains(file->get_load_name())?true:false)) - ||(do_rename=(reserved.contains(file->get_save_name())?true:false))) + if((do_rename=(reserved.tqcontains(file->get_load_name())?true:false)) + ||(do_rename=(reserved.tqcontains(file->get_save_name())?true:false))) { break; } @@ -322,7 +322,7 @@ DjVmDoc::write(const GP &gstr, { GP file=files_list[pos]; const GUTF8String name(::get_name(*file)); - if(reserved.contains(name)) + if(reserved.tqcontains(name)) { GUTF8String new_name; int series=0; @@ -337,7 +337,7 @@ DjVmDoc::write(const GP &gstr, { new_name=name+"_"+GUTF8String(++series); } - } while(reserved.contains(new_name)||this_doc.contains(new_name)); + } while(reserved.tqcontains(new_name)||this_doc.tqcontains(new_name)); dir->set_file_name(file->get_load_name(),new_name); need_new_list=true; } @@ -353,7 +353,7 @@ DjVmDoc::write(const GP &gstr, { GP file=files_list[pos]; file->offset=0xffffffff; - GPosition data_pos=data.contains(file->get_load_name()); + GPosition data_pos=data.tqcontains(file->get_load_name()); if (!data_pos) G_THROW( ERR_MSG("DjVmDoc.no_data") "\t" + file->get_load_name()); if(do_rename) @@ -541,7 +541,7 @@ DjVmDoc::write_index(const GP &str) GP file=files_list[pos]; file->offset=0; - GPosition data_pos=data.contains(file->get_load_name()); + GPosition data_pos=data.tqcontains(file->get_load_name()); if (!data_pos) G_THROW( ERR_MSG("DjVmDoc.no_data") "\t" + file->get_load_name()); file->size=data[data_pos]->get_length(); @@ -609,7 +609,7 @@ DjVmDoc::save_file( GMap *incl) const { const GUTF8String load_name=file.get_load_name(); - if(!incl || !incl->contains(load_name)) + if(!incl || !incl->tqcontains(load_name)) { GMap new_incl; const GUTF8String save_name( diff --git a/kviewshell/plugins/djvu/libdjvu/DjVmNav.cpp b/kviewshell/plugins/djvu/libdjvu/DjVmNav.cpp index 9e8b5fd7..d6f5555c 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVmNav.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVmNav.cpp @@ -147,13 +147,13 @@ DjVmNav::DjVuBookMark::encode(const GP &gstr) ByteStream &bs=*gstr; #ifdef DJVMNAV_WITH_256LIMIT if (count>255) - G_THROW("Excessive number of children in bookmark tree"); + G_THROW("Excessive number of tqchildren in bookmark tree"); bs.write8(count); textsize = displayname.length(); bs.write24( textsize ); #else if (count>65535) - G_THROW("Excessive number of children in bookmark tree"); + G_THROW("Excessive number of tqchildren in bookmark tree"); bs.write8( count & 0xff ); bs.write8( (count>>8) & 0xff ); textsize = displayname.length(); diff --git a/kviewshell/plugins/djvu/libdjvu/DjVmNav.h b/kviewshell/plugins/djvu/libdjvu/DjVmNav.h index 46c5d57f..612cd100 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVmNav.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVmNav.h @@ -115,7 +115,7 @@ private: /** The DjVuBookMark. Each entry in the Navigation chunk (NAVM) is a bookmark. A bookmark - contains a count of immediate children, a display string and a url. + contains a count of immediate tqchildren, a display string and a url. **/ class DjVmNav::DjVuBookMark : public GPEnabled @@ -131,7 +131,7 @@ public: void encode(const GP &stream); void dump(const GP &stream); void decode(const GP &stream); - int count; // count of immediate children. + int count; // count of immediate tqchildren. GUTF8String displayname; // example: "Section 3.5 - Encryption" GUTF8String url; // url, may be blank or relative. }; diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuAnno.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuAnno.cpp index 7cece60b..f3a53bf7 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuAnno.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuAnno.cpp @@ -978,16 +978,16 @@ DjVuANT::get_mode(GLParser & parser) return retval; } -static inline DjVuANT::alignment +static inline DjVuANT::tqalignment legal_halign(const int i) { - DjVuANT::alignment retval; - switch((DjVuANT::alignment)i) + DjVuANT::tqalignment retval; + switch((DjVuANT::tqalignment)i) { case DjVuANT::ALIGN_LEFT: case DjVuANT::ALIGN_CENTER: case DjVuANT::ALIGN_RIGHT: - retval=(DjVuANT::alignment)i; + retval=(DjVuANT::tqalignment)i; break; default: retval=DjVuANT::ALIGN_UNSPEC; @@ -996,16 +996,16 @@ legal_halign(const int i) return retval; } -static inline DjVuANT::alignment +static inline DjVuANT::tqalignment legal_valign(const int i) { - DjVuANT::alignment retval; - switch((DjVuANT::alignment)i) + DjVuANT::tqalignment retval; + switch((DjVuANT::tqalignment)i) { case DjVuANT::ALIGN_CENTER: case DjVuANT::ALIGN_TOP: case DjVuANT::ALIGN_BOTTOM: - retval=(DjVuANT::alignment)i; + retval=(DjVuANT::tqalignment)i; break; default: retval=DjVuANT::ALIGN_UNSPEC; @@ -1014,12 +1014,12 @@ legal_valign(const int i) return retval; } -DjVuANT::alignment +DjVuANT::tqalignment DjVuANT::get_hor_align(GLParser & parser) { DEBUG_MSG("DjVuAnt::get_hor_align(): getting hor page alignemnt ...\n"); DEBUG_MAKE_INDENT(3); - alignment retval=ALIGN_UNSPEC; + tqalignment retval=ALIGN_UNSPEC; G_TRY { GP obj=parser.get_object(ALIGN_TAG); @@ -1030,7 +1030,7 @@ DjVuANT::get_hor_align(GLParser & parser) for(int i=(int)ALIGN_UNSPEC;(i obj=parser.get_object(ALIGN_TAG); @@ -1069,7 +1069,7 @@ DjVuANT::get_ver_align(GLParser & parser) DEBUG_MSG("ver_align='" << align << "'\n"); for(int i=(int)ALIGN_UNSPEC;(i map_area; - if (shape->get_type()==GLObject::LIST) + if (tqshape->get_type()==GLObject::LIST) { - if (shape->get_name()==GMapArea::RECT_TAG) + if (tqshape->get_name()==GMapArea::RECT_TAG) { DEBUG_MSG("it's a rectangle.\n"); - GRect grect((*shape)[0]->get_number(), - (*shape)[1]->get_number(), - (*shape)[2]->get_number(), - (*shape)[3]->get_number()); + GRect grect((*tqshape)[0]->get_number(), + (*tqshape)[1]->get_number(), + (*tqshape)[2]->get_number(), + (*tqshape)[3]->get_number()); GP map_rect=GMapRect::create(grect); map_area=(GMapRect *)map_rect; - } else if (shape->get_name()==GMapArea::POLY_TAG) + } else if (tqshape->get_name()==GMapArea::POLY_TAG) { DEBUG_MSG("it's a polygon.\n"); - int points=shape->get_list().size()/2; + int points=tqshape->get_list().size()/2; GTArray xx(points-1), yy(points-1); for(int i=0;iget_number(); - yy[i]=(*shape)[2*i+1]->get_number(); + xx[i]=(*tqshape)[2*i]->get_number(); + yy[i]=(*tqshape)[2*i+1]->get_number(); } GP map_poly=GMapPoly::create(xx,yy,points); map_area=(GMapPoly *)map_poly; - } else if (shape->get_name()==GMapArea::OVAL_TAG) + } else if (tqshape->get_name()==GMapArea::OVAL_TAG) { DEBUG_MSG("it's an ellipse.\n"); - GRect grect((*shape)[0]->get_number(), - (*shape)[1]->get_number(), - (*shape)[2]->get_number(), - (*shape)[3]->get_number()); + GRect grect((*tqshape)[0]->get_number(), + (*tqshape)[1]->get_number(), + (*tqshape)[2]->get_number(), + (*tqshape)[3]->get_number()); GP map_oval=GMapOval::create(grect); map_area=(GMapOval *)map_oval; } diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuAnno.h b/kviewshell/plugins/djvu/libdjvu/DjVuAnno.h index 964c6c44..b59fe37d 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuAnno.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuAnno.h @@ -104,7 +104,7 @@ class ByteStream; // -------- DJVUANT -------- /** This class contains some trivial annotations of the page or of the - document such as page border color, page alignment, initial zoom and + document such as page border color, page tqalignment, initial zoom and display mode, hyperlinks and highlighted areas. All this information is put inside a textual chunk #ANTa# in pseudo-lisp format. Decoding and encoding are normally done by \Ref{DjVuANT::decode}() and @@ -120,7 +120,7 @@ public: enum { MODE_UNSPEC=0, MODE_COLOR, MODE_FORE, MODE_BACK, MODE_BW }; enum { ZOOM_STRETCH=-4, ZOOM_ONE2ONE=-3, ZOOM_WIDTH=-2, ZOOM_PAGE=-1, ZOOM_UNSPEC=0 }; - enum alignment { ALIGN_UNSPEC=0, ALIGN_LEFT, ALIGN_CENTER, ALIGN_RIGHT, + enum tqalignment { ALIGN_UNSPEC=0, ALIGN_LEFT, ALIGN_CENTER, ALIGN_RIGHT, ALIGN_TOP, ALIGN_BOTTOM }; /// Creates an empty annotation object. @@ -152,12 +152,12 @@ public: special cases. \end{description} */ int mode; - /** Horizontal page alignment. Possible values are #ALIGN_LEFT#, + /**Qt::Horizontal page tqalignment. Possible values are #ALIGN_LEFT#, #ALIGN_CENTER#, #ALIGN_RIGHT# and #ALIGN_UNSPEC#. */ - alignment hor_align; - /** Vertical page alignment. Possible values are #ALIGN_TOP#, + tqalignment hor_align; + /**Qt::Vertical page tqalignment. Possible values are #ALIGN_TOP#, #ALIGN_CENTER#, #ALIGN_BOTTOM# and #ALIGN_UNSPEC#. */ - alignment ver_align; + tqalignment ver_align; /** List of defined map areas. They may be just areas of highlighting or hyperlink. Please refer to \Ref{GMapArea}, \Ref{GMapRect}, \Ref{GMapPoly} and \Ref{GMapOval} for details. */ @@ -213,8 +213,8 @@ private: static unsigned long int get_bg_color(class GLParser & parser); static int get_zoom(class GLParser & parser); static int get_mode(class GLParser & parser); - static alignment get_hor_align(class GLParser & parser); - static alignment get_ver_align(class GLParser & parser); + static tqalignment get_hor_align(class GLParser & parser); + static tqalignment get_ver_align(class GLParser & parser); static GPList get_map_areas(class GLParser & parser); #ifndef NO_METADATA_IN_ANT_CHUNK static GMapget_metadata(GLParser & parser); diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp index 542faa7a..fa6ad375 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp @@ -243,7 +243,7 @@ DjVuDocEditor::request_data(const DjVuPort * source, const GURL & url) { GCriticalSectionLock lock(&files_lock); GPosition pos; - if (files_map.contains(frec->get_load_name(), pos)) + if (files_map.tqcontains(frec->get_load_name(), pos)) { const GP f(files_map[pos]); if (f->file && f->file->get_init_data_pool()) @@ -315,7 +315,7 @@ DjVuDocEditor::url_to_file(const GURL & url, bool dont_create) const { GCriticalSectionLock lock(&(const_cast(this)->files_lock)); GPosition pos; - if (files_map.contains(frec->get_load_name(), pos)) + if (files_map.tqcontains(frec->get_load_name(), pos)) { const GP f(files_map[pos]); if (f->file) @@ -333,7 +333,7 @@ DjVuDocEditor::url_to_file(const GURL & url, bool dont_create) const { GCriticalSectionLock lock(&(const_cast(this)->files_lock)); GPosition pos; - if (files_map.contains(frec->get_load_name(), pos)) + if (files_map.tqcontains(frec->get_load_name(), pos)) { files_map[frec->get_load_name()]->file=file; }else @@ -433,15 +433,15 @@ DjVuDocEditor::strip_incl_chunks(const GP & pool_in) } GUTF8String -DjVuDocEditor::insert_file(const GURL &file_url, const GUTF8String &parent_id, +DjVuDocEditor::insert_file(const GURL &file_url, const GUTF8String &tqparent_id, int chunk_num, DjVuPort *source) // Will open the 'file_name' and insert it into an existing DjVuFile - // with ID 'parent_id'. Will insert the INCL chunk at position chunk_num + // with ID 'tqparent_id'. Will insert the INCL chunk at position chunk_num // Will NOT process ANY files included into the file being inserted. // Moreover it will strip out any INCL chunks in that file... { DEBUG_MSG("DjVuDocEditor::insert_file(): fname='" << file_url << - "', parent_id='" << parent_id << "'\n"); + "', tqparent_id='" << tqparent_id << "'\n"); DEBUG_MAKE_INDENT(3); const GP dir(get_djvm_dir()); @@ -468,17 +468,17 @@ DjVuDocEditor::insert_file(const GURL &file_url, const GUTF8String &parent_id, // Strip any INCL chunks file_pool=strip_incl_chunks(file_pool); - // Check if parent ID is valid - GP parent_frec(dir->id_to_file(parent_id)); - if (!parent_frec) - parent_frec=dir->name_to_file(parent_id); - if (!parent_frec) - parent_frec=dir->title_to_file(parent_id); - if (!parent_frec) - G_THROW( ERR_MSG("DjVuDocEditor.no_file") "\t" +parent_id); - const GP parent_file(get_djvu_file(parent_id)); - if (!parent_file) - G_THROW( ERR_MSG("DjVuDocEditor.create_fail") "\t"+parent_id); + // Check if tqparent ID is valid + GP tqparent_frec(dir->id_to_file(tqparent_id)); + if (!tqparent_frec) + tqparent_frec=dir->name_to_file(tqparent_id); + if (!tqparent_frec) + tqparent_frec=dir->title_to_file(tqparent_id); + if (!tqparent_frec) + G_THROW( ERR_MSG("DjVuDocEditor.no_file") "\t" +tqparent_id); + const GP tqparent_file(get_djvu_file(tqparent_id)); + if (!tqparent_file) + G_THROW( ERR_MSG("DjVuDocEditor.create_fail") "\t"+tqparent_id); // Now obtain ID for the new file const GUTF8String id(find_unique_id(file_url.fname())); @@ -486,7 +486,7 @@ DjVuDocEditor::insert_file(const GURL &file_url, const GUTF8String &parent_id, // Add it into the directory const GP frec( DjVmDir::File::create(id, id, id, DjVmDir::File::INCLUDE)); - int pos=dir->get_file_pos(parent_frec); + int pos=dir->get_file_pos(tqparent_frec); if (pos>=0) ++pos; dir->insert_file(frec, pos); @@ -499,8 +499,8 @@ DjVuDocEditor::insert_file(const GURL &file_url, const GUTF8String &parent_id, files_map[id]=f; } - // And insert it into the parent DjVuFile - parent_file->insert_file(id, chunk_num); + // And insert it into the tqparent DjVuFile + tqparent_file->insert_file(id, chunk_num); return id; } @@ -538,7 +538,7 @@ DjVuDocEditor::insert_file(const GURL &file_url, bool is_page, // We do not want to insert the same file twice (important when // we insert a group of files at the same time using insert_group()) // So we check if we already did that and return if so. - if (name2id.contains(file_url.fname())) + if (name2id.tqcontains(file_url.fname())) return true; if(!source) @@ -606,7 +606,7 @@ DjVuDocEditor::insert_file(const GP &file_pool, // Check the name2id first... const GUTF8String name=file_url.fname(); GUTF8String id; - if (name2id.contains(name)) + if (name2id.tqcontains(name)) { id=name2id[name]; }else @@ -651,7 +651,7 @@ DjVuDocEditor::insert_file(const GP &file_pool, // Good. Before we continue with the included files we want to // complete insertion of this one. Notice, that insertion of - // children may fail, in which case we will have to modify + // tqchildren may fail, in which case we will have to modify // data for this file to get rid of invalid INCL // Create a file record with the chosen ID @@ -821,7 +821,7 @@ DjVuDocEditor::insert_group(const GList & file_urls, int page_num, } GUTF8String chkid; IFFByteStream::create(xdata_pool->get_stream())->get_chunk(chkid); - if (name2id.contains(furl.fname())||(chkid=="FORM:DJVM")) + if (name2id.tqcontains(furl.fname())||(chkid=="FORM:DJVM")) { GMap map; map_ids(map); @@ -930,13 +930,13 @@ DjVuDocEditor::generate_ref_map(const GP & file, GMap & ref_map, GMap & visit_map) // This private function is used to generate a list (implemented as map) - // of files referencing the given file. To get list of all parents + // of files referencing the given file. To get list of all tqparents // for file with ID 'id' iterate map obtained as // *((GMap *) ref_map[id]) { const GURL url=file->get_url(); const GUTF8String id(djvm_dir->name_to_file(url.fname())->get_load_name()); - if (!visit_map.contains(url)) + if (!visit_map.tqcontains(url)) { visit_map[url]=0; @@ -944,17 +944,17 @@ DjVuDocEditor::generate_ref_map(const GP & file, for(GPosition pos=files_list;pos;++pos) { GP child_file=files_list[pos]; - // First: add the current file to the list of parents for + // First: add the current file to the list of tqparents for // the child being processed GURL child_url=child_file->get_url(); const GUTF8String child_id( djvm_dir->name_to_file(child_url.fname())->get_load_name()); - GMap * parents=0; - if (ref_map.contains(child_id)) - parents=(GMap *) ref_map[child_id]; + GMap * tqparents=0; + if (ref_map.tqcontains(child_id)) + tqparents=(GMap *) ref_map[child_id]; else - ref_map[child_id]=parents=new GMap(); - (*parents)[id]=0; + ref_map[child_id]=tqparents=new GMap(); + (*tqparents)[id]=0; // Second: go recursively generate_ref_map(child_file, ref_map, visit_map); } @@ -966,35 +966,35 @@ DjVuDocEditor::remove_file(const GUTF8String &id, bool remove_unref, GMap & ref_map) // Private function, which will remove file with ID id. // - // If will also remove all INCL chunks in parent files pointing + // If will also remove all INCL chunks in tqparent files pointing // to this one // // Finally, if remove_unref is TRUE, we will go down the files // hierarchy removing every file, which becomes unreferenced. // - // ref_map will be used to find out list of parents referencing + // ref_map will be used to find out list of tqparents referencing // this file (required when removing INCL chunks) { - // First get rid of INCL chunks in parents - GMap * parents=(GMap *) ref_map[id]; - if (parents) + // First get rid of INCL chunks in tqparents + GMap * tqparents=(GMap *) ref_map[id]; + if (tqparents) { - for(GPosition pos=*parents;pos;++pos) + for(GPosition pos=*tqparents;pos;++pos) { - const GUTF8String parent_id((*parents).key(pos)); - const GP parent(get_djvu_file(parent_id)); - if (parent) - parent->unlink_file(id); + const GUTF8String tqparent_id((*tqparents).key(pos)); + const GP tqparent(get_djvu_file(tqparent_id)); + if (tqparent) + tqparent->unlink_file(id); } - delete parents; - parents=0; + delete tqparents; + tqparents=0; ref_map.del(id); } // We will accumulate errors here. GUTF8String errors; - // Now modify the ref_map and process children if necessary + // Now modify the ref_map and process tqchildren if necessary GP file=get_djvu_file(id); if (file) { @@ -1006,10 +1006,10 @@ DjVuDocEditor::remove_file(const GUTF8String &id, bool remove_unref, GURL child_url=child_file->get_url(); const GUTF8String child_id( djvm_dir->name_to_file(child_url.fname())->get_load_name()); - GMap * parents=(GMap *) ref_map[child_id]; - if (parents) parents->del(id); + GMap * tqparents=(GMap *) ref_map[child_id]; + if (tqparents) tqparents->del(id); - if (remove_unref && (!parents || !parents->size())) + if (remove_unref && (!tqparents || !tqparents->size())) remove_file(child_id, remove_unref, ref_map); } } G_CATCH(exc) { @@ -1023,7 +1023,7 @@ DjVuDocEditor::remove_file(const GUTF8String &id, bool remove_unref, // And get rid of its thumbnail, if any GCriticalSectionLock lock(&thumb_lock); - GPosition pos(thumb_map.contains(id)); + GPosition pos(thumb_map.tqcontains(id)); if (pos) { thumb_map.del(pos); @@ -1041,7 +1041,7 @@ DjVuDocEditor::remove_file(const GUTF8String &id, bool remove_unref) if (!djvm_dir->id_to_file(id)) G_THROW( ERR_MSG("DjVuDocEditor.no_file") "\t"+id); - // First generate a map of references (containing the list of parents + // First generate a map of references (containing the list of tqparents // including this particular file. This will speed things up // significatly. GMap ref_map; // GMap *> in fact @@ -1058,8 +1058,8 @@ DjVuDocEditor::remove_file(const GUTF8String &id, bool remove_unref) GPosition pos; while((pos=ref_map)) { - GMap * parents=(GMap *) ref_map[pos]; - delete parents; + GMap * tqparents=(GMap *) ref_map[pos]; + delete tqparents; ref_map.del(pos); } } @@ -1114,7 +1114,7 @@ DjVuDocEditor::move_file(const GUTF8String &id, int & file_pos, // NOTE! file_pos here is the desired position in DjVmDir *after* // the record with ID 'id' is removed. { - if (!map.contains(id)) + if (!map.tqcontains(id)) { map[id]=0; @@ -1291,7 +1291,7 @@ DjVuDocEditor::set_file_name(const GUTF8String &id, const GUTF8String &name) // Now find DjVuFile (if any) and rename it GPosition pos; - if (files_map.contains(id, pos)) + if (files_map.tqcontains(id, pos)) { GP file=files_map[pos]; GP pool=file->pool; @@ -1503,7 +1503,7 @@ DjVuDocEditor::get_thumbnail(int page_num, bool dont_decode) const GUTF8String id(page_to_id(page_num)); GCriticalSectionLock lock(&thumb_lock); - const GPosition pos(thumb_map.contains(id)); + const GPosition pos(thumb_map.tqcontains(id)); if (pos) { // Get the image from the map @@ -1524,7 +1524,7 @@ DjVuDocEditor::get_thumbnails_num(void) const int pages_num=get_pages_num(); for(int page_num=0;page_num gstr(thumb_map[pos]->get_stream()); @@ -1629,7 +1629,7 @@ DjVuDocEditor::file_thumbnails(void) for(;;) { GUTF8String id(page_to_id(page_num)); - const GPosition pos(thumb_map.contains(id)); + const GPosition pos(thumb_map.tqcontains(id)); if (! pos) { G_THROW( ERR_MSG("DjVuDocEditor.no_thumb") "\t"+GUTF8String(page_num)); @@ -1695,7 +1695,7 @@ DjVuDocEditor::generate_thumbnails(int thumb_size, int page_num) if(page_num<(djvm_dir->get_pages_num())) { const GUTF8String id(page_to_id(page_num)); - if (!thumb_map.contains(id)) + if (!thumb_map.tqcontains(id)) { const GP dimg(get_page(page_num, true)); @@ -1747,7 +1747,7 @@ store_file(const GP & src_djvm_dir, const GP & djvm_doc, GP & djvu_file, GMap & map) { GURL url=djvu_file->get_url(); - if (!map.contains(url)) + if (!map.tqcontains(url)) { map[url]=0; @@ -1821,12 +1821,12 @@ DjVuDocEditor::save_file( DEBUG_MSG("DjVuDocEditor::save_file(): ID='" << file_id << "'\n"); DEBUG_MAKE_INDENT(3); - if (!map.contains(file_id)) + if (!map.tqcontains(file_id)) { const GP file(djvm_dir->id_to_file(file_id)); GP file_pool; - const GPosition pos(files_map.contains(file_id)); + const GPosition pos(files_map.tqcontains(file_id)); if (pos) { const GP file_rec(files_map[pos]); @@ -1974,7 +1974,7 @@ DjVuDocEditor::save_as(const GURL &where, bool bundled) GURL file_url=page_to_url(0); const GUTF8String file_id(djvm_dir->page_to_file(0)->get_load_name()); GP file_pool; - GPosition pos=files_map.contains(file_id); + GPosition pos=files_map.tqcontains(file_id); if (pos) { const GP file_rec(files_map[pos]); diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.h b/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.h index 7bf6124a..96b18a06 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.h @@ -199,7 +199,7 @@ public: an exception is thrown. */ GUTF8String page_to_id(int page_num) const; - GUTF8String insert_file(const GURL &url, const GUTF8String &parent_id, + GUTF8String insert_file(const GURL &url, const GUTF8String &tqparent_id, int chunk_num=1, DjVuPort *source=0); /** Inserts the referenced file into this DjVu document. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp index 3b33d943..0ba922b3 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp @@ -1328,7 +1328,7 @@ DjVuDocument::get_thumbnail(int page_num, bool dont_decode) } } - // Apparently we're out of luck and need to decode the requested + // Aptqparently we're out of luck and need to decode the requested // page (unless it's already done and if it's allowed) and render // it into the thumbnail. If dont_decode is true, do not attempt // to create this file (because this will result in a request for data) @@ -1368,7 +1368,7 @@ add_to_cache(const GP & f, GMap & map, DEBUG_MSG("DjVuDocument::add_to_cache(): url='" << url << "'\n"); DEBUG_MAKE_INDENT(3); - if (!map.contains(url)) + if (!map.tqcontains(url)) { map[url]=0; cache->add_file(f); @@ -1391,12 +1391,12 @@ DjVuDocument::add_to_cache(const GP & f) void DjVuDocument::notify_file_flags_changed(const DjVuFile * source, - long set_mask, long clr_mask) + long set_tqmask, long clr_tqmask) { // Don't check here if the document is initialized or not. // This function may be called when it's not. // check(); - if (set_mask & DjVuFile::DECODE_OK) + if (set_tqmask & DjVuFile::DECODE_OK) { set_file_aliases(source); if (cache) add_to_cache((DjVuFile *) source); @@ -1414,7 +1414,7 @@ DjVuDocument::notify_file_flags_changed(const DjVuFile * source, process_threqs(); } - if (set_mask & DjVuFile::DATA_PRESENT) + if (set_tqmask & DjVuFile::DATA_PRESENT) process_threqs(); // May be we can extract thumbnails now } @@ -1530,7 +1530,7 @@ add_file_to_djvm(const GP & file, bool page, { GURL url=file->get_url(); - if (!map.contains(url)) + if (!map.tqcontains(url)) { map[url]=0; @@ -1586,7 +1586,7 @@ static void local_get_url_names(DjVuFile * f,const GMap & map,GMap &tmpmap) { GURL url=f->get_url(); - if (!map.contains(url) && !tmpmap.contains(url)) + if (!map.tqcontains(url) && !tmpmap.tqcontains(url)) { tmpmap[url]=0; f->process_incl_chunks(); diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDocument.h b/kviewshell/plugins/djvu/libdjvu/DjVuDocument.h index 418d0814..91ab849b 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuDocument.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuDocument.h @@ -800,7 +800,7 @@ public: virtual GP id_to_file(const DjVuPort * source, const GUTF8String &id); virtual GP request_data(const DjVuPort * source, const GURL & url); virtual void notify_file_flags_changed(const DjVuFile * source, - long set_mask, long clr_mask); + long set_tqmask, long clr_tqmask); virtual GList get_url_names(void); virtual void set_recover_errors(ErrorRecoveryAction=ABORT); diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDumpHelper.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuDumpHelper.cpp index 2d977be1..87a77c79 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuDumpHelper.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuDumpHelper.cpp @@ -293,7 +293,7 @@ display_chunks(ByteStream & out_str, IFFByteStream &iff, while ((size = iff.get_chunk(id, &rawoffset))) { - if (!counters.contains(id)) counters[id]=0; + if (!counters.tqcontains(id)) counters[id]=0; else counters[id]++; GUTF8String msg; diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.cpp index e7c74b84..c765fdd0 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.cpp @@ -102,7 +102,7 @@ DjVuErrorList::notify_error(const DjVuPort * source, const GUTF8String & msg) bool DjVuErrorList::notify_status(const DjVuPort * source, const GUTF8String &msg) { - Status.append(msg); + tqStatus.append(msg); return 1; } @@ -120,16 +120,16 @@ DjVuErrorList::GetError(void) } GUTF8String -DjVuErrorList::GetStatus(void) +DjVuErrorList::GettqStatus(void) { - GUTF8String PrevStatus; + GUTF8String PrevtqStatus; GPosition pos; - if((pos=Status)) + if((pos=tqStatus)) { - PrevStatus=Status[pos]; - Status.del(pos); + PrevtqStatus=tqStatus[pos]; + tqStatus.del(pos); } - return PrevStatus; + return PrevtqStatus; } GP diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.h b/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.h index 885e76aa..c42e96e2 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.h @@ -126,13 +126,13 @@ public: inline GList GetStatusList(void); /// Just clear the list. - inline void ClearStatus(void); + inline void CleartqStatus(void); /// Get one status message and clear that message from the list. - GUTF8String GetStatus(void); + GUTF8String GettqStatus(void); /// Check if there are any more status messages. - inline bool HasStatus(void) const; + inline bool HastqStatus(void) const; /** This gets the data. We can't use the simple port's request data since we want to allow the user to specify the ByteStream. */ @@ -143,7 +143,7 @@ private: GURL pool_url; GP pool; GList Errors; - GList Status; + GList tqStatus; private: //dummy stuff static GURL set_stream(ByteStream *); }; @@ -167,22 +167,22 @@ DjVuErrorList::ClearError(void) inline GList DjVuErrorList::GetStatusList(void) { - GList retval=(const GList)Status; - Status.empty(); + GList retval=(const GList)tqStatus; + tqStatus.empty(); return retval; } inline void -DjVuErrorList::ClearStatus(void) -{ Status.empty(); } +DjVuErrorList::CleartqStatus(void) +{ tqStatus.empty(); } inline bool DjVuErrorList::HasError(void) const { return !Errors.isempty(); } inline bool -DjVuErrorList::HasStatus(void) const -{ return !Status.isempty(); } +DjVuErrorList::HastqStatus(void) const +{ return !tqStatus.isempty(); } #ifdef HAVE_NAMESPACES diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp index 73e3a9c2..88dc90c0 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp @@ -398,10 +398,10 @@ DjVuFile::notify_chunk_done(const DjVuPort *, const GUTF8String &) void DjVuFile::notify_file_flags_changed(const DjVuFile * src, - long set_mask, long clr_mask) + long set_tqmask, long clr_tqmask) { check(); - if (set_mask & (DECODE_OK | DECODE_FAILED | DECODE_STOPPED)) + if (set_tqmask & (DECODE_OK | DECODE_FAILED | DECODE_STOPPED)) { // Signal threads waiting for file termination finish_mon.enter(); @@ -414,12 +414,12 @@ DjVuFile::notify_file_flags_changed(const DjVuFile * src, chunk_mon.leave(); } - if ((set_mask & ALL_DATA_PRESENT) && src!=this && + if ((set_tqmask & ALL_DATA_PRESENT) && src!=this && are_incl_files_created() && is_data_present()) { if (src!=this && are_incl_files_created() && is_data_present()) { - // Check if all children have data + // Check if all tqchildren have data bool all=true; { GCriticalSectionLock lock(&inc_files_lock); @@ -488,7 +488,7 @@ DjVuFile::decode_func(void) while(wait_for_finish(0)) continue; - DEBUG_MSG("waiting for children termination\n"); + DEBUG_MSG("waiting for tqchildren termination\n"); // Check for termination status GCriticalSectionLock lock(&inc_files_lock); for(GPosition pos=inc_files_list;pos;++pos) @@ -928,10 +928,10 @@ DjVuFile::decode_chunk( const GUTF8String &id, const GP &gbs, GP fgjd = JB2Dict::create(); fgjd->decode(gbs); this->fgjd = fgjd; - desc.format( ERR_MSG("DjVuFile.shape_dict") "\t%d", fgjd->get_shape_count() ); + desc.format( ERR_MSG("DjVuFile.tqshape_dict") "\t%d", fgjd->get_tqshape_count() ); } - // Sjbz (JB2 encoded mask) + // Sjbz (JB2 encoded tqmask) else if (chkid=="Sjbz" && (djvu || djvi)) { if (this->fgjb) @@ -943,19 +943,19 @@ DjVuFile::decode_chunk( const GUTF8String &id, const GP &gbs, // ---- end hack fgjb->decode(gbs, static_get_fgjd, (void*)this); this->fgjb = fgjb; - desc.format( ERR_MSG("DjVuFile.fg_mask") "\t%d\t%d\t%d", + desc.format( ERR_MSG("DjVuFile.fg_tqmask") "\t%d\t%d\t%d", fgjb->get_width(), fgjb->get_height(), get_dpi(fgjb->get_width(), fgjb->get_height())); } - // Smmr (MMR-G4 encoded mask) + // Smmr (MMR-G4 encoded tqmask) else if (chkid=="Smmr" && (djvu || djvi)) { if (this->fgjb) G_THROW( ERR_MSG("DjVuFile.dupl_Sxxx") ); set_can_compress(true); this->fgjb = MMRDecoder::decode(gbs); - desc.format( ERR_MSG("DjVuFile.G4_mask") "\t%d\t%d\t%d", + desc.format( ERR_MSG("DjVuFile.G4_tqmask") "\t%d\t%d\t%d", fgjb->get_width(), fgjb->get_height(), get_dpi(fgjb->get_width(), fgjb->get_height())); } @@ -1465,7 +1465,7 @@ DjVuFile::find_ndir(GMap & map) if (dir) return dir; - if (!map.contains(url)) + if (!map.tqcontains(url)) { map[url]=0; @@ -1496,7 +1496,7 @@ DjVuFile::decode_ndir(GMap & map) if (dir) return dir; - if (!map.contains(url)) + if (!map.tqcontains(url)) { map[url]=0; @@ -1570,7 +1570,7 @@ DjVuFile::get_merged_anno(const GP & file, { DEBUG_MSG("DjVuFile::get_merged_anno()\n"); GURL url=file->get_url(); - if (!map.contains(url)) + if (!map.tqcontains(url)) { ByteStream &str_out=*gstr_out; map[url]=0; @@ -1585,7 +1585,7 @@ DjVuFile::get_merged_anno(const GP & file, get_merged_anno(list[pos], gstr_out, ignore_list, level+1, max_level, map); // Now process the DjVuFile's own annotations - if (!ignore_list.contains(file->get_url())) + if (!ignore_list.tqcontains(file->get_url())) { if (!file->is_data_present() || file->is_modified() && file->anno) @@ -1966,7 +1966,7 @@ void DjVuFile::move(GMap & map, const GURL & dir_url) // This function may block for data. { - if (!map.contains(url)) + if (!map.tqcontains(url)) { map[url]=0; @@ -2095,7 +2095,7 @@ DjVuFile::contains_chunk(const GUTF8String &chunk_name) chunk_name << "'\n"); DEBUG_MAKE_INDENT(3); - bool contains=0; + bool tqcontains=0; const GP str(data_pool->get_stream()); GUTF8String chkid; const GP giff(IFFByteStream::create(str)); @@ -2112,10 +2112,10 @@ DjVuFile::contains_chunk(const GUTF8String &chunk_name) for(;(chunks_left--)&&(chksize=iff.get_chunk(chkid));last_chunk=chunks) { chunks++; - if (chkid==chunk_name) { contains=1; break; } + if (chkid==chunk_name) { tqcontains=1; break; } iff.seek_close_chunk(); } - if (!contains &&(chunks_number < 0)) chunks_number=last_chunk; + if (!tqcontains &&(chunks_number < 0)) chunks_number=last_chunk; } G_CATCH(ex) { @@ -2125,7 +2125,7 @@ DjVuFile::contains_chunk(const GUTF8String &chunk_name) } G_ENDCATCH; data_pool->clear_stream(); - return contains; + return tqcontains; } bool @@ -2225,7 +2225,7 @@ DjVuFile::add_djvu_data(IFFByteStream & ostr, GMap & map, const bool included_too, const bool no_ndir) { check(); - if (map.contains(url)) return; + if (map.tqcontains(url)) return; bool top_level = !map.size(); map[url]=0; bool processed_annotation = false; diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuFile.h b/kviewshell/plugins/djvu/libdjvu/DjVuFile.h index ea0e6db3..9d83f5ae 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuFile.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuFile.h @@ -134,7 +134,7 @@ class DjVuNavDir; {\bf Inclusion} is also a new feature specifically designed for a multipage document. Indeed, inside a given document there can be a lot of things shared between its pages. Examples can be the document - annotation (\Ref{DjVuAnno}) and other things like shared shapes and + annotation (\Ref{DjVuAnno}) and other things like shared tqshapes and dictionary (to be implemented). To avoid putting these chunks into every page, we have invented new chunk called #INCL# which purpose is to make the decoder open the specified file and decode it. @@ -215,9 +215,9 @@ public: GP bg44; /// Pointer to the background component of DjVu image (Raw). GP bgpm; - /// Pointer to the mask of foreground component of DjVu image (JB2 encoded). + /// Pointer to the tqmask of foreground component of DjVu image (JB2 encoded). GP fgjb; - /// Pointer to the optional shape dictionary for the mask (JB2 encoded). + /// Pointer to the optional tqshape dictionary for the tqmask (JB2 encoded). GP fgjd; /// Pointer to a colors layer for the foreground component of DjVu image. GP fgpm; @@ -442,7 +442,7 @@ public: {\bf Warning.} Included files are normally created during decoding. Before that they do not exist. If you call this function at that time and set #only_created# to #FALSE# then it will have to - read all the data from this file in order to find #INCL# chunks, + read all the data from this file in order to tqfind #INCL# chunks, which may block your application, if not all data is available. @param only_created If #TRUE#, the file will not try to process @@ -610,7 +610,7 @@ public: virtual bool inherits(const GUTF8String &class_name) const; virtual void notify_chunk_done(const DjVuPort * source, const GUTF8String &name); virtual void notify_file_flags_changed(const DjVuFile * source, - long set_mask, long clr_mask); + long set_tqmask, long clr_tqmask); virtual void set_recover_errors(const ErrorRecoveryAction=ABORT); virtual void set_verbose_eof(const bool verbose_eof=true); virtual void report_error(const GException &ex,const bool=true); @@ -648,7 +648,7 @@ private: const GP &str, bool djvi, bool djvu, bool iw44); int get_dpi(int w, int h); - // Functions dealing with the shape directory (fgjd) + // Functions dealing with the tqshape directory (fgjd) static GP static_get_fgjd(void *); GP get_fgjd(int block=0); diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.cpp index b31b04bf..85454b4c 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.cpp @@ -111,7 +111,7 @@ DjVuProgressTask::set_callback(djvu_progress_callback *_callback) { GMap > &map=get_map(); void *threadID=GThread::current(); - if(map.contains(threadID)) + if(map.tqcontains(threadID)) { DjVuProgressTask::Data &data=*(map[threadID]); retval=data.callback; @@ -127,7 +127,7 @@ DjVuProgressTask::set_callback(djvu_progress_callback *_callback) { GMap > &map=get_map(); void *threadID=GThread::current(); - if(map.contains(threadID)) + if(map.tqcontains(threadID)) { DjVuProgressTask::Data &data=*(map[threadID]); retval=data.callback; @@ -142,13 +142,13 @@ DjVuProgressTask::set_callback(djvu_progress_callback *_callback) } DjVuProgressTask::DjVuProgressTask(const char *xtask,int nsteps) - : task(xtask),parent(0), nsteps(nsteps), runtostep(0), gdata(0), data(0) + : task(xtask),tqparent(0), nsteps(nsteps), runtostep(0), gdata(0), data(0) { // gtask=task; { GMap > &map=get_map(); void *threadID=GThread::current(); - if(map.contains(threadID)) + if(map.tqcontains(threadID)) { gdata=new GP; Data &d=*(data=((*(GP *)gdata)=map[threadID])); @@ -158,7 +158,7 @@ DjVuProgressTask::DjVuProgressTask(const char *xtask,int nsteps) startdate = curdate; if (!d.head) d.lastsigdate = curdate + INITIAL; - parent = d.head; + tqparent = d.head; d.head = this; } } @@ -171,8 +171,8 @@ DjVuProgressTask::~DjVuProgressTask() { if (data->head != this) G_THROW( ERR_MSG("DjVuGlobal.not_compatible") ); - data->head = parent; - if (!parent) + data->head = tqparent; + if (!tqparent) { unsigned long curdate = GOS::ticks(); if((*(data->callback))(data->gtask?data->gtask:"",curdate-startdate, curdate-startdate)) @@ -210,9 +210,9 @@ DjVuProgressTask::signal(unsigned long curdate, unsigned long estdate) { const unsigned long enddate = startdate+ (unsigned long)(((float)(estdate-startdate) * (float)nsteps) / (float)inprogress); - if (parent) + if (tqparent) { - parent->signal(curdate, enddate); + tqparent->signal(curdate, enddate); } else if (data && data->callback && curdatenotify_relayout(this); - relayout_sent=true; + DjVuPort::get_portcaster()->notify_retqlayout(this); + retqlayout_sent=true; } else if (!name.cmp("Sxxx", 1) || !name.cmp("BGxx", 2) || @@ -461,7 +461,7 @@ public: GP request_data(const DjVuPort *src, const GURL & url); void notify_chunk_done(const DjVuPort *, const GUTF8String &name); void notify_redisplay(const class DjVuImage * source); - void notify_relayout(const class DjVuImage * source); + void notify_retqlayout(const class DjVuImage * source); }; DjVuImageNotifier::DjVuImageNotifier(DjVuInterface *notifier) @@ -485,10 +485,10 @@ DjVuImageNotifier::notify_redisplay(const class DjVuImage * source) } void -DjVuImageNotifier::notify_relayout(const class DjVuImage * source) +DjVuImageNotifier::notify_retqlayout(const class DjVuImage * source) { if (notifier) - notifier->notify_relayout(); + notifier->notify_retqlayout(); } void @@ -848,17 +848,17 @@ DjVuImage::stencil(GPixmap *pm, const GRect &rect, for (int blitno = 0; blitno < jimg->get_blit_count(); blitno++) { const JB2Blit *pblit = jimg->get_blit(blitno); - const JB2Shape &pshape = jimg->get_shape(pblit->shapeno); - if (pshape.bits && + const JB2Shape &ptqshape = jimg->get_tqshape(pblit->tqshapeno); + if (ptqshape.bits && pblit->left <= rect.xmax * subsample && pblit->bottom <= rect.ymax * subsample && - pblit->left + (int)pshape.bits->columns() >= rect.xmin * subsample && - pblit->bottom + (int)pshape.bits->rows() >= rect.ymin * subsample ) + pblit->left + (int)ptqshape.bits->columns() >= rect.xmin * subsample && + pblit->bottom + (int)ptqshape.bits->rows() >= rect.ymin * subsample ) { // Record component list if (fgbc) components.append(blitno); // Blit - bm->blit(pshape.bits, + bm->blit(ptqshape.bits, pblit->left - rxmin, pblit->bottom - rymin, subsample); } @@ -902,9 +902,9 @@ DjVuImage::stencil(GPixmap *pm, const GRect &rect, lastx = pblit->left; if (fg->colordata[blitno] == colorindex) { - const JB2Shape &pshape = jimg->get_shape(pblit->shapeno); + const JB2Shape &ptqshape = jimg->get_tqshape(pblit->tqshapeno); GRect rect(pblit->left, pblit->bottom, - pshape.bits->columns(), pshape.bits->rows()); + ptqshape.bits->columns(), ptqshape.bits->rows()); comprect.recthull(comprect, rect); compset.insert_before(nullpos, components, pos); continue; @@ -927,8 +927,8 @@ DjVuImage::stencil(GPixmap *pm, const GRect &rect, { int blitno = compset[pos]; const JB2Blit *pblit = jimg->get_blit(blitno); - const JB2Shape &pshape = jimg->get_shape(pblit->shapeno); - bm->blit(pshape.bits, + const JB2Shape &ptqshape = jimg->get_tqshape(pblit->tqshapeno); + bm->blit(ptqshape.bits, pblit->left - rxmin, pblit->bottom - rymin, subsample); } @@ -1085,8 +1085,8 @@ do_bitmap(const DjVuImage &dimg, BImager get, ///* rotate code ends // Sanity - if (! ( all.contains(rect.xmin, rect.ymin) && - all.contains(rect.xmax-1, rect.ymax-1) )) + if (! ( all.tqcontains(rect.xmin, rect.ymin) && + all.tqcontains(rect.xmax-1, rect.ymax-1) )) G_THROW( ERR_MSG("DjVuImage.bad_rect") ); // Check for integral reduction int red; @@ -1151,8 +1151,8 @@ do_pixmap(const DjVuImage &dimg, PImager get, ///* rotate code ends // Sanity - if (! ( all.contains(rect.xmin, rect.ymin) && - all.contains(rect.xmax-1, rect.ymax-1) )) + if (! ( all.tqcontains(rect.xmin, rect.ymin) && + all.tqcontains(rect.xmax-1, rect.ymax-1) )) G_THROW( ERR_MSG("DjVuImage.bad_rect2") ); // Check for integral reduction int red, w=0, h=0, rw=0, rh=0; diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuImage.h b/kviewshell/plugins/djvu/libdjvu/DjVuImage.h index 57b40938..7f2e836a 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuImage.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuImage.h @@ -123,7 +123,7 @@ class DjVuInterface public: virtual ~DjVuInterface(); virtual void notify_chunk(const char *chkid, const char *msg) = 0; - virtual void notify_relayout(void) = 0; + virtual void notify_retqlayout(void) = 0; virtual void notify_redisplay(void) = 0; }; @@ -185,13 +185,13 @@ public: function returns a null pointer until the decoder actually processes an #"BGjp"# chunk. */ GP get_bgpm() const; - /** Returns a pointer to the mask of the foreground component of a DjVu - image. The mask of the foreground component is always a JB2 image in + /** Returns a pointer to the tqmask of the foreground component of a DjVu + image. The tqmask of the foreground component is always a JB2 image in this implementation. This function returns a null pointer until the decoder actually processes an #"Sjbz"# chunk. */ GP get_fgjb() const; /** Returns a pointer to the colors of the foreground component of a DjVu - image. The mask of the foreground component is always a small pixmap in + image. The tqmask of the foreground component is always a small pixmap in this implementation. This function returns a null pointer until the decoder actually processes an #"FG44"# chunk. */ GP get_fgpm() const; @@ -284,7 +284,7 @@ public: \begin{verbatim} DJVU Image (2325x3156) version 17: 0.0 Kb 'INFO' Page information. - 17.3 Kb 'Sjbz' JB2 foreground mask (2325x3156) + 17.3 Kb 'Sjbz' JB2 foreground tqmask (2325x3156) 2.5 Kb 'BG44' IW44 background (775x1052) 1.0 Kb 'FG44' IW44 foreground colors (194x263) 3.0 Kb 'BG44' IW44 background (part 2). @@ -318,7 +318,7 @@ public: /** This function returns true if this object contains a well formed {\em Bilevel DjVu Image}. Calling function #get_bitmap# on a well formed bilevel image should always return a non zero value. Note that function - #get_bitmap# works as soon as a foreground mask component is present, + #get_bitmap# works as soon as a foreground tqmask component is present, regardless of the fact that the image follows the rules or not. */ int is_legal_bilevel() const; /** This function returns true if this object contains a well formed {\em @@ -351,9 +351,9 @@ public: This function returns a null pointer if there is not enough information in the DjVu image to properly render the desired image. */ GP get_pixmap(const GRect &rect, const GRect &all, double gamma=0) const; - /** Renders the mask of the foreground layer of the DjVu image. This + /** Renders the tqmask of the foreground layer of the DjVu image. This functions is a wrapper for \Ref{JB2Image::get_bitmap}. Argument #align# - specified the alignment of the rows of the returned images. Setting + specified the tqalignment of the rows of the returned images. Setting #align# to #4#, for instance, will adjust the bitmap border in order to make sure that each row of the returned image starts on a word (four byte) boundary. This function returns a null pointer if there is not @@ -414,7 +414,7 @@ public: private: GP file; int rotate_count; - bool relayout_sent; + bool retqlayout_sent; // HELPERS int stencil(GPixmap *pm, const GRect &rect, int subs, double gcorr) const; diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuMessage.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuMessage.cpp index e92b7570..f20c1106 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuMessage.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuMessage.cpp @@ -240,7 +240,7 @@ GetModulePath( void ) { retval=GURL::UTF8(xprogramname,paths[pos]); const GUTF8String path(retval.get_string()); - if(!pathMAP.contains(path)) + if(!pathMAP.tqcontains(path)) { if(retval.is_file()) break; @@ -263,7 +263,7 @@ appendPath(const GURL &url, GList &list) { if( !url.is_empty() - && !map.contains(url.get_string()) && url.is_dir() ) + && !map.tqcontains(url.get_string()) && url.is_dir() ) { map[url.get_string()]=0; list.append(url); @@ -375,14 +375,14 @@ DjVuMessage::GetProfilePaths(void) for(pos=localemaps;pos;++pos) { const GMap > &localemap=localemaps[pos]; - GPosition pos=localemap.contains(sublocale); + GPosition pos=localemap.tqcontains(sublocale); if(!pos) - pos=localemap.contains(downcasesublocale); + pos=localemap.tqcontains(downcasesublocale); if(pos) { const GMap&args = localemap[pos]->get_args(); - pos = args.contains(srcstring); + pos = args.tqcontains(srcstring); if (pos) { const GUTF8String src(args[pos]); @@ -496,7 +496,7 @@ getbodies( for(GPosition pos=includes;pos;++pos) { const GUTF8String file=includes.key(pos); - if(! map.contains(file)) + if(! map.tqcontains(file)) { GList xpaths; xpaths.append(url.base()); diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuMessageLite.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuMessageLite.cpp index 258b0649..70b2b541 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuMessageLite.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuMessageLite.cpp @@ -238,7 +238,7 @@ DjVuMessageLite::LookUpSingle( const GUTF8String &Single_Message ) const return Single_Message; #endif // Isolate the message ID and get the corresponding message text - int ending_posn = Single_Message.contains("\t\v"); + int ending_posn = Single_Message.tqcontains("\t\v"); if( ending_posn < 0 ) ending_posn = Single_Message.length(); GUTF8String msg_text; @@ -276,7 +276,7 @@ DjVuMessageLite::LookUpSingle( const GUTF8String &Single_Message ) const arg=LookUpSingle(Single_Message.substr(start_posn,ending_posn)); }else { - ending_posn = Single_Message.contains("\v\t",start_posn); + ending_posn = Single_Message.tqcontains("\v\t",start_posn); if( ending_posn < 0 ) ending_posn = Single_Message.length(); arg=Single_Message.substr(start_posn, ending_posn-start_posn); @@ -308,11 +308,11 @@ DjVuMessageLite::LookUpID( const GUTF8String &xmsgID, if (start > 0) msgID = msgID.substr(start, msgID.length() - start); #endif - GPosition pos=Map.contains(msgID); + GPosition pos=Map.tqcontains(msgID); if(pos) { const GP tag=Map[pos]; - GPosition valuepos=tag->get_args().contains(valuestring); + GPosition valuepos=tag->get_args().tqcontains(valuestring); if(valuepos) { message_text=tag->get_args()[valuepos]; @@ -331,7 +331,7 @@ DjVuMessageLite::LookUpID( const GUTF8String &xmsgID, message_text=raw.substr(start_line+1,end_text-start_line-1).fromEscaped(); } } - GPosition numberpos=tag->get_args().contains(numberstring); + GPosition numberpos=tag->get_args().tqcontains(numberstring); if(numberpos) { message_number=tag->get_args()[numberpos]; diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuNavDir.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuNavDir.cpp index 615041b0..49a2d31e 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuNavDir.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuNavDir.cpp @@ -112,7 +112,7 @@ DjVuNavDir::decode(ByteStream & str) *ptr=0; if (!strlen(buffer)) continue; - if (!tmp_page2name.contains(buffer)) + if (!tmp_page2name.tqcontains(buffer)) tmp_page2name.append(buffer); }; @@ -161,7 +161,7 @@ DjVuNavDir::name_to_page(const char * name) const { GCriticalSectionLock lk((GCriticalSection *)&lock); - if (!name2page.contains(name)) return -1; + if (!name2page.tqcontains(name)) return -1; return name2page[name]; } @@ -170,7 +170,7 @@ DjVuNavDir::url_to_page(const GURL & url) const { GCriticalSectionLock lk((GCriticalSection *)&lock); - if (!url2page.contains(url)) return -1; + if (!url2page.tqcontains(url)) return -1; return url2page[url]; } diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuPalette.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuPalette.cpp index 4e49fe12..a3f11bd0 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuPalette.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuPalette.cpp @@ -107,7 +107,7 @@ fmin(float a, float b) DjVuPalette::DjVuPalette() - : mask(0), hist(0), pmap(0) + : tqmask(0), hist(0), pmap(0) { } @@ -124,7 +124,7 @@ DjVuPalette::operator=(const DjVuPalette &ref) { delete hist; delete pmap; - mask = 0; + tqmask = 0; palette = ref.palette; colordata = ref.colordata; } @@ -132,7 +132,7 @@ DjVuPalette::operator=(const DjVuPalette &ref) } DjVuPalette::DjVuPalette(const DjVuPalette &ref) - : mask(0), hist(0), pmap(0) + : tqmask(0), hist(0), pmap(0) { this->operator=(ref); } @@ -147,18 +147,18 @@ DjVuPalette::allocate_hist() if (! hist) { hist = new GMap; - mask = 0; + tqmask = 0; } else { GMap *old = hist; hist = new GMap; - mask = (mask<<1)|(0x010101); + tqmask = (tqmask<<1)|(0x010101); for (GPosition p = *old; p; ++p) { int k = old->key(p); int w = (*old)[p]; - (*hist)[k | mask] += w; + (*hist)[k | tqmask] += w; } delete old; } @@ -540,7 +540,7 @@ DjVuPalette::decode(GP gbs) delete pmap; hist = 0; pmap = 0; - mask = 0; + tqmask = 0; // Code version int version = bs.read8(); if ( (version & 0x7f) != DJVUPALETTEVERSION) diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuPalette.h b/kviewshell/plugins/djvu/libdjvu/DjVuPalette.h index 7f9884f1..e44aab6d 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuPalette.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuPalette.h @@ -104,7 +104,7 @@ namespace DJVU { \Ref{index_to_color}. There are also functions for computing a palette and quantizing a complete pixmap. - {\bf Sequences of color indices} -- The DjVuPalette object also contains + {\bf Sequences of color indices} -- The DjVuPalette object also tqcontains an array \Ref{colordata} optionally containing a sequence of color indices. This array will be encoded and decoded by functions \Ref{encode} and \Ref{decode}. This feature simplifies the implementation of the ``one @@ -210,7 +210,7 @@ public: private: // Histogram - int mask; + int tqmask; GMap *hist; // Quantization data struct PColor { unsigned char p[4]; }; @@ -240,7 +240,7 @@ DjVuPalette::histogram_clear() { delete hist; hist = 0; - mask = 0; + tqmask = 0; } inline void @@ -250,7 +250,7 @@ DjVuPalette::histogram_add(const unsigned char *bgr, int weight) { if (!hist || hist->size()>=0x4000) allocate_hist(); - int key = (bgr[0]<<16)|(bgr[1]<<8)|(bgr[2])|(mask); + int key = (bgr[0]<<16)|(bgr[1]<<8)|(bgr[2])|(tqmask); (*hist)[key] += weight; } } @@ -271,7 +271,7 @@ DjVuPalette::histogram_norm_and_add(const int *bgr, int weight) int p2 = bgr[2]/weight; if (p2>255) p2=255; if (!hist || hist->size()>=0x4000) allocate_hist(); - int key = (p0<<16)|(p1<<8)|(p2)|(mask); + int key = (p0<<16)|(p1<<8)|(p2)|(tqmask); (*hist)[key] += weight; } } @@ -288,7 +288,7 @@ DjVuPalette::color_to_index(const unsigned char *bgr) if (! pmap) allocate_pmap(); int key = (bgr[0]<<16)|(bgr[1]<<8)|(bgr[2]); - GPosition p = pmap->contains(key); + GPosition p = pmap->tqcontains(key); if ( p) return (*pmap)[p]; return color_to_index_slow(bgr); diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp index 5e8a25c9..02890407 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp @@ -208,7 +208,7 @@ DjVuPort::DjVuPort() { DjVuPortcaster *pcaster = get_portcaster(); GCriticalSectionLock lock(& pcaster->map_lock ); - GPosition p = pcaster->cont_map.contains(this); + GPosition p = pcaster->cont_map.tqcontains(this); if (!p) G_THROW( ERR_MSG("DjVuPort.not_alloc") ); pcaster->cont_map[p] = (void*)this; } @@ -217,7 +217,7 @@ DjVuPort::DjVuPort(const DjVuPort & port) { DjVuPortcaster *pcaster = get_portcaster(); GCriticalSectionLock lock(& pcaster->map_lock ); - GPosition p = pcaster->cont_map.contains(this); + GPosition p = pcaster->cont_map.tqcontains(this); if (!p) G_THROW( ERR_MSG("DjVuPort.not_alloc") ); pcaster->cont_map[p] = (void*)this; pcaster->copy_routes(this, &port); @@ -259,7 +259,7 @@ DjVuPortcaster::is_port_alive(DjVuPort *port) { GP gp_port; GCriticalSectionLock lock(&map_lock); - GPosition pos=cont_map.contains(port); + GPosition pos=cont_map.tqcontains(port); if (pos && cont_map[pos] && ((DjVuPort *) port)->get_count()>0) gp_port=port; return gp_port; @@ -302,7 +302,7 @@ DjVuPortcaster::alias_to_port(const GUTF8String &alias) { GCriticalSectionLock lock(&map_lock); GPosition pos; - if (a2p_map.contains(alias, pos)) + if (a2p_map.tqcontains(alias, pos)) { DjVuPort * port=(DjVuPort *) a2p_map[pos]; GP gp_port=is_port_alive(port); @@ -344,10 +344,10 @@ DjVuPortcaster::del_port(const DjVuPort * port) clear_aliases(port); // Update "contents map" - if (cont_map.contains(port, pos)) cont_map.del(pos); + if (cont_map.tqcontains(port, pos)) cont_map.del(pos); // Update "route map" - if (route_map.contains(port, pos)) + if (route_map.tqcontains(port, pos)) { delete (GList *) route_map[pos]; route_map.del(pos); @@ -372,12 +372,12 @@ DjVuPortcaster::add_route(const DjVuPort * src, DjVuPort * dst) // Adds route src->dst { GCriticalSectionLock lock(&map_lock); - if (cont_map.contains(src) && src->get_count()>0 && - cont_map.contains(dst) && dst->get_count()>0) + if (cont_map.tqcontains(src) && src->get_count()>0 && + cont_map.tqcontains(dst) && dst->get_count()>0) { - if (!route_map.contains(src)) route_map[src]=new GList(); + if (!route_map.tqcontains(src)) route_map[src]=new GList(); GList & list=*(GList *) route_map[src]; - if (!list.contains(dst)) list.append(dst); + if (!list.tqcontains(dst)) list.append(dst); } } @@ -387,7 +387,7 @@ DjVuPortcaster::del_route(const DjVuPort * src, DjVuPort * dst) { GCriticalSectionLock lock(&map_lock); - if (route_map.contains(src)) + if (route_map.tqcontains(src)) { GList & list=*(GList *) route_map[src]; GPosition pos; @@ -408,8 +408,8 @@ DjVuPortcaster::copy_routes(DjVuPort * dst, const DjVuPort * src) { GCriticalSectionLock lock(&map_lock); - if (!cont_map.contains(src) || src->get_count()<=0 || - !cont_map.contains(dst) || dst->get_count()<=0) return; + if (!cont_map.tqcontains(src) || src->get_count()<=0 || + !cont_map.tqcontains(dst) || dst->get_count()<=0) return; for(GPosition pos=route_map;pos;++pos) { @@ -430,13 +430,13 @@ DjVuPortcaster::add_to_closure(GMap & set, // Assuming that the map's already locked // GCriticalSectionLock lock(&map_lock); set[dst]= (void*) (unsigned long) distance; - if (route_map.contains(dst)) + if (route_map.tqcontains(dst)) { GList & list=*(GList *) route_map[dst]; for(GPosition pos=list;pos;++pos) { DjVuPort * new_dst=(DjVuPort *) list[pos]; - if (!set.contains(new_dst)) + if (!set.tqcontains(new_dst)) add_to_closure(set, new_dst, distance+1); } } @@ -447,7 +447,7 @@ DjVuPortcaster::compute_closure(const DjVuPort * src, GPList &list, bo { GCriticalSectionLock lock(&map_lock); GMap set; - if (route_map.contains(src)) + if (route_map.tqcontains(src)) { GList & list=*(GList *) route_map[src]; for(GPosition pos=list;pos;++pos) @@ -557,12 +557,12 @@ DjVuPortcaster::notify_redisplay(const DjVuImage * source) } void -DjVuPortcaster::notify_relayout(const DjVuImage * source) +DjVuPortcaster::notify_retqlayout(const DjVuImage * source) { GPList list; compute_closure(source, list); for(GPosition pos=list; pos; ++pos) - list[pos]->notify_relayout(source); + list[pos]->notify_retqlayout(source); } void @@ -576,22 +576,22 @@ DjVuPortcaster::notify_chunk_done(const DjVuPort * source, const GUTF8String &na void DjVuPortcaster::notify_file_flags_changed(const DjVuFile * source, - long set_mask, long clr_mask) + long set_tqmask, long clr_tqmask) { GPList list; compute_closure(source, list); for(GPosition pos=list; pos; ++pos) - list[pos]->notify_file_flags_changed(source, set_mask, clr_mask); + list[pos]->notify_file_flags_changed(source, set_tqmask, clr_tqmask); } void DjVuPortcaster::notify_doc_flags_changed(const DjVuDocument * source, - long set_mask, long clr_mask) + long set_tqmask, long clr_tqmask) { GPList list; compute_closure(source, list); for(GPosition pos=list; pos; ++pos) - list[pos]->notify_doc_flags_changed(source, set_mask, clr_mask); + list[pos]->notify_doc_flags_changed(source, set_tqmask, clr_tqmask); } void @@ -626,7 +626,7 @@ void DjVuPort::notify_redisplay(const DjVuImage *) {} void -DjVuPort::notify_relayout(const DjVuImage *) {} +DjVuPort::notify_retqlayout(const DjVuImage *) {} void DjVuPort::notify_chunk_done(const DjVuPort *, const GUTF8String &) {} @@ -688,7 +688,7 @@ DjVuMemoryPort::request_data(const DjVuPort * source, const GURL & url) GCriticalSectionLock lk(&lock); GP pool; GPosition pos; - if (map.contains(url, pos)) + if (map.tqcontains(url, pos)) pool=map[pos]; return pool; } diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuPort.h b/kviewshell/plugins/djvu/libdjvu/DjVuPort.h index 99c165fb..430b7842 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuPort.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuPort.h @@ -213,10 +213,10 @@ public: @param source The sender of the request */ virtual void notify_redisplay(const class DjVuImage * source); - /** This notification is sent by \ref{DjVuImage} when its geometry + /** This notification is sent by \ref{DjVuImage} when its tqgeometry has been changed as a result of decoding. It may be used to implement progressive redisplay. */ - virtual void notify_relayout(const class DjVuImage * source); + virtual void notify_retqlayout(const class DjVuImage * source); /** This notification is sent when a new chunk has been decoded. */ virtual void notify_chunk_done(const DjVuPort * source, const GUTF8String &name); @@ -230,20 +230,20 @@ public: \end{itemize} @param source \Ref{DjVuFile}, which flags have been changed - @param set_mask bits, which have been set - @param clr_mask bits, which have been cleared */ + @param set_tqmask bits, which have been set + @param clr_tqmask bits, which have been cleared */ virtual void notify_file_flags_changed(const class DjVuFile * source, - long set_mask, long clr_mask); + long set_tqmask, long clr_tqmask); /** This notification is sent after the \Ref{DjVuDocument} flags have been changed. This happens, for example, after it receives enough data and can determine its structure (#BUNDLED#, #OLD_INDEXED#, etc.). @param source \Ref{DjVuDocument}, which flags have been changed - @param set_mask bits, which have been set - @param clr_mask bits, which have been cleared */ + @param set_tqmask bits, which have been set + @param clr_tqmask bits, which have been cleared */ virtual void notify_doc_flags_changed(const class DjVuDocument * source, - long set_mask, long clr_mask); + long set_tqmask, long clr_tqmask); /** This notification is sent from time to time while decoding is in progress. The purpose is obvious: to provide a way to know how much @@ -448,7 +448,7 @@ public: /** Computes destination list for #source# and calls the corresponding function in each of the ports from the destination list starting from the closest. */ - virtual void notify_relayout(const class DjVuImage * source); + virtual void notify_retqlayout(const class DjVuImage * source); /** Computes destination list for #source# and calls the corresponding function in each of the ports from the destination list starting from @@ -459,13 +459,13 @@ public: function in each of the ports from the destination list starting from the closest. */ virtual void notify_file_flags_changed(const class DjVuFile * source, - long set_mask, long clr_mask); + long set_tqmask, long clr_tqmask); /** Computes destination list for #source# and calls the corresponding function in each of the ports from the destination list starting from the closest. */ virtual void notify_doc_flags_changed(const class DjVuDocument * source, - long set_mask, long clr_mask); + long set_tqmask, long clr_tqmask); /** Computes destination list for #source# and calls the corresponding function in each of the ports from the destination list starting from diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp index b359df41..cac6869b 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp @@ -88,7 +88,7 @@ static inline TYPE min(TYPE a,TYPE b) { return (a &gbs, const Zone * parent, const Zone * prev) const + const GP &gbs, const Zone * tqparent, const Zone * prev) const { ByteStream &bs=*gbs; // Encode type bs.write8(ztype); // Modify text_start and bounding rectangle based on the context - // (whether there is a previous non-zero same-level-child or parent) + // (whether there is a previous non-zero same-level-child or tqparent) int start=text_start; int x=rect.xmin, y=rect.ymin; int width=rect.width(), height=rect.height(); @@ -212,13 +212,13 @@ DjVuTXT::Zone::encode( y=y-prev->rect.ymin; } start-=prev->text_start+prev->text_length; - } else if (parent) + } else if (tqparent) { - // Encode offset from the upper left corner of the parent + // Encode offset from the upper left corner of the tqparent // in the coord system in that corner with x to the right and y down - x=x-parent->rect.xmin; - y=parent->rect.ymax-(y+height); - start-=parent->text_start; + x=x-tqparent->rect.xmin; + y=tqparent->rect.ymax-(y+height); + start-=tqparent->text_start; } // Encode rectangle bs.write16(0x8000+x); @@ -228,22 +228,22 @@ DjVuTXT::Zone::encode( // Encode text info bs.write16(0x8000+start); bs.write24(text_length); - // Encode number of children - bs.write24(children.size()); + // Encode number of tqchildren + bs.write24(tqchildren.size()); const Zone * prev_child=0; - // Encode all children - for (GPosition i=children; i; ++i) + // Encode all tqchildren + for (GPosition i=tqchildren; i; ++i) { - children[i].encode(gbs, this, prev_child); - prev_child=&children[i]; + tqchildren[i].encode(gbs, this, prev_child); + prev_child=&tqchildren[i]; } } #endif void DjVuTXT::Zone::decode(const GP &gbs, int maxtext, - const Zone * parent, const Zone * prev) + const Zone * tqparent, const Zone * prev) { ByteStream &bs=*gbs; // Decode type @@ -273,23 +273,23 @@ DjVuTXT::Zone::decode(const GP &gbs, int maxtext, y=y+prev->rect.ymin; } text_start+=prev->text_start+prev->text_length; - } else if (parent) + } else if (tqparent) { - x=x+parent->rect.xmin; - y=parent->rect.ymax-(y+height); - text_start+=parent->text_start; + x=x+tqparent->rect.xmin; + y=tqparent->rect.ymax-(y+height); + text_start+=tqparent->text_start; } rect=GRect(x, y, width, height); - // Get children size + // Get tqchildren size int size = bs.read24(); // Checks if (rect.isempty() || text_start<0 || text_start+text_length>maxtext ) G_THROW( ERR_MSG("DjVuText.corrupt_text") ); - // Process children + // Process tqchildren const Zone * prev_child=0; - children.empty(); + tqchildren.empty(); while (size-- > 0) { Zone *z = append_child(); @@ -311,7 +311,7 @@ DjVuTXT::has_valid_zones() const { if (!textUTF8) return false; - if (page_zone.children.isempty() || page_zone.rect.isempty()) + if (page_zone.tqchildren.isempty() || page_zone.rect.isempty()) return false; return true; } @@ -382,8 +382,8 @@ void DjVuTXT::Zone::get_text_with_rect(const GRect &box, int &string_start, int &string_end) const { - GPosition pos=children; - if(pos?box.contains(rect):intersects_zone(box,rect)) + GPosition pos=tqchildren; + if(pos?box.tqcontains(rect):intersects_zone(box,rect)) { const int text_end=text_start+text_length; if(string_start == string_end) @@ -401,7 +401,7 @@ DjVuTXT::Zone::get_text_with_rect(const GRect &box, { do { - children[pos].get_text_with_rect(box,string_start,string_end); + tqchildren[pos].get_text_with_rect(box,string_start,string_end); } while(++pos); } } @@ -419,18 +419,18 @@ DjVuTXT::Zone::find_zones(GList &list, } else if(text_start < string_end) { - if (children.size()) - for (GPosition pos=children; pos; ++pos) - children[pos].find_zones(list,string_start,string_end); + if (tqchildren.size()) + for (GPosition pos=tqchildren; pos; ++pos) + tqchildren[pos].find_zones(list,string_start,string_end); else list.append(const_cast(this)); } } else if( text_end > string_start) { - if (children.size()) - for (GPosition pos=children; pos; ++pos) - children[pos].find_zones(list,string_start,string_end); + if (tqchildren.size()) + for (GPosition pos=tqchildren; pos; ++pos) + tqchildren[pos].find_zones(list,string_start,string_end); else list.append(const_cast(this)); } @@ -439,11 +439,11 @@ DjVuTXT::Zone::find_zones(GList &list, void DjVuTXT::Zone::get_smallest(GList &list) const { - GPosition pos=children; + GPosition pos=tqchildren; if(pos) { do { - children[pos].get_smallest(list); + tqchildren[pos].get_smallest(list); } while (++pos); } else @@ -455,11 +455,11 @@ DjVuTXT::Zone::get_smallest(GList &list) const void DjVuTXT::Zone::get_smallest(GList &list, const int padding) const { - GPosition pos=children; + GPosition pos=tqchildren; if(pos) { do { - children[pos].get_smallest(list,padding); + tqchildren[pos].get_smallest(list,padding); } while (++pos); } else if(zone_parent && zone_parent->ztype >= PARAGRAPH) @@ -484,26 +484,26 @@ DjVuTXT::Zone::get_smallest(GList &list, const int padding) const } void -DjVuTXT::get_zones(int zone_type, const Zone *parent, +DjVuTXT::get_zones(int zone_type, const Zone *tqparent, GList & zone_list) const - // get all the zones of type zone_type under zone node parent + // get all the zones of type zone_type under zone node tqparent { - // search all branches under parent - const Zone *zone=parent; + // search all branches under tqparent + const Zone *zone=tqparent; for( int cur_ztype=zone->ztype; cur_ztypechildren; pos; ++pos) + for(pos=zone->tqchildren; pos; ++pos) { - Zone *zcur=(Zone *)&zone->children[pos]; + Zone *zcur=(Zone *)&zone->tqchildren[pos]; if ( zcur->ztype == zone_type ) { GPosition zpos=zone_list; if ( !zone_list.search(zcur,zpos) ) zone_list.append(zcur); } - else if ( zone->children[pos].ztype < zone_type ) - get_zones(zone_type, &zone->children[pos], zone_list); + else if ( zone->tqchildren[pos].ztype < zone_type ) + get_zones(zone_type, &zone->tqchildren[pos], zone_list); } } } @@ -617,7 +617,7 @@ DjVuTXT::find_text_in_rect(GRect target_rect, GUTF8String &text) const { GRect rect=words[p]->rect; if(rect.intersect(rect,target_rect)) - //if (target_rect.contains(words[p]->rect)) + //if (target_rect.tqcontains(words[p]->rect)) zone_list.append(words[p]); } } else @@ -631,7 +631,7 @@ DjVuTXT::find_text_in_rect(GRect target_rect, GUTF8String &text) const { GRect rect=words[p]->rect; if(rect.intersect(rect,target_rect)) - //if (target_rect.contains(words[p]->rect)) + //if (target_rect.tqcontains(words[p]->rect)) { start=false; zone_list.append(words[p]); @@ -648,7 +648,7 @@ DjVuTXT::find_text_in_rect(GRect target_rect, GUTF8String &text) const { GRect rect=words[p]->rect; if(rect.intersect(rect,target_rect)) - //if(target_rect.contains(words[p]->rect) ) + //if(target_rect.tqcontains(words[p]->rect) ) { end=false; zone_list.append(words[p]); @@ -864,7 +864,7 @@ static void writeText( ByteStream & str_out, const GUTF8String &textUTF8, const DjVuTXT::ZoneType zlayer, - const GList &children, + const GList &tqchildren, const int WindowHeight ) { // assert( txt->has_valid_zones() ); @@ -873,12 +873,12 @@ writeText( ByteStream & str_out, // Beginning tags for missing layers int layer=(int)zlayer; // Output the next layer - for(GPosition pos=children ; pos ; ++pos ) + for(GPosition pos=tqchildren ; pos ; ++pos ) { - str_out.writestring(tolayer(layer,children[pos].ztype)); + str_out.writestring(tolayer(layer,tqchildren[pos].ztype)); writeText( str_out, textUTF8, - children[pos], + tqchildren[pos], WindowHeight ); } str_out.writestring(tolayer(layer,zlayer)); @@ -893,7 +893,7 @@ writeText( ByteStream & str_out, // DEBUG_MSG( "--zonetype=" << zone.ztype << "\n" ); const GUTF8String xindent(indent( 2 * zone.ztype + 2 )); - GPosition pos=zone.children; + GPosition pos=zone.tqchildren; // Build attribute string if( ! pos ) { @@ -908,7 +908,7 @@ writeText( ByteStream & str_out, str_out.writestring(end_tag(zone.ztype)); } else { - writeText(str_out,textUTF8,zone.ztype,zone.children,WindowHeight); + writeText(str_out,textUTF8,zone.ztype,zone.tqchildren,WindowHeight); } } @@ -917,7 +917,7 @@ DjVuTXT::writeText(ByteStream &str_out,const int height) const { if(has_valid_zones()) { - ::writeText(str_out,textUTF8,DjVuTXT::PAGE,page_zone.children,height); + ::writeText(str_out,textUTF8,DjVuTXT::PAGE,page_zone.tqchildren,height); }else { str_out.writestring(start_tag(DjVuTXT::PAGE)); diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuText.h b/kviewshell/plugins/djvu/libdjvu/DjVuText.h index 61ee3667..1db6da10 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuText.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuText.h @@ -133,8 +133,8 @@ public: int text_start; /** Length of the zone text in string #textUTF8#. */ int text_length; - /** List of children zone. */ - GList children; + /** List of tqchildren zone. */ + GList tqchildren; /** Appends another subzone inside this zone. The new zone is initialized with an empty rectangle, empty text, and has the same type as this zone. */ @@ -148,10 +148,10 @@ public: /** Finds the smallest rectangles and appends them to the list. */ void get_smallest(GList &list) const; /** Finds the smallest rectangles and appends them to the list after - padding the smallest unit to fit width or height for the parent rectangle + padding the smallest unit to fit width or height for the tqparent rectangle and adding the number of specified pixels. */ void get_smallest(GList &list,const int padding) const; - /// Find out this Zone's parent. + /// Find out this Zone's tqparent. const Zone *get_parent(void) const; private: friend class DjVuTXT; @@ -161,9 +161,9 @@ public: unsigned int memuse() const; static const int version; void encode(const GP &bs, - const Zone * parent=0, const Zone * prev=0) const; + const Zone * tqparent=0, const Zone * prev=0) const; void decode(const GP &bs, int maxtext, - const Zone * parent=0, const Zone * prev=0); + const Zone * tqparent=0, const Zone * prev=0); }; /** Textual data for this page. The content of this string is encoded using the UTF8 code. @@ -172,13 +172,13 @@ public: control character: \begin{tabular}{lll} {\bf Name} & {\bf Octal} & {\bf Ascii name} \\\hline\\ - {\tt DjVuText::end_of_column} & 013 & VT, Vertical Tab \\ + {\tt DjVuText::end_of_column} & 013 & VT,Qt::Vertical Tab \\ {\tt DjVuText::end_of_region} & 035 & GS, Group Separator \\ {\tt DjVuText::end_of_paragraph} & 037 & US, Unit Separator \\ {\tt DjVuText::end_of_line} & 012 & LF: Line Feed \end{tabular} */ GUTF8String textUTF8; - static const char end_of_column ; // VT: Vertical Tab + static const char end_of_column ; // VT:Qt::Vertical Tab static const char end_of_region ; // GS: Group Separator static const char end_of_paragraph ; // US: Unit Separator static const char end_of_line ; // LF: Line Feed @@ -207,9 +207,9 @@ public: GList find_text_in_rect(GRect target_rect, GUTF8String &text) const; /** Find the text specified by the rectangle. */ GList find_text_with_rect(const GRect &box, GUTF8String &text, const int padding=0) const; - /** Get all zones of zone type zone_type under node parent. + /** Get all zones of zone type zone_type under node tqparent. zone_list contains the return value. */ - void get_zones(int zone_type, const Zone *parent, GList & zone_list) const; + void get_zones(int zone_type, const Zone *tqparent, GList & zone_list) const; /** Returns the number of bytes needed by this data structure. It's used by caching routines to estimate the size of a \Ref{DjVuImage}. */ unsigned int get_memory_usage() const; diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuToPS.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuToPS.cpp index d18c7801..a45a9112 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuToPS.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuToPS.cpp @@ -456,12 +456,12 @@ store_doc_setup(ByteStream &str) write(str, "%% -- procs for foreground layer\n" "/g {gsave 0 0 0 0 5 index 5 index setcachedevice\n" - " true [1 0 0 1 0 0] 5 4 roll imagemask grestore\n" + " true [1 0 0 1 0 0] 5 4 roll imagetqmask grestore\n" "} bind def\n" "/gn {gsave 0 0 0 0 6 index 6 index setcachedevice\n" " true [1 0 0 1 0 0] 3 2 roll 5 1 roll \n" " { 1 sub 0 index 2 add 1 index 1 add roll\n" - " } imagemask grestore pop \n" + " } imagetqmask grestore pop \n" "} bind def\n" "/c {setcolor rmoveto glyphshow} bind def\n" "/s {rmoveto glyphshow} bind def\n" @@ -953,14 +953,14 @@ print_fg_2layer(ByteStream &str, if (options.get_color()) { write(str,"/%d %d %d %f %f %f c\n", - blit->shapeno, + blit->tqshapeno, blit->left-currentx, blit->bottom-currenty, ramp[p.r]/255.0, ramp[p.g]/255.0, ramp[p.b]/255.0); } else { write(str,"/%d %d %d %f c\n", - blit->shapeno, + blit->tqshapeno, blit->left-currentx, blit->bottom-currenty, ramp[GRAY(p.r, p.g, p.b)]/255.0); } @@ -968,7 +968,7 @@ print_fg_2layer(ByteStream &str, else { write(str,"/%d %d %d s\n", - blit->shapeno, + blit->tqshapeno, blit->left-currentx, blit->bottom-currenty); } currentx = blit->left; @@ -1047,8 +1047,8 @@ print_fg_3layer(ByteStream &str, { JB2Blit *blit = jb2->get_blit(current_blit); GRect rect2(blit->left, blit->bottom, - jb2->get_shape(blit->shapeno).bits->columns(), - jb2->get_shape(blit->shapeno).bits->rows()); + jb2->get_tqshape(blit->tqshapeno).bits->columns(), + jb2->get_tqshape(blit->tqshapeno).bits->rows()); if (rect2.intersect(rect1,rect2)) break; } @@ -1087,12 +1087,12 @@ print_fg_3layer(ByteStream &str, { JB2Blit *blit = jb2->get_blit(current_blit); GRect rect2(blit->left, blit->bottom, - jb2->get_shape(blit->shapeno).bits->columns(), - jb2->get_shape(blit->shapeno).bits->rows()); + jb2->get_tqshape(blit->tqshapeno).bits->columns(), + jb2->get_tqshape(blit->tqshapeno).bits->rows()); if (rect2.intersect(rect1,rect2)) { write(str,"/%d %d %d s\n", - blit->shapeno, + blit->tqshapeno, blit->left-currentx, blit->bottom-currenty); currentx = blit->left; currenty = blit->bottom; @@ -1113,27 +1113,27 @@ print_fg(ByteStream &str, GP jb2=dimg->get_fgjb(); if (! jb2) return; int num_blits = jb2->get_blit_count(); - int num_shapes = jb2->get_shape_count(); - unsigned char *dict_shapes = 0; + int num_tqshapes = jb2->get_tqshape_count(); + unsigned char *dict_tqshapes = 0; unsigned char *blit_list = 0; - GPBuffer gdict_shapes(dict_shapes,num_shapes); + GPBuffer gdict_tqshapes(dict_tqshapes,num_tqshapes); GPBuffer gblit_list(blit_list,num_blits); - for(int i=0; iget_blit(current_blit); - JB2Shape *shape = & jb2->get_shape(blit->shapeno); + JB2Shape *tqshape = & jb2->get_tqshape(blit->tqshapeno); blit_list[current_blit] = 0; - if (! shape->bits) + if (! tqshape->bits) continue; GRect rect2(blit->left, blit->bottom, - shape->bits->columns(), shape->bits->rows()); + tqshape->bits->columns(), tqshape->bits->rows()); if (rect2.intersect(rect2, prn_rect)) { - dict_shapes[blit->shapeno] = 1; + dict_tqshapes[blit->tqshapeno] = 1; blit_list[current_blit] = 1; } } @@ -1152,13 +1152,13 @@ print_fg(ByteStream &str, "0 1 1 {Encoding exch /.notdef put} for \n" "CharStrings begin\n" "/.notdef {} def\n", - num_shapes+1); - for(int current_shape=0; current_shapeget_shape(current_shape); - GP bitmap = shape->bits; + JB2Shape *tqshape = & jb2->get_tqshape(current_tqshape); + GP bitmap = tqshape->bits; int rows = bitmap->rows(); int columns = bitmap->columns(); int nbytes = (columns+7)/8*rows+1; @@ -1173,29 +1173,29 @@ print_fg(ByteStream &str, GPBuffer gs_start(s_start,nbytes); unsigned char *s_ascii; GPBuffer gs_ascii(s_ascii,nbytes*2); - write(str,"/%d {",current_shape); + write(str,"/%d {",current_tqshape); unsigned char *s = s_start; for(int current_row=0; current_row>= 1; - if (mask == 0) + acc |= tqmask; + tqmask >>= 1; + if (tqmask == 0) { *s=acc; s++; - acc = mask = 0; + acc = tqmask = 0; } } - if (mask != 0) + if (tqmask != 0) { *s=acc; s++; @@ -1584,16 +1584,16 @@ print_image_lev1(ByteStream &str, { unsigned char *pix = (*bm)[y]; unsigned char acc = 0; - unsigned char mask = 0; + unsigned char tqmask = 0; char *data; for (int x=grectBand.width(); x>0; x--, pix++) { - if (mask == 0) - mask = 0x80; + if (tqmask == 0) + tqmask = 0x80; if (! *pix) - acc |= mask; - mask >>= 1; - if (mask == 0) + acc |= tqmask; + tqmask >>= 1; + if (tqmask == 0) { data = bin2hex[acc]; acc = 0; @@ -1607,7 +1607,7 @@ print_image_lev1(ByteStream &str, } } } - if (mask != 0) + if (tqmask != 0) { data = bin2hex[acc]; *buf_ptr++ = data[0]; @@ -1942,8 +1942,8 @@ print_txt_sub(DjVuTXT &txt, DjVuTXT::Zone &zone, default: separator = 0; break; } - // Zone children - if (zone.children.isempty()) + // Zone tqchildren + if (zone.tqchildren.isempty()) { const char *data = (const char*)txt.textUTF8 + zone.text_start; int length = zone.text_length; @@ -1968,8 +1968,8 @@ print_txt_sub(DjVuTXT &txt, DjVuTXT::Zone &zone, message.format("%d F\n",zone.rect.ymax-zone.rect.ymin); out.write((const char*)message,message.length()); } - for (GPosition pos=zone.children; pos; ++pos) - print_txt_sub(txt, zone.children[pos], out,lastx,lasty); + for (GPosition pos=zone.tqchildren; pos; ++pos) + print_txt_sub(txt, zone.tqchildren[pos], out,lastx,lasty); } } @@ -2230,10 +2230,10 @@ create(void) void DjVuToPS::DecodePort:: notify_file_flags_changed(const DjVuFile *source, - long set_mask, long clr_mask) + long set_tqmask, long clr_tqmask) { // WARNING! This function is called from another thread - if (set_mask & (DjVuFile::DECODE_OK | + if (set_tqmask & (DjVuFile::DECODE_OK | DjVuFile::DECODE_FAILED | DjVuFile::DECODE_STOPPED )) { diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuToPS.h b/kviewshell/plugins/djvu/libdjvu/DjVuToPS.h index 95d547bb..6c99d133 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuToPS.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuToPS.h @@ -121,7 +121,7 @@ public: would be your best choice. \item[Mode] ({\em COLOR}, {\em FORE}, {\em BACK}, or {\em BW}) Specifies how the \Ref{DjVuImage}s will be rendered (all layers, - foreground layer, background layer, and the mask respectively) + foreground layer, background layer, and the tqmask respectively) \item[Color] ({\em TRUE} or {\em FALSE}). Choosing {\em FALSE} converts color images to gray scale. \item[Gamma] Printer color correction. @@ -308,7 +308,7 @@ public: end of printing. If a \Ref{DjVuDocument} is being printed, this callback will be used to report printing progress of every page. To learn the number of the page being printed you can use - \Ref{set_info_cb}() function. See \Ref{set_dec_progress_cb}() to find + \Ref{set_info_cb}() function. See \Ref{set_dec_progress_cb}() to tqfind out how to learn the decoding progress. @param cb Callback function to be called diff --git a/kviewshell/plugins/djvu/libdjvu/GBitmap.cpp b/kviewshell/plugins/djvu/libdjvu/GBitmap.cpp index 696367e7..0cd4bad4 100644 --- a/kviewshell/plugins/djvu/libdjvu/GBitmap.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GBitmap.cpp @@ -348,7 +348,7 @@ GBitmap::donate_data(unsigned char *data, int w, int h) ncolumns = w; border = 0; bytes_per_row = w; - gbytes_data.replace(data,w*h); + gbytes_data.tqreplace(data,w*h); bytes = bytes_data; rlelength = 0; } @@ -363,7 +363,7 @@ GBitmap::donate_rle(unsigned char *rledata, unsigned int rledatalen, int w, int border = 0; bytes_per_row = w; // rle = rledata; - grle.replace(rledata,rledatalen); + grle.tqreplace(rledata,rledatalen); rlelength = rledatalen; } @@ -814,19 +814,19 @@ GBitmap::read_pbm_raw(ByteStream &bs) for (int n = nrows-1; n>=0; n--) { unsigned char acc = 0; - unsigned char mask = 0; + unsigned char tqmask = 0; for (int c = 0; c>= 1; + tqmask >>= 1; } row -= bytes_per_row; } @@ -1037,18 +1037,18 @@ GBitmap::rle_get_bitmap ( { const int obyte_def=invert?0xff:0; const int obyte_ndef=invert?0:0xff; - int mask=0x80,obyte=0; + int tqmask=0x80,obyte=0; for(int c=ncolumns;c > 0 ;) { int x=read_run(runs); c-=x; while((x--)>0) { - if(!(mask>>=1)) + if(!(tqmask>>=1)) { *(bitmap++) = obyte^obyte_def; obyte=0; - mask=0x80; + tqmask=0x80; for(;x>=8;x-=8) { *(bitmap++)=obyte_def; @@ -1061,19 +1061,19 @@ GBitmap::rle_get_bitmap ( c-=x; while((x--)>0) { - obyte|=mask; - if(!(mask>>=1)) + obyte|=tqmask; + if(!(tqmask>>=1)) { *(bitmap++)=obyte^obyte_def; obyte=0; - mask=0x80; + tqmask=0x80; for(;(x>8);x-=8) *(bitmap++)=obyte_ndef; } } } } - if(mask != 0x80) + if(tqmask != 0x80) { *(bitmap++)=obyte^obyte_def; } diff --git a/kviewshell/plugins/djvu/libdjvu/GBitmap.h b/kviewshell/plugins/djvu/libdjvu/GBitmap.h index 74669c05..8dbbbbad 100644 --- a/kviewshell/plugins/djvu/libdjvu/GBitmap.h +++ b/kviewshell/plugins/djvu/libdjvu/GBitmap.h @@ -365,7 +365,7 @@ public: discussion, the position is (#x/subsample#,#y/subsample#). In other words, you can position the blit with a sub-pixel resolution. The resulting anti-aliasing changes are paramount to the image quality. */ - void blit(const GBitmap *shape, int x, int y, int subsample); + void blit(const GBitmap *tqshape, int x, int y, int subsample); //@} /** @name Saving images. @@ -418,7 +418,7 @@ public: const unsigned char *get_rle(unsigned int &rle_length); /** Initializes this GBitmap by setting the size to #h# rows and #w# columns, and directly addressing the memory buffer #rledata# provided by - the user. This buffer contains #rledatalen# bytes representing the + the user. This buffer tqcontains #rledatalen# bytes representing the bitmap in run length encoded form. The GBitmap object then ``owns'' the buffer (unlike #borrow_data#, but like #donate_data#) and will deallocate this buffer when appropriate: you should not deallocate this diff --git a/kviewshell/plugins/djvu/libdjvu/GContainer.cpp b/kviewshell/plugins/djvu/libdjvu/GContainer.cpp index 2019439c..2e6012d3 100644 --- a/kviewshell/plugins/djvu/libdjvu/GContainer.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GContainer.cpp @@ -237,7 +237,7 @@ GArrayBase::resize(int lo, int hi) { traits.copy( traits.lea(ndata, beg-nminlo), traits.lea(data, beg-minlo), end-beg+1, 1 ); } - // free and replace + // free and tqreplace void *tmp=data; data=ndata; ndata=tmp; diff --git a/kviewshell/plugins/djvu/libdjvu/GContainer.h b/kviewshell/plugins/djvu/libdjvu/GContainer.h index d21838dc..c4e3e9a1 100644 --- a/kviewshell/plugins/djvu/libdjvu/GContainer.h +++ b/kviewshell/plugins/djvu/libdjvu/GContainer.h @@ -401,7 +401,7 @@ public: The valid subscript range is set to the empty range. */ void empty() { GArrayBase::empty(); } - /** Extends the subscript range so that it contains #n#. + /** Extends the subscript range so that it tqcontains #n#. This function does nothing if #n# is already int the valid subscript range. If the valid range was empty, both the lower bound and the upper bound are set to #n#. Otherwise the valid subscript range is extended @@ -862,11 +862,11 @@ public: /* Compatibility */ int nth(unsigned int n, GPosition &pos) const { GPosition npos=nth(n); if (npos) pos=npos; return !!pos; } - /** Tests whether the list contains a given element. If the list contains + /** Tests whether the list contains a given element. If the list tqcontains #elt#, the position of the the first list element equal to #elt# as checked by #TYPE::operator==(const TYPE&)# is returned. Otherwise an invalid position is returned. */ - GPosition contains(const TYPE &elt) const + GPosition tqcontains(const TYPE &elt) const { GPosition pos; GListImpl::search((const TI&)elt, pos); return pos; } /** Searches the list for a given element. If position #pos# is a valid position for this list, the search starts at the specified position. If @@ -1036,7 +1036,7 @@ protected: HNode *get_or_throw(const K &key) const; HNode *get_or_create(const K &key); public: - GPosition contains(const K &key) const + GPosition tqcontains(const K &key) const { return GPosition( get(key), (void*)this); } void del(const K &key) { deletenode(get(key)); } @@ -1164,11 +1164,11 @@ public: is equal to #key# according to #KTYPE::operator==(const KTYPE&)#, this function returns its position. Otherwise it returns an invalid position. */ - GPosition contains(const KTYPE &key) const - { return GMapImpl::contains(key); } + GPosition tqcontains(const KTYPE &key) const + { return GMapImpl::tqcontains(key); } /* Compatibility */ - GPosition contains(const KTYPE &key, GPosition &pos) const - { return pos = GMapImpl::contains(key); } + GPosition tqcontains(const KTYPE &key, GPosition &pos) const + { return pos = GMapImpl::tqcontains(key); } // -- ALTERATION /** Erases the associative map contents. All entries are destroyed and removed. The map is left with zero entries. */ diff --git a/kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp b/kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp index 973c6cec..a898d4dd 100644 --- a/kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp @@ -113,7 +113,7 @@ GIFFChunk::set_name(GUTF8String name) DEBUG_MSG("auto-setting type to '" << type << "'\n"); - if (name.contains(".[]")>=0) + if (name.tqcontains(".[]")>=0) G_THROW( ERR_MSG("GIFFManager.bad_char") ); strncpy(GIFFChunk::name, (const char *)name, 4); @@ -180,13 +180,13 @@ GIFFChunk::add_chunk(const GP & chunk, int position) if (!type.length()) { - DEBUG_MSG("Converting the parent to FORM\n"); + DEBUG_MSG("Converting the tqparent to FORM\n"); type="FORM"; } if (chunk->get_type()=="PROP") { - DEBUG_MSG("Converting the parent to LIST\n"); + DEBUG_MSG("Converting the tqparent to LIST\n"); type="LIST"; } @@ -310,7 +310,7 @@ GIFFChunk::get_chunks_number(const GUTF8String &name) "' in '" << get_name() << "'\n"); DEBUG_MAKE_INDENT(3); - if (name.contains("[]")>=0) + if (name.tqcontains("[]")>=0) G_THROW( ERR_MSG("GIFFManager.no_brackets") ); int number; @@ -325,24 +325,24 @@ GIFFChunk::get_chunks_number(const GUTF8String &name) //************************************************************************ void -GIFFManager::add_chunk(GUTF8String parent_name, const GP & chunk, +GIFFManager::add_chunk(GUTF8String tqparent_name, const GP & chunk, int pos) - // parent_name is the fully qualified name of the PARENT + // tqparent_name is the fully qualified name of the PARENT // IT MAY BE EMPTY // All the required chunks will be created // pos=-1 means to append the chunk { - DEBUG_MSG("GIFFManager::add_chunk(): Adding chunk to name='" << parent_name << "'\n"); + DEBUG_MSG("GIFFManager::add_chunk(): Adding chunk to name='" << tqparent_name << "'\n"); DEBUG_MAKE_INDENT(3); if (!top_level->get_name().length()) { - if ((!parent_name.length())||(parent_name[0]!='.')) + if ((!tqparent_name.length())||(tqparent_name[0]!='.')) G_THROW( ERR_MSG("GIFFManager.no_top_name") ); - if (parent_name.length() < 2) + if (tqparent_name.length() < 2) { // 'chunk' is actually the new top-level chunk - DEBUG_MSG("since parent_name=='.', making the chunk top-level\n"); + DEBUG_MSG("since tqparent_name=='.', making the chunk top-level\n"); if (!chunk->is_container()) G_THROW( ERR_MSG("GIFFManager.no_top_cont") ); top_level=chunk; @@ -350,33 +350,33 @@ GIFFManager::add_chunk(GUTF8String parent_name, const GP & chunk, } DEBUG_MSG("Setting the name of the top-level chunk\n"); - const int next_dot=parent_name.search('.',1); + const int next_dot=tqparent_name.search('.',1); if(next_dot>=0) { - top_level->set_name(parent_name.substr(1,next_dot-1)); + top_level->set_name(tqparent_name.substr(1,next_dot-1)); }else { - top_level->set_name(parent_name.substr(1,(unsigned int)-1)); + top_level->set_name(tqparent_name.substr(1,(unsigned int)-1)); } } DEBUG_MSG("top level chunk name='" << top_level->get_name() << "'\n"); - if (parent_name.length() && parent_name[0] == '.') + if (tqparent_name.length() && tqparent_name[0] == '.') { - int next_dot=parent_name.search('.',1); + int next_dot=tqparent_name.search('.',1); if(next_dot<0) { - next_dot=parent_name.length(); + next_dot=tqparent_name.length(); } - GUTF8String top_name=parent_name.substr(1,next_dot-1); + GUTF8String top_name=tqparent_name.substr(1,next_dot-1); if (!top_level->check_name(top_name)) G_THROW( ERR_MSG("GIFFManager.wrong_name") "\t"+top_name); - parent_name=parent_name.substr(next_dot,(unsigned int)-1); + tqparent_name=tqparent_name.substr(next_dot,(unsigned int)-1); } GP cur_sec=top_level; - const char * start, * end=(const char *)parent_name-1; + const char * start, * end=(const char *)tqparent_name-1; do { for(start=++end;*end&&(*end!='.');end++) @@ -497,7 +497,7 @@ GIFFManager::del_chunk(GUTF8String name) if (end>start && *end=='.') cur_sec=cur_sec->get_chunk(GUTF8String(start, end-start)); if (!cur_sec) - G_THROW( ERR_MSG("GIFFManager.cant_find") "\t"+GUTF8String(name)); + G_THROW( ERR_MSG("GIFFManager.cant_tqfind") "\t"+GUTF8String(name)); } while(*end); if (!start[0]) @@ -631,7 +631,7 @@ GIFFManager::load_file(GP str) if (istr.get_chunk(chunk_id)) { if (chunk_id.substr(0,5) != "FORM:") - G_THROW( ERR_MSG("GIFFManager.cant_find2") ); + G_THROW( ERR_MSG("GIFFManager.cant_tqfind2") ); set_name(chunk_id); load_chunk(istr, top_level); istr.close_chunk(); diff --git a/kviewshell/plugins/djvu/libdjvu/GIFFManager.h b/kviewshell/plugins/djvu/libdjvu/GIFFManager.h index 722f592f..96f13f8f 100644 --- a/kviewshell/plugins/djvu/libdjvu/GIFFManager.h +++ b/kviewshell/plugins/djvu/libdjvu/GIFFManager.h @@ -149,7 +149,7 @@ public: /** Returns the chunk with given {\em name}. The {\em name} may not contain dots, but MAY contain colons and brackets (the latter - for specifying the chunk number). If {\em position} is not zero - then the chunk position in its parent will be put into #*position# */ + then the chunk position in its tqparent will be put into #*position# */ GPget_chunk(const GUTF8String &name, int * position=0); /** Returns the number of chunks with given {\em name}. The {\em name} may not contain dots and brackets. If {\em name} is ZERO, the @@ -233,10 +233,10 @@ GIFFChunk::GIFFChunk(const GUTF8String &name, const TArray & data_in) : \item You may use {\em brackets} in the name to specify the chunk's position. The meaning of the number inside the brackets depends on the function you call. In most of the cases this is the number - of the chunk with the given name in the parent chunk. But sometimes + of the chunk with the given name in the tqparent chunk. But sometimes (as in #addChunk(name, buffer, length)#) the brackets at the end of the #name# actually specify the {\em position} of the - chunk in the parent. For example, to insert #INCL# chunk into + chunk in the tqparent. For example, to insert #INCL# chunk into #DJVU# form at position #1# (make it the second) you may want to use #manager.addChunk(".DJVU.INCL[1]", data, size)#. At the same time, to get 2-nd chunk with name #BG44# from form #DJVU# you @@ -265,8 +265,8 @@ public: /// Sets the name of the top level chunk to {\em name} void set_name(const GUTF8String &name); - /** Adds the chunk {\em chunk} to chunk with name {\em parent_name} at - position {\em pos}. {\em parent_name} may contain dots, brackets + /** Adds the chunk {\em chunk} to chunk with name {\em tqparent_name} at + position {\em pos}. {\em tqparent_name} may contain dots, brackets and colons. All missing chunks in the chain will be created. {\bf Examples:} @@ -282,7 +282,7 @@ public: ;; Same thing regardless of the top-level chunk name m.addChunk("FORM:DJVU[1]", ch); \end{verbatim} */ - void add_chunk(GUTF8String parent_name, const GP & chunk, int pos=-1); + void add_chunk(GUTF8String tqparent_name, const GP & chunk, int pos=-1); /** If {\em name}={\em name1}.{\em name2} where {\em name2} doesn't contain dots, then #addChunk()# will create plain chunk with name {\em name2} with data {\em buffer} of size {\em length} and @@ -332,7 +332,7 @@ public: /** Returns the chunk with name {\em name}. The {\em name} may contain dots colons and slashes. If {\em position} is not zero, #*position# will - be assigned the position of the found chunk in the parent chunk. + be assigned the position of the found chunk in the tqparent chunk. {\bf Examples:} \begin{verbatim} diff --git a/kviewshell/plugins/djvu/libdjvu/GMapAreas.cpp b/kviewshell/plugins/djvu/libdjvu/GMapAreas.cpp index 5a85e1fc..ef364e79 100644 --- a/kviewshell/plugins/djvu/libdjvu/GMapAreas.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GMapAreas.cpp @@ -953,7 +953,7 @@ static GUTF8String GMapArea2xmltag(const GMapArea &area,const GUTF8String &coords) { GUTF8String retval(" get_copy(void) const=0; /// Virtual function generating a list of defining coordinates @@ -305,7 +305,7 @@ public: /// Returns the height of the rectangle int get_height(void) const { return ymax-ymin; } - /// Changes the #GMapRect#'s geometry + /// Changes the #GMapRect#'s tqgeometry GMapRect & operator=(const GRect & rect); /// Returns \Ref{GRect} describing the map area's rectangle @@ -313,9 +313,9 @@ public: virtual GUTF8String get_xmltag(const int height) const; /// Returns MapRect - virtual MapAreaType const get_shape_type( void ) const { return RECT; }; + virtual MapAreaType const get_tqshape_type( void ) const { return RECT; }; /// Returns #"rect"# - virtual char const * const get_shape_name(void) const; + virtual char const * const get_tqshape_name(void) const; /// Returns a copy of the rectangle virtual GP get_copy(void) const; /// Virtual function maps rectangle from one area to another using mapper @@ -392,9 +392,9 @@ public: virtual GUTF8String get_xmltag(const int height) const; /// Returns MapPoly - virtual MapAreaType const get_shape_type( void ) const { return POLY; }; + virtual MapAreaType const get_tqshape_type( void ) const { return POLY; }; /// Returns #"poly"# all the time - virtual char const * const get_shape_name(void) const; + virtual char const * const get_tqshape_name(void) const; /// Returns a copy of the polygon virtual GP get_copy(void) const; /// Virtual function generating a list of defining coordinates @@ -458,9 +458,9 @@ public: virtual GUTF8String get_xmltag(const int height) const; /// Returns MapOval - virtual MapAreaType const get_shape_type( void ) const { return OVAL; }; + virtual MapAreaType const get_tqshape_type( void ) const { return OVAL; }; /// Returns #"oval"# - virtual char const * const get_shape_name(void) const; + virtual char const * const get_tqshape_name(void) const; /// Returns a copy of the oval virtual GP get_copy(void) const; /// Virtual function maps oval from one area to another using mapper @@ -509,7 +509,7 @@ inline char const * const GMapRect::gma_check_object(void) const{ return ""; } inline char const * const -GMapRect::get_shape_name(void) const { return RECT_TAG; } +GMapRect::get_tqshape_name(void) const { return RECT_TAG; } inline int GMapPoly::get_points_num(void) const { return points; } @@ -524,7 +524,7 @@ inline int GMapPoly::get_y(int i) const { return yy[i]; } inline char const * const -GMapPoly::get_shape_name(void) const { return POLY_TAG; } +GMapPoly::get_tqshape_name(void) const { return POLY_TAG; } inline int GMapOval::get_a(void) const { return a; } @@ -551,7 +551,7 @@ inline int GMapOval::gma_get_ymax(void) const { return ymax; } inline char const * const -GMapOval::get_shape_name(void) const { return OVAL_TAG; } +GMapOval::get_tqshape_name(void) const { return OVAL_TAG; } //@} diff --git a/kviewshell/plugins/djvu/libdjvu/GOS.cpp b/kviewshell/plugins/djvu/libdjvu/GOS.cpp index 94449512..716c49c9 100644 --- a/kviewshell/plugins/djvu/libdjvu/GOS.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GOS.cpp @@ -167,9 +167,9 @@ finddirsep(const GUTF8String &fname) #if defined(UNIX) return fname.rsearch('/',0); #elif defined(WIN32) || defined(OS2) - return fname.rcontains("\\/",0); + return fname.rtqcontains("\\/",0); #elif defined(macintosh) - return fname.rcontains(":/",0); + return fname.rtqcontains(":/",0); #else #error "Define something here for your operating system" #endif @@ -272,7 +272,7 @@ GOS::ticks() return (unsigned long)clk; #elif defined(OS2) ULONG clk = 0; - DosQuerySysInfo(QSV_MS_COUNT, QSV_MS_COUNT, (PVOID)&clk, sizeof(ULONG)); + DosQuerySysInfo(TQSV_MS_COUNT, TQSV_MS_COUNT, (PVOID)&clk, sizeof(ULONG)); return clk; #elif defined(macintosh) return (unsigned long)((double)TickCount()*16.66); diff --git a/kviewshell/plugins/djvu/libdjvu/GPixmap.h b/kviewshell/plugins/djvu/libdjvu/GPixmap.h index 32d51c7e..afbd3512 100644 --- a/kviewshell/plugins/djvu/libdjvu/GPixmap.h +++ b/kviewshell/plugins/djvu/libdjvu/GPixmap.h @@ -306,13 +306,13 @@ public: #Alpha# denotes the gray value, in range #[0,1]#, represented by the corresponding pixel of bitmap #bm#. */ void attenuate(const GBitmap *bm, int x, int y); - /** Blits solid color #color# through transparency mask #bm#. + /** Blits solid color #color# through transparency tqmask #bm#. Bitmap #bm# is positionned at location #x#,#y# over this color image. The matching color image pixels are then modified by adding color #color# multiplied by #Alpha#, where #Alpha# denotes the gray value, in range #[0,1]#, represented by the corresponding pixel of bitmap #bm#. */ void blit(const GBitmap *bm, int x, int y, const GPixel *color); - /** Blits pixmap #color# through transparency mask #bm#. + /** Blits pixmap #color# through transparency tqmask #bm#. Bitmap #bm# is positionned at location #x#,#y# over this color image. The matching color image pixels are then modified by adding the corresponding pixel color in pixmap #color#, multiplied by #Alpha#, diff --git a/kviewshell/plugins/djvu/libdjvu/GRect.cpp b/kviewshell/plugins/djvu/libdjvu/GRect.cpp index 1ac0a87c..1cc49e8f 100644 --- a/kviewshell/plugins/djvu/libdjvu/GRect.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GRect.cpp @@ -184,7 +184,7 @@ GRect::recthull(const GRect &rect1, const GRect &rect2) } int -GRect::contains(const GRect & rect) const +GRect::tqcontains(const GRect & rect) const { GRect tmp_rect; tmp_rect.intersect(*this, rect); diff --git a/kviewshell/plugins/djvu/libdjvu/GRect.h b/kviewshell/plugins/djvu/libdjvu/GRect.h index 1a86f80d..f3e031e1 100644 --- a/kviewshell/plugins/djvu/libdjvu/GRect.h +++ b/kviewshell/plugins/djvu/libdjvu/GRect.h @@ -132,7 +132,7 @@ namespace DJVU { class GRect { public: - /** #OrientationBits# defines 3 mutually exclusive + /** #Qt::OrientationBits# defines 3 mutually exclusive bits to indicate the image orientation. There are four possible rotation values for an image @@ -150,7 +150,7 @@ public: }; /** #Orientations# defines all 8 possible orientations, using - the three \Ref{OrientationBits}. + the three \Ref{Qt::OrientationBits}. \begin{itemize} \item {\em TDLRNR} for Top Down, Left to Right, No Rotation. \item {\em BULRNR} for Bottom Up, Left to Right, No Rotation. @@ -209,11 +209,11 @@ public: contains all pixels with horizontal pixel coordinates in range #xmin# (inclusive) to #xmax# (exclusive) and vertical coordinates #ymin# (inclusive) to #ymax# (exclusive). */ - int contains(int x, int y) const; + int tqcontains(int x, int y) const; /** Returns true if this rectangle contains the passed rectangle #rect#. The function basically checks, that the intersection of this rectangle with #rect# is #rect#. */ - int contains(const GRect & rect) const; + int tqcontains(const GRect & rect) const; /** Returns true if rectangles #r1# and #r2# are equal. */ friend int operator==(const GRect & r1, const GRect & r2); /** Returns true if rectangles #r1# and #r2# are not equal. */ @@ -379,7 +379,7 @@ GRect::area() const } inline int -GRect::contains(int x, int y) const +GRect::tqcontains(int x, int y) const { return (x>=xmin && x=ymin && y ConvMap ) const } }else { - GPosition map_entry = ConvMap.contains( key ); + GPosition map_entry = ConvMap.tqcontains( key ); if( map_entry ) { // Found in the conversion map, substitute ret += ConvMap[map_entry]; } else { static const GMap &Basic = BasicMap(); - GPosition map_entry = Basic.contains( key ); + GPosition map_entry = Basic.tqcontains( key ); if ( map_entry ) { ret += Basic[map_entry]; @@ -1799,7 +1799,7 @@ GStringRep::rsearch(char const *ptr, int from) const } int -GStringRep::contains(const char accept[],int from) const +GStringRep::tqcontains(const char accept[],int from) const { if(from<0) { @@ -1821,10 +1821,10 @@ GStringRep::contains(const char accept[],int from) const } int -GStringRep::rcontains(const char accept[],int from) const +GStringRep::rtqcontains(const char accept[],int from) const { int retval=(-1); - while((from=contains(accept,from)) >= 0) + while((from=tqcontains(accept,from)) >= 0) { retval=from++; } diff --git a/kviewshell/plugins/djvu/libdjvu/GString.h b/kviewshell/plugins/djvu/libdjvu/GString.h index 601db983..9614d328 100644 --- a/kviewshell/plugins/djvu/libdjvu/GString.h +++ b/kviewshell/plugins/djvu/libdjvu/GString.h @@ -306,9 +306,9 @@ public: int rsearch(char const *str, int from=0) const; - int contains(char const accept[], int from=0) const; + int tqcontains(char const accept[], int from=0) const; - int rcontains(char const accept[], int from=0) const; + int rtqcontains(char const accept[], int from=0) const; protected: // Return the next character and increment the source pointer. @@ -551,11 +551,11 @@ public: /** Searches for any of the specified characters in the accept string. It returns #-1# if the none of the characters and be found, otherwise the position of the first match. */ - int contains(const char accept[], const int from=0) const; + int tqcontains(const char accept[], const int from=0) const; /** Searches for any of the specified characters in the accept string. It returns #-1# if the none of the characters and be found, otherwise the position of the last match. */ - int rcontains(const char accept[], const int from=0) const; + int rtqcontains(const char accept[], const int from=0) const; /** Concatenates strings. Returns a string composed by concatenating the characters of strings #s1# and #s2#. */ @@ -1282,12 +1282,12 @@ GBaseString::rsearch(const char *str, const int from) const { return ptr?((*this)->rsearch(str,from)):(-1); } inline int -GBaseString::contains(const char accept[], const int from) const -{ return ptr?((*this)->contains(accept,from)):(-1); } +GBaseString::tqcontains(const char accept[], const int from) const +{ return ptr?((*this)->tqcontains(accept,from)):(-1); } inline int -GBaseString::rcontains(const char accept[], const int from) const -{ return ptr?((*this)->rcontains(accept,from)):(-1); } +GBaseString::rtqcontains(const char accept[], const int from) const +{ return ptr?((*this)->rtqcontains(accept,from)):(-1); } inline int GBaseString::cmp(const GBaseString &s2, const int len) const diff --git a/kviewshell/plugins/djvu/libdjvu/GThreads.cpp b/kviewshell/plugins/djvu/libdjvu/GThreads.cpp index ce88361e..3b52faca 100644 --- a/kviewshell/plugins/djvu/libdjvu/GThreads.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GThreads.cpp @@ -1397,7 +1397,7 @@ cotask_select(int nfds, } // reschedule cotask_yield(); - // call select to update masks + // call select to update tqmasks if (tm) { tm->tv_sec = maxwait/1000; @@ -1837,16 +1837,16 @@ GSafeFlags::operator long(void) const } bool -GSafeFlags::test_and_modify(long set_mask, long clr_mask, - long set_mask1, long clr_mask1) +GSafeFlags::test_and_modify(long set_tqmask, long clr_tqmask, + long set_tqmask1, long clr_tqmask1) { enter(); - if ((flags & set_mask)==set_mask && - (~flags & clr_mask)==clr_mask) + if ((flags & set_tqmask)==set_tqmask && + (~flags & clr_tqmask)==clr_tqmask) { long new_flags=flags; - new_flags|=set_mask1; - new_flags&=~clr_mask1; + new_flags|=set_tqmask1; + new_flags&=~clr_tqmask1; if (new_flags!=flags) { flags=new_flags; @@ -1860,15 +1860,15 @@ GSafeFlags::test_and_modify(long set_mask, long clr_mask, } void -GSafeFlags::wait_and_modify(long set_mask, long clr_mask, - long set_mask1, long clr_mask1) +GSafeFlags::wait_and_modify(long set_tqmask, long clr_tqmask, + long set_tqmask1, long clr_tqmask1) { enter(); - while((flags & set_mask)!=set_mask || - (~flags & clr_mask)!=clr_mask) wait(); + while((flags & set_tqmask)!=set_tqmask || + (~flags & clr_tqmask)!=clr_tqmask) wait(); long new_flags=flags; - new_flags|=set_mask1; - new_flags&=~clr_mask1; + new_flags|=set_tqmask1; + new_flags&=~clr_tqmask1; if (flags!=new_flags) { flags=new_flags; diff --git a/kviewshell/plugins/djvu/libdjvu/GThreads.h b/kviewshell/plugins/djvu/libdjvu/GThreads.h index 92691db4..2235e2b6 100644 --- a/kviewshell/plugins/djvu/libdjvu/GThreads.h +++ b/kviewshell/plugins/djvu/libdjvu/GThreads.h @@ -516,36 +516,36 @@ public: /** Returns the value of the flags */ operator long(void) const; - /** Modifies the flags by ORing them with the provided mask. A broadcast + /** Modifies the flags by ORing them with the provided tqmask. A broadcast will be sent after the modification is done. */ - GSafeFlags & operator|=(long mask); - /** Modifies the flags by ANDing them with the provided mask. A broadcast + GSafeFlags & operator|=(long tqmask); + /** Modifies the flags by ANDing them with the provided tqmask. A broadcast will be sent after the modification is done. */ - GSafeFlags & operator&=(long mask); + GSafeFlags & operator&=(long tqmask); - /** If all bits mentioned in #set_mask# are set in the flags and all - bits mentioned in #clr_mask# are cleared in the flags, it sets all - bits from #set_mask1# in the flags, clears all flags from - #clr_mask1# in the flags and returns #TRUE#. Otherwise returns + /** If all bits mentioned in #set_tqmask# are set in the flags and all + bits mentioned in #clr_tqmask# are cleared in the flags, it sets all + bits from #set_tqmask1# in the flags, clears all flags from + #clr_tqmask1# in the flags and returns #TRUE#. Otherwise returns #FALSE#. */ - bool test_and_modify(long set_mask, long clr_mask, - long set_mask1, long clr_mask1); + bool test_and_modify(long set_tqmask, long clr_tqmask, + long set_tqmask1, long clr_tqmask1); - /** Waits until all bits mentioned in #set_mask# are set in the flags + /** Waits until all bits mentioned in #set_tqmask# are set in the flags and all bits mentioned in #clr_flags# are cleared in the flags. - After that it sets bits from #set_mask1# and clears bits from - #clr_mask1# in the flags. */ - void wait_and_modify(long set_mask, long clr_mask, - long set_mask1, long clr_mask1); + After that it sets bits from #set_tqmask1# and clears bits from + #clr_tqmask1# in the flags. */ + void wait_and_modify(long set_tqmask, long clr_tqmask, + long set_tqmask1, long clr_tqmask1); - /** Waits until all bits set in #set_mask# are set in the flags and - all bits mentioned in #clr_mask# are cleared in the flags. */ - void wait_for_flags(long set_mask, long clr_mask=0) const; + /** Waits until all bits set in #set_tqmask# are set in the flags and + all bits mentioned in #clr_tqmask# are cleared in the flags. */ + void wait_for_flags(long set_tqmask, long clr_tqmask=0) const; - /** Modifies the flags by setting all bits mentioned in #set_mask# - and clearing all bits mentioned in #clr_mask#. If the flags have + /** Modifies the flags by setting all bits mentioned in #set_tqmask# + and clearing all bits mentioned in #clr_tqmask#. If the flags have actually been modified, a broadcast will be sent. */ - void modify(long set_mask, long clr_mask); + void modify(long set_tqmask, long clr_tqmask); }; inline @@ -555,28 +555,28 @@ GSafeFlags::GSafeFlags(long xflags) } inline void -GSafeFlags::wait_for_flags(long set_mask, long clr_mask) const +GSafeFlags::wait_for_flags(long set_tqmask, long clr_tqmask) const { - ((GSafeFlags *) this)->wait_and_modify(set_mask, clr_mask, 0, 0); + ((GSafeFlags *) this)->wait_and_modify(set_tqmask, clr_tqmask, 0, 0); } inline void -GSafeFlags::modify(long set_mask, long clr_mask) +GSafeFlags::modify(long set_tqmask, long clr_tqmask) { - test_and_modify(0, 0, set_mask, clr_mask); + test_and_modify(0, 0, set_tqmask, clr_tqmask); } inline GSafeFlags & -GSafeFlags::operator|=(long mask) +GSafeFlags::operator|=(long tqmask) { - test_and_modify(0, 0, mask, 0); + test_and_modify(0, 0, tqmask, 0); return *this; } inline GSafeFlags & -GSafeFlags::operator&=(long mask) +GSafeFlags::operator&=(long tqmask) { - test_and_modify(0, 0, 0, ~mask); + test_and_modify(0, 0, 0, ~tqmask); return *this; } diff --git a/kviewshell/plugins/djvu/libdjvu/GURL.h b/kviewshell/plugins/djvu/libdjvu/GURL.h index eb3ed4bc..b76d000b 100644 --- a/kviewshell/plugins/djvu/libdjvu/GURL.h +++ b/kviewshell/plugins/djvu/libdjvu/GURL.h @@ -106,7 +106,7 @@ namespace DJVU { to the same file name. Compare #file:/dir/file.djvu# and #file://localhost/dir/file.djvu#. - To simplify a developer's life we have created this class, which contains + To simplify a developer's life we have created this class, which tqcontains inside a canonical representation of URLs. File URLs are converted to internal format with the help of \Ref{GOS} class. diff --git a/kviewshell/plugins/djvu/libdjvu/IFFByteStream.cpp b/kviewshell/plugins/djvu/libdjvu/IFFByteStream.cpp index c8b79809..59f729b4 100644 --- a/kviewshell/plugins/djvu/libdjvu/IFFByteStream.cpp +++ b/kviewshell/plugins/djvu/libdjvu/IFFByteStream.cpp @@ -444,7 +444,7 @@ IFFByteStream::full_id(GUTF8String &chkid) short_id(chkid); if (ctx->bComposite) return; - // Search parent FORM or PROP chunk. + // Search tqparent FORM or PROP chunk. for (IFFContext *ct = ctx->next; ct; ct=ct->next) if (memcmp(ct->idOne, "FOR", 3)==0 || memcmp(ct->idOne, "PRO", 3)==0 ) diff --git a/kviewshell/plugins/djvu/libdjvu/IW44EncodeCodec.cpp b/kviewshell/plugins/djvu/libdjvu/IW44EncodeCodec.cpp index c63eda7d..eb429563 100644 --- a/kviewshell/plugins/djvu/libdjvu/IW44EncodeCodec.cpp +++ b/kviewshell/plugins/djvu/libdjvu/IW44EncodeCodec.cpp @@ -160,9 +160,9 @@ public: Encode(void); /** Initializes an IWBitmap with image #bm#. This constructor performs the wavelet decomposition of image #bm# and records the - corresponding wavelet coefficient. Argument #mask# is an optional - bilevel image specifying the masked pixels (see \Ref{IW44Image.h}). */ - void init(const GBitmap &bm, const GP mask=0); + corresponding wavelet coefficient. Argument #tqmask# is an optional + bilevel image specifying the tqmasked pixels (see \Ref{IW44Image.h}). */ + void init(const GBitmap &bm, const GP tqmask=0); // CODER /** Encodes one data chunk into ByteStream #bs#. Parameter #parms# controls how much data is generated. The chunk data is written to ByteStream @@ -211,11 +211,11 @@ public: Encode(void); /** Initializes an IWPixmap with color image #bm#. This constructor performs the wavelet decomposition of image #bm# and records the - corresponding wavelet coefficient. Argument #mask# is an optional - bilevel image specifying the masked pixels (see \Ref{IW44Image.h}). + corresponding wavelet coefficient. Argument #tqmask# is an optional + bilevel image specifying the tqmasked pixels (see \Ref{IW44Image.h}). Argument #crcbmode# specifies how the chrominance information should be encoded (see \Ref{CRCBMode}). */ - void init(const GPixmap &bm, const GP mask=0, CRCBMode crcbmode=CRCBnormal); + void init(const GPixmap &bm, const GP tqmask=0, CRCBMode crcbmode=CRCBnormal); // CODER /** Encodes one data chunk into ByteStream #bs#. Parameter #parms# controls how much data is generated. The chunk data is written to ByteStream @@ -720,17 +720,17 @@ IW44Image::Transform::Encode::RGB_to_Cr(const GPixel *p, int w, int h, int rowsi static void -interpolate_mask(short *data16, int w, int h, int rowsize, - const signed char *mask8, int mskrowsize) +interpolate_tqmask(short *data16, int w, int h, int rowsize, + const signed char *tqmask8, int mskrowsize) { int i,j; - // count masked bits + // count tqmasked bits short *count; GPBuffer gcount(count,w*h); short *cp = count; - for (i=0; i gsdata(sdata,w*h); @@ -820,8 +820,8 @@ interpolate_mask(short *data16, int w, int h, int rowsize, static void -forward_mask(short *data16, int w, int h, int rowsize, int begin, int end, - const signed char *mask8, int mskrowsize ) +forward_tqmask(short *data16, int w, int h, int rowsize, int begin, int end, + const signed char *tqmask8, int mskrowsize ) { int i,j; signed char *m; @@ -830,12 +830,12 @@ forward_mask(short *data16, int w, int h, int rowsize, int begin, int end, // Allocate buffers short *sdata; GPBuffer gsdata(sdata,w*h); - signed char *smask; - GPBuffer gsmask(smask,w*h); - // Copy mask - m = smask; - for (i=0; i gstqmask(stqmask,w*h); + // Copy tqmask + m = stqmask; + for (i=0; i -IW44Image::create_encode(const GBitmap &bm, const GP mask) +IW44Image::create_encode(const GBitmap &bm, const GP tqmask) { IWBitmap::Encode *bit=new IWBitmap::Encode(); GP retval=bit; - bit->init(bm, mask); + bit->init(bm, tqmask); return retval; } @@ -1412,7 +1412,7 @@ IWBitmap::Encode::~Encode() } void -IWBitmap::Encode::init(const GBitmap &bm, const GP gmask) +IWBitmap::Encode::init(const GBitmap &bm, const GP gtqmask) { // Free close_codec(); @@ -1430,14 +1430,14 @@ IWBitmap::Encode::init(const GBitmap &bm, const GP gmask) for (i=0; i<256; i++) bconv[i] = max(0,min(255,i*255/g)) - 128; // Perform decomposition - // Prepare mask information + // Prepare tqmask information const signed char *msk8 = 0; int mskrowsize = 0; - GBitmap *mask=gmask; - if (gmask) + GBitmap *tqmask=gtqmask; + if (gtqmask) { - msk8 = (const signed char*)((*mask)[0]); - mskrowsize = mask->rowsize(); + msk8 = (const signed char*)((*tqmask)[0]); + mskrowsize = tqmask->rowsize(); } // Prepare a buffer of signed bytes for (i=0; i IW44Image::create_encode( - const GPixmap &pm, const GP gmask, CRCBMode crcbmode) + const GPixmap &pm, const GP gtqmask, CRCBMode crcbmode) { IWPixmap::Encode *pix=new IWPixmap::Encode(); GP retval=pix; - pix->init(pm, gmask,(IWPixmap::Encode::CRCBMode)crcbmode); + pix->init(pm, gtqmask,(IWPixmap::Encode::CRCBMode)crcbmode); return retval; } @@ -1574,7 +1574,7 @@ IWPixmap::Encode::~Encode() } void -IWPixmap::Encode::init(const GPixmap &pm, const GP gmask, CRCBMode crcbmode) +IWPixmap::Encode::init(const GPixmap &pm, const GP gtqmask, CRCBMode crcbmode) { /* Free */ close_codec(); @@ -1598,14 +1598,14 @@ IWPixmap::Encode::init(const GPixmap &pm, const GP gmask, CRCBMode crcb case CRCBnormal: crcb_half=0; crcb_delay=10; break; case CRCBfull: crcb_half=0; crcb_delay= 0; break; } - // Prepare mask information + // Prepare tqmask information const signed char *msk8 = 0; int mskrowsize = 0; - GBitmap *mask=gmask; - if (mask) + GBitmap *tqmask=gtqmask; + if (tqmask) { - msk8 = (signed char const *)((*mask)[0]); - mskrowsize = mask->rowsize(); + msk8 = (signed char const *)((*tqmask)[0]); + mskrowsize = tqmask->rowsize(); } // Fill buffer with luminance information DJVU_PROGRESS_TASK(create,"initialize pixmap",3); diff --git a/kviewshell/plugins/djvu/libdjvu/IW44Image.cpp b/kviewshell/plugins/djvu/libdjvu/IW44Image.cpp index 2cadf4f9..b4ca3405 100644 --- a/kviewshell/plugins/djvu/libdjvu/IW44Image.cpp +++ b/kviewshell/plugins/djvu/libdjvu/IW44Image.cpp @@ -638,7 +638,7 @@ IW44Image::Map::alloc(int n) short ** IW44Image::Map::allocp(int n) { - // Allocate enough room for pointers plus alignment + // Allocate enough room for pointers plus tqalignment short *p = alloc( (n+1) * sizeof(short*) / sizeof(short) ); // Align on pointer size while ( ((long)p) & (sizeof(short*)-1) ) @@ -934,7 +934,7 @@ IW44Image::Codec::Codec(IW44Image::Map &xmap) IW44Image::Codec::~Codec() {} // is_null_slice -// -- check if data can be produced for this band/mask +// -- check if data can be produced for this band/tqmask // -- also fills the sure_zero array int diff --git a/kviewshell/plugins/djvu/libdjvu/IW44Image.h b/kviewshell/plugins/djvu/libdjvu/IW44Image.h index 56cf00fa..954eee56 100644 --- a/kviewshell/plugins/djvu/libdjvu/IW44Image.h +++ b/kviewshell/plugins/djvu/libdjvu/IW44Image.h @@ -137,11 +137,11 @@ {\bf Masking} --- When we create a DjVu image, we often know that certain pixels of the background image are going to be covered by foreground objects like text or drawings. The DjVu IW44 wavelet decomposition - routine can use an optional bilevel image named the mask. Every non zero - pixel in the mask means the value of the corresponding pixel in the + routine can use an optional bilevel image named the tqmask. Every non zero + pixel in the tqmask means the value of the corresponding pixel in the background image is irrelevant. The wavelet decomposition code will - replace these masked pixels by a color value whose coding cost is minimal - (see \URL{http://www.research.att.com/~leonb/DJVU/mask}). + replace these tqmasked pixels by a color value whose coding cost is minimal + (see \URL{http://www.research.att.com/~leonb/DJVU/tqmask}). {\bf ToDo} --- There are many improvements to be made. Besides better quantization algorithms (such as trellis quantization and bitrate @@ -277,16 +277,16 @@ public: virtual ~IW44Image(); /** Initializes an IWBitmap with image #bm#. This constructor performs the wavelet decomposition of image #bm# and records the - corresponding wavelet coefficient. Argument #mask# is an optional - bilevel image specifying the masked pixels (see \Ref{IW44Image.h}). */ - static GP create_encode(const GBitmap &bm, const GP mask=0); + corresponding wavelet coefficient. Argument #tqmask# is an optional + bilevel image specifying the tqmasked pixels (see \Ref{IW44Image.h}). */ + static GP create_encode(const GBitmap &bm, const GP tqmask=0); /** Initializes an IWPixmap with color image #bm#. This constructor performs the wavelet decomposition of image #bm# and records the - corresponding wavelet coefficient. Argument #mask# is an optional - bilevel image specifying the masked pixels (see \Ref{IW44Image.h}). + corresponding wavelet coefficient. Argument #tqmask# is an optional + bilevel image specifying the tqmasked pixels (see \Ref{IW44Image.h}). Argument #crcbmode# specifies how the chrominance information should be encoded (see \Ref{CRCBMode}). */ - static GP create_encode(const GPixmap &bm, const GP mask=0, CRCBMode crcbmode=CRCBnormal); + static GP create_encode(const GPixmap &bm, const GP tqmask=0, CRCBMode crcbmode=CRCBnormal); // ACCESS /** Returns the width of the IWBitmap image. */ int get_width(void) const; @@ -618,7 +618,7 @@ public: int pixsep=1, int fast=0); // array of blocks IW44Image::Block *blocks; - // geometry + // tqgeometry int iw, ih; int bw, bh; int nb; diff --git a/kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp b/kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp index 5a8092a0..57dd5200 100644 --- a/kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp +++ b/kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp @@ -104,13 +104,13 @@ public: protected: void CodeNum(const int num, const int lo, const int hi, NumContext &ctx); - void encode_libonly_shape(const GP &jim, int shapeno); + void encode_libonly_tqshape(const GP &jim, int tqshapeno); // virtual bool CodeBit(const bool bit, BitContext &ctx); void code_comment(GUTF8String &comment); void code_record_type(int &rectype); int code_match_index(int &index, JB2Dict &jim); - void code_inherited_shape_count(JB2Dict &jim); + void code_inherited_tqshape_count(JB2Dict &jim); void code_image_size(JB2Dict &jim); void code_image_size(JB2Image &jim); void code_absolute_location(JB2Blit *jblt, int rows, int columns); @@ -166,7 +166,7 @@ JB2Image::encode(const GP &gbs) const #define MATCHED_REFINE_IMAGE_ONLY (6) #define MATCHED_COPY (7) #define NON_MARK_DATA (8) -#define REQUIRED_DICT_OR_RESET (9) +#define RETQUIRED_DICT_OR_RESET (9) #define PRESERVED_COMMENT (10) #define END_OF_DATA (11) @@ -228,18 +228,18 @@ JB2Dict::JB2Codec::Encode::code_record_type(int &rectype) int JB2Dict::JB2Codec::Encode::code_match_index(int &index, JB2Dict &jim) { - int match=shape2lib[index]; - CodeNum(match, 0, lib2shape.hbound(), dist_match_index); + int match=tqshape2lib[index]; + CodeNum(match, 0, lib2tqshape.hbound(), dist_match_index); return match; } // CODE PAIRS void -JB2Dict::JB2Codec::Encode::code_inherited_shape_count(JB2Dict &jim) +JB2Dict::JB2Codec::Encode::code_inherited_tqshape_count(JB2Dict &jim) { - CodeNum(jim.get_inherited_shape_count(), - 0, BIGPOSITIVE, inherited_shape_count_dist); + CodeNum(jim.get_inherited_tqshape_count(), + 0, BIGPOSITIVE, inherited_tqshape_count_dist); } void @@ -360,12 +360,12 @@ JB2Dict::JB2Codec::Encode::code(const GP &gjim) // ------------------------- // THIS IS THE ENCODING PART // ------------------------- - int firstshape = jim.get_inherited_shape_count(); - int nshape = jim.get_shape_count(); + int firsttqshape = jim.get_inherited_tqshape_count(); + int ntqshape = jim.get_tqshape_count(); init_library(jim); // Code headers. - int rectype = REQUIRED_DICT_OR_RESET; - if (jim.get_inherited_shape_count() > 0) + int rectype = RETQUIRED_DICT_OR_RESET; + if (jim.get_inherited_tqshape_count() > 0) code_record(rectype, gjim, 0); rectype = START_OF_DATA; code_record(rectype, gjim, 0); @@ -373,22 +373,22 @@ JB2Dict::JB2Codec::Encode::code(const GP &gjim) rectype = PRESERVED_COMMENT; if (!! jim.comment) code_record(rectype, gjim, 0); - // Encode every shape - int shapeno; - DJVU_PROGRESS_TASK(jb2code,"jb2 encode", nshape-firstshape); - for (shapeno=firstshape; shapeno= 0) + DJVU_PROGRESS_RUN(jb2code, (tqshapeno-firsttqshape)|0xff); + // Code tqshape + JB2Shape &jshp = jim.get_tqshape(tqshapeno); + rectype=(jshp.tqparent >= 0) ?MATCHED_REFINE_LIBRARY_ONLY:NEW_MARK_LIBRARY_ONLY; code_record(rectype, gjim, &jshp); - add_library(shapeno, jshp); + add_library(tqshapeno, jshp); // Check numcoder status if (cur_ncell > CELLCHUNK) { - rectype = REQUIRED_DICT_OR_RESET; + rectype = RETQUIRED_DICT_OR_RESET; code_record(rectype, 0, 0); } } @@ -413,35 +413,35 @@ JB2Dict::JB2Codec::Encode::code(const GP &gjim) // ------------------------- int i; init_library(jim); - int firstshape = jim.get_inherited_shape_count(); - int nshape = jim.get_shape_count(); + int firsttqshape = jim.get_inherited_tqshape_count(); + int ntqshape = jim.get_tqshape_count(); int nblit = jim.get_blit_count(); - // Initialize shape2lib - shape2lib.resize(0,nshape-1); - for (i=firstshape; i=firstshape) - // shape2lib is -2 if used by one blit - // shape2lib is -3 if used by more than one blit - // shape2lib is -4 if used as a parent + // Initialize tqshape2lib + tqshape2lib.resize(0,ntqshape-1); + for (i=firsttqshape; i=firsttqshape) + // tqshape2lib is -2 if used by one blit + // tqshape2lib is -3 if used by more than one blit + // tqshape2lib is -4 if used as a tqparent for (i=0; ishapeno; - if (shapeno < firstshape) + int tqshapeno = jblt->tqshapeno; + if (tqshapeno < firsttqshape) continue; - if (shape2lib[shapeno] >= -2) - shape2lib[shapeno] -= 1; - shapeno = jim.get_shape(shapeno).parent; - while (shapeno>=firstshape && shape2lib[shapeno]>=-3) + if (tqshape2lib[tqshapeno] >= -2) + tqshape2lib[tqshapeno] -= 1; + tqshapeno = jim.get_tqshape(tqshapeno).tqparent; + while (tqshapeno>=firsttqshape && tqshape2lib[tqshapeno]>=-3) { - shape2lib[shapeno] = -4; - shapeno = jim.get_shape(shapeno).parent; + tqshape2lib[tqshapeno] = -4; + tqshapeno = jim.get_tqshape(tqshapeno).tqparent; } } // Code headers. - int rectype = REQUIRED_DICT_OR_RESET; - if (jim.get_inherited_shape_count() > 0) + int rectype = RETQUIRED_DICT_OR_RESET; + if (jim.get_inherited_tqshape_count() > 0) code_record(rectype, gjim, 0, 0); rectype = START_OF_DATA; code_record(rectype, gjim, 0, 0); @@ -456,41 +456,41 @@ JB2Dict::JB2Codec::Encode::code(const GP &gjim) { DJVU_PROGRESS_RUN(jb2code, blitno|0xff); JB2Blit *jblt = jim.get_blit(blitno); - int shapeno = jblt->shapeno; - JB2Shape &jshp = jim.get_shape(shapeno); - // Tests if shape exists in library - if (shape2lib[shapeno] >= 0) + int tqshapeno = jblt->tqshapeno; + JB2Shape &jshp = jim.get_tqshape(tqshapeno); + // Tests if tqshape exists in library + if (tqshape2lib[tqshapeno] >= 0) { int rectype = MATCHED_COPY; code_record(rectype, gjim, 0, jblt); } - // Avoid coding null shapes/blits + // Avoid coding null tqshapes/blits else if (jshp.bits) { - // Make sure all parents have been coded - if (jshp.parent>=0 && shape2lib[jshp.parent]<0) - encode_libonly_shape(gjim, jshp.parent); + // Make sure all tqparents have been coded + if (jshp.tqparent>=0 && tqshape2lib[jshp.tqparent]<0) + encode_libonly_tqshape(gjim, jshp.tqparent); // Allocate library entry when needed #define LIBRARY_CONTAINS_ALL int libraryp = 0; #ifdef LIBRARY_CONTAINS_MARKS // baseline - if (jshp.parent >= -1) + if (jshp.tqparent >= -1) libraryp = 1; #endif #ifdef LIBRARY_CONTAINS_SHARED // worse - if (shape2lib[shapeno] <= -3) + if (tqshape2lib[tqshapeno] <= -3) libraryp = 1; #endif #ifdef LIBRARY_CONTAINS_ALL // better libraryp = 1; #endif // Test all blit cases - if (jshp.parent<-1 && !libraryp) + if (jshp.tqparent<-1 && !libraryp) { int rectype = NON_MARK_DATA; code_record(rectype, gjim, &jshp, jblt); } - else if (jshp.parent < 0) + else if (jshp.tqparent < 0) { int rectype = (libraryp ? NEW_MARK : NEW_MARK_IMAGE_ONLY); code_record(rectype, gjim, &jshp, jblt); @@ -500,14 +500,14 @@ JB2Dict::JB2Codec::Encode::code(const GP &gjim) int rectype = (libraryp ? MATCHED_REFINE : MATCHED_REFINE_IMAGE_ONLY); code_record(rectype, gjim, &jshp, jblt); } - // Add shape to library + // Add tqshape to library if (libraryp) - add_library(shapeno, jshp); + add_library(tqshapeno, jshp); } // Check numcoder status if (cur_ncell > CELLCHUNK) { - rectype = REQUIRED_DICT_OR_RESET; + rectype = RETQUIRED_DICT_OR_RESET; code_record(rectype, 0, 0); } } @@ -522,31 +522,31 @@ JB2Dict::JB2Codec::Encode::code(const GP &gjim) //////////////////////////////////////// void -JB2Dict::JB2Codec::Encode::encode_libonly_shape( - const GP &gjim, int shapeno ) +JB2Dict::JB2Codec::Encode::encode_libonly_tqshape( + const GP &gjim, int tqshapeno ) { if(!gjim) { G_THROW( ERR_MSG("JB2Image.bad_number") ); } JB2Image &jim=*gjim; - // Recursively encode parent shape - JB2Shape &jshp = jim.get_shape(shapeno); - if (jshp.parent>=0 && shape2lib[jshp.parent]<0) - encode_libonly_shape(gjim, jshp.parent); - // Test that library shape must be encoded - if (shape2lib[shapeno] < 0) + // Recursively encode tqparent tqshape + JB2Shape &jshp = jim.get_tqshape(tqshapeno); + if (jshp.tqparent>=0 && tqshape2lib[jshp.tqparent]<0) + encode_libonly_tqshape(gjim, jshp.tqparent); + // Test that library tqshape must be encoded + if (tqshape2lib[tqshapeno] < 0) { // Code library entry - int rectype=(jshp.parent >= 0) + int rectype=(jshp.tqparent >= 0) ?NEW_MARK_LIBRARY_ONLY:MATCHED_REFINE_LIBRARY_ONLY; code_record(rectype, gjim, &jshp, 0); - // Add shape to library - add_library(shapeno, jshp); + // Add tqshape to library + add_library(tqshapeno, jshp); // Check numcoder status if (cur_ncell > CELLCHUNK) { - rectype = REQUIRED_DICT_OR_RESET; + rectype = RETQUIRED_DICT_OR_RESET; code_record(rectype, 0, 0); } } diff --git a/kviewshell/plugins/djvu/libdjvu/JB2Image.cpp b/kviewshell/plugins/djvu/libdjvu/JB2Image.cpp index 7aad9261..d6644cbc 100644 --- a/kviewshell/plugins/djvu/libdjvu/JB2Image.cpp +++ b/kviewshell/plugins/djvu/libdjvu/JB2Image.cpp @@ -110,7 +110,7 @@ protected: void code_comment(GUTF8String &comment); void code_record_type(int &rectype); int code_match_index(int &index, JB2Dict &jim); - void code_inherited_shape_count(JB2Dict &jim); + void code_inherited_tqshape_count(JB2Dict &jim); void code_image_size(JB2Dict &jim); void code_image_size(JB2Image &jim); void code_absolute_location(JB2Blit *jblt, int rows, int columns); @@ -136,28 +136,28 @@ private: JB2Dict::JB2Dict() - : inherited_shapes(0) + : inherited_tqshapes(0) { } void JB2Dict::init() { - inherited_shapes = 0; + inherited_tqshapes = 0; inherited_dict = 0; - shapes.empty(); + tqshapes.empty(); } JB2Shape & -JB2Dict::get_shape(const int shapeno) +JB2Dict::get_tqshape(const int tqshapeno) { JB2Shape *retval; - if(shapeno >= inherited_shapes) + if(tqshapeno >= inherited_tqshapes) { - retval=&shapes[shapeno - inherited_shapes]; + retval=&tqshapes[tqshapeno - inherited_tqshapes]; }else if(inherited_dict) { - retval=&(inherited_dict->get_shape(shapeno)); + retval=&(inherited_dict->get_tqshape(tqshapeno)); }else { G_THROW( ERR_MSG("JB2Image.bad_number") ); @@ -166,15 +166,15 @@ JB2Dict::get_shape(const int shapeno) } const JB2Shape & -JB2Dict::get_shape(const int shapeno) const +JB2Dict::get_tqshape(const int tqshapeno) const { const JB2Shape *retval; - if(shapeno >= inherited_shapes) + if(tqshapeno >= inherited_tqshapes) { - retval=&shapes[shapeno - inherited_shapes]; + retval=&tqshapes[tqshapeno - inherited_tqshapes]; }else if(inherited_dict) { - retval=&(inherited_dict->get_shape(shapeno)); + retval=&(inherited_dict->get_tqshape(tqshapeno)); }else { G_THROW( ERR_MSG("JB2Image.bad_number") ); @@ -185,16 +185,16 @@ JB2Dict::get_shape(const int shapeno) const void JB2Dict::set_inherited_dict(const GP &dict) { - if (shapes.size() > 0) + if (tqshapes.size() > 0) G_THROW( ERR_MSG("JB2Image.cant_set") ); if (inherited_dict) G_THROW( ERR_MSG("JB2Image.cant_change") ); inherited_dict = dict; - inherited_shapes = dict->get_shape_count(); + inherited_tqshapes = dict->get_tqshape_count(); // Make sure that inherited bitmaps are marked as shared - for (int i=0; iget_shape(i); + JB2Shape &jshp = dict->get_tqshape(i); if (jshp.bits) jshp.bits->share(); } } @@ -202,30 +202,30 @@ JB2Dict::set_inherited_dict(const GP &dict) void JB2Dict::compress() { - for (int i=shapes.lbound(); i<=shapes.hbound(); i++) - shapes[i].bits->compress(); + for (int i=tqshapes.lbound(); i<=tqshapes.hbound(); i++) + tqshapes[i].bits->compress(); } unsigned int JB2Dict::get_memory_usage() const { unsigned int usage = sizeof(JB2Dict); - usage += sizeof(JB2Shape) * shapes.size(); - for (int i=shapes.lbound(); i<=shapes.hbound(); i++) - if (shapes[i].bits) - usage += shapes[i].bits->get_memory_usage(); + usage += sizeof(JB2Shape) * tqshapes.size(); + for (int i=tqshapes.lbound(); i<=tqshapes.hbound(); i++) + if (tqshapes[i].bits) + usage += tqshapes[i].bits->get_memory_usage(); return usage; } int -JB2Dict::add_shape(const JB2Shape &shape) +JB2Dict::add_tqshape(const JB2Shape &tqshape) { - if (shape.parent >= get_shape_count()) - G_THROW( ERR_MSG("JB2Image.bad_parent_shape") ); - int index = shapes.size(); - shapes.touch(index); - shapes[index] = shape; - return index + inherited_shapes; + if (tqshape.tqparent >= get_tqshape_count()) + G_THROW( ERR_MSG("JB2Image.bad_parent_tqshape") ); + int index = tqshapes.size(); + tqshapes.touch(index); + tqshapes[index] = tqshape; + return index + inherited_tqshapes; } void @@ -277,8 +277,8 @@ JB2Image::set_dimension(int awidth, int aheight) int JB2Image::add_blit(const JB2Blit &blit) { - if (blit.shapeno >= (unsigned int)get_shape_count()) - G_THROW( ERR_MSG("JB2Image.bad_shape") ); + if (blit.tqshapeno >= (unsigned int)get_tqshape_count()) + G_THROW( ERR_MSG("JB2Image.bad_tqshape") ); int index = blits.size(); blits.touch(index); blits[index] = blit; @@ -298,9 +298,9 @@ JB2Image::get_bitmap(int subsample, int align) const for (int blitno = 0; blitno < get_blit_count(); blitno++) { const JB2Blit *pblit = get_blit(blitno); - const JB2Shape &pshape = get_shape(pblit->shapeno); - if (pshape.bits) - bm->blit(pshape.bits, pblit->left, pblit->bottom, subsample); + const JB2Shape &ptqshape = get_tqshape(pblit->tqshapeno); + if (ptqshape.bits) + bm->blit(ptqshape.bits, pblit->left, pblit->bottom, subsample); } return bm; } @@ -320,9 +320,9 @@ JB2Image::get_bitmap(const GRect &rect, int subsample, int align, int dispy) con for (int blitno = 0; blitno < get_blit_count(); blitno++) { const JB2Blit *pblit = get_blit(blitno); - const JB2Shape &pshape = get_shape(pblit->shapeno); - if (pshape.bits) - bm->blit(pshape.bits, pblit->left-rxmin, pblit->bottom-rymin+dispy, subsample); + const JB2Shape &ptqshape = get_tqshape(pblit->tqshapeno); + if (ptqshape.bits) + bm->blit(ptqshape.bits, pblit->left-rxmin, pblit->bottom-rymin+dispy, subsample); } return bm; } @@ -354,7 +354,7 @@ JB2Image::decode(const GP &gbs, JB2DecoderCallback *cb, void *arg) #define MATCHED_REFINE_IMAGE_ONLY (6) #define MATCHED_COPY (7) #define NON_MARK_DATA (8) -#define REQUIRED_DICT_OR_RESET (9) +#define RETQUIRED_DICT_OR_RESET (9) #define PRESERVED_COMMENT (10) #define END_OF_DATA (11) @@ -397,7 +397,7 @@ JB2Dict::JB2Codec::JB2Codec(const bool xencoding) abs_size_x(0), abs_size_y(0), image_size_dist(0), - inherited_shape_count_dist(0), + inherited_tqshape_count_dist(0), offset_type_dist(0), rel_loc_x_current(0), rel_loc_x_last(0), @@ -428,7 +428,7 @@ JB2Dict::JB2Codec::reset_numcoder() abs_size_x = 0; abs_size_y = 0; image_size_dist = 0; - inherited_shape_count_dist = 0; + inherited_tqshape_count_dist = 0; rel_loc_x_current = 0; rel_loc_x_last = 0; rel_loc_y_current = 0; @@ -573,27 +573,27 @@ JB2Dict::JB2Codec::Decode::code_comment(GUTF8String &comment) void JB2Dict::JB2Codec::init_library(JB2Dict &jim) { - int nshape = jim.get_inherited_shape_count(); - shape2lib.resize(0,nshape-1); - lib2shape.resize(0,nshape-1); - libinfo.resize(0,nshape-1); - for (int i=0; i dict = jim.get_inherited_dict(); if (!dict && size>0) @@ -653,7 +653,7 @@ JB2Dict::JB2Codec::Decode::code_inherited_shape_count(JB2Dict &jim) } if (!dict && size>0) G_THROW( ERR_MSG("JB2Image.need_dict") ); - if (dict && size!=dict->get_shape_count()) + if (dict && size!=dict->get_tqshape_count()) G_THROW( ERR_MSG("JB2Image.bad_dict") ); } } @@ -927,7 +927,7 @@ JB2Dict::JB2Codec::code_record( { GP cbm; GP bm; - int shapeno = -1; + int tqshapeno = -1; // Code record type code_record_type(rectype); @@ -946,7 +946,7 @@ JB2Dict::JB2Codec::code_record( if (!encoding) { jshp.bits = GBitmap::create(); - jshp.parent = -1; + jshp.tqparent = -1; } bm = jshp.bits; break; @@ -982,11 +982,11 @@ JB2Dict::JB2Codec::code_record( } JB2Dict &jim=*gjim; JB2Shape &jshp=*xjshp; - int match = code_match_index (jshp.parent, jim); - cbm = jim.get_shape(jshp.parent).bits; + int match = code_match_index (jshp.tqparent, jim); + cbm = jim.get_tqshape(jshp.tqparent).bits; LibRect &l = libinfo[match]; code_relative_mark_size (*bm, l.right-l.left+1, l.top-l.bottom+1, 4); - code_bitmap_by_cross_coding (*bm, cbm, jshp.parent); + code_bitmap_by_cross_coding (*bm, cbm, jshp.tqparent); break; } case PRESERVED_COMMENT: @@ -999,16 +999,16 @@ JB2Dict::JB2Codec::code_record( code_comment(jim.comment); break; } - case REQUIRED_DICT_OR_RESET: + case RETQUIRED_DICT_OR_RESET: { if (! gotstartrecordp) { - // Indicates need for a shape dictionary + // Indicates need for a tqshape dictionary if(!gjim) { G_THROW( ERR_MSG("JB2Image.bad_number") ); } - code_inherited_shape_count(*gjim); + code_inherited_tqshape_count(*gjim); }else // Reset all numerical contexts to zero reset_numcoder(); @@ -1026,7 +1026,7 @@ JB2Dict::JB2Codec::code_record( // Post-coding action if (!encoding) { - // add shape to dictionary + // add tqshape to dictionary switch(rectype) { case NEW_MARK_LIBRARY_ONLY: @@ -1037,8 +1037,8 @@ JB2Dict::JB2Codec::code_record( G_THROW( ERR_MSG("JB2Image.bad_number") ); } JB2Shape &jshp=*xjshp; - shapeno = gjim->add_shape(jshp); - add_library(shapeno, jshp); + tqshapeno = gjim->add_tqshape(jshp); + add_library(tqshapeno, jshp); break; } } @@ -1064,10 +1064,10 @@ JB2Dict::JB2Codec::Decode::code(const GP &gjim) // THIS IS THE DECODING PART // ------------------------- int rectype; - JB2Shape tmpshape; + JB2Shape tmptqshape; do { - code_record(rectype, gjim, &tmpshape); + code_record(rectype, gjim, &tmptqshape); } while(rectype != END_OF_DATA); if (!gotstartrecordp) @@ -1085,7 +1085,7 @@ JB2Dict::JB2Codec::code_record( { GP bm; GP cbm; - int shapeno = -1; + int tqshapeno = -1; int match; // Code record type @@ -1110,9 +1110,9 @@ JB2Dict::JB2Codec::code_record( if (!encoding) { jshp.bits = GBitmap::create(); - jshp.parent = -1; + jshp.tqparent = -1; if (rectype == NON_MARK_DATA) - jshp.parent = -2; + jshp.tqparent = -2; } bm = jshp.bits; break; @@ -1162,8 +1162,8 @@ JB2Dict::JB2Codec::code_record( } JB2Shape &jshp=*xjshp; JB2Image &jim=*gjim; - match = code_match_index (jshp.parent, jim); - cbm = jim.get_shape(jshp.parent).bits; + match = code_match_index (jshp.tqparent, jim); + cbm = jim.get_tqshape(jshp.tqparent).bits; LibRect &l = libinfo[match]; code_relative_mark_size (*bm, l.right-l.left+1, l.top-l.bottom+1, 4); code_bitmap_by_cross_coding (*bm, cbm, match); @@ -1178,8 +1178,8 @@ JB2Dict::JB2Codec::code_record( } JB2Image &jim=*gjim; JB2Shape &jshp=*xjshp; - match = code_match_index (jshp.parent, jim); - cbm = jim.get_shape(jshp.parent).bits; + match = code_match_index (jshp.tqparent, jim); + cbm = jim.get_tqshape(jshp.tqparent).bits; LibRect &l = libinfo[match]; code_relative_mark_size (*bm, l.right-l.left+1, l.top-l.bottom+1, 4); break; @@ -1192,8 +1192,8 @@ JB2Dict::JB2Codec::code_record( } JB2Image &jim=*gjim; JB2Shape &jshp=*xjshp; - match = code_match_index (jshp.parent, jim); - cbm = jim.get_shape(jshp.parent).bits; + match = code_match_index (jshp.tqparent, jim); + cbm = jim.get_tqshape(jshp.tqparent).bits; LibRect &l = libinfo[match]; code_relative_mark_size (*bm, l.right-l.left+1, l.top-l.bottom+1, 4); code_bitmap_by_cross_coding (*bm, cbm, match); @@ -1203,15 +1203,15 @@ JB2Dict::JB2Codec::code_record( case MATCHED_COPY: { int temp; - if (encoding) temp = jblt->shapeno; + if (encoding) temp = jblt->tqshapeno; if(!gjim) { G_THROW( ERR_MSG("JB2Image.bad_number") ); } JB2Image &jim=*gjim; match = code_match_index (temp, jim); - if (!encoding) jblt->shapeno = temp; - bm = jim.get_shape(jblt->shapeno).bits; + if (!encoding) jblt->tqshapeno = temp; + bm = jim.get_tqshape(jblt->tqshapeno).bits; LibRect &l = libinfo[match]; jblt->left += l.left; jblt->bottom += l.bottom; @@ -1240,7 +1240,7 @@ JB2Dict::JB2Codec::code_record( code_comment(jim.comment); break; } - case REQUIRED_DICT_OR_RESET: + case RETQUIRED_DICT_OR_RESET: { if(!gjim) { @@ -1248,8 +1248,8 @@ JB2Dict::JB2Codec::code_record( } JB2Image &jim=*gjim; if (! gotstartrecordp) - // Indicates need for a shape dictionary - code_inherited_shape_count(jim); + // Indicates need for a tqshape dictionary + code_inherited_tqshape_count(jim); else // Reset all numerical contexts to zero reset_numcoder(); @@ -1268,7 +1268,7 @@ JB2Dict::JB2Codec::code_record( // Post-coding action if (!encoding) { - // add shape to image + // add tqshape to image switch(rectype) { case NEW_MARK: @@ -1284,13 +1284,13 @@ JB2Dict::JB2Codec::code_record( G_THROW( ERR_MSG("JB2Image.bad_number") ); } JB2Shape &jshp=*xjshp; - shapeno = gjim->add_shape(jshp); - shape2lib.touch(shapeno); - shape2lib[shapeno] = -1; + tqshapeno = gjim->add_tqshape(jshp); + tqshape2lib.touch(tqshapeno); + tqshape2lib[tqshapeno] = -1; break; } } - // add shape to library + // add tqshape to library switch(rectype) { case NEW_MARK: @@ -1301,7 +1301,7 @@ JB2Dict::JB2Codec::code_record( { G_THROW( ERR_MSG("JB2Image.bad_number") ); } - add_library(shapeno, *xjshp); + add_library(tqshapeno, *xjshp); break; } // make sure everything is compacted @@ -1316,7 +1316,7 @@ JB2Dict::JB2Codec::code_record( case MATCHED_REFINE: case MATCHED_REFINE_IMAGE_ONLY: case NON_MARK_DATA: - jblt->shapeno = shapeno; + jblt->tqshapeno = tqshapeno; case MATCHED_COPY: if(!gjim) { @@ -1344,10 +1344,10 @@ JB2Dict::JB2Codec::Decode::code(const GP &gjim) // ------------------------- int rectype; JB2Blit tmpblit; - JB2Shape tmpshape; + JB2Shape tmptqshape; do { - code_record(rectype, gjim, &tmpshape, &tmpblit); + code_record(rectype, gjim, &tmptqshape, &tmpblit); } while(rectype!=END_OF_DATA); if (!gotstartrecordp) diff --git a/kviewshell/plugins/djvu/libdjvu/JB2Image.h b/kviewshell/plugins/djvu/libdjvu/JB2Image.h index f55ae451..95b7bf26 100644 --- a/kviewshell/plugins/djvu/libdjvu/JB2Image.h +++ b/kviewshell/plugins/djvu/libdjvu/JB2Image.h @@ -83,47 +83,47 @@ be implemented in the future. {\bf JB2 Images} --- Class \Ref{JB2Image} is the central data structure - implemented here. A #JB2Image# is composed of an array of shapes - and an array of blits. Each shape contains a small bitmap representing an + implemented here. A #JB2Image# is composed of an array of tqshapes + and an array of blits. Each tqshape contains a small bitmap representing an elementary blob of ink, such as a character or a segment of line art. - Each blit instructs the decoder to render a particular shape at a + Each blit instructs the decoder to render a particular tqshape at a specified position in the image. Some compression is already achieved - because several blits can refer to the same shape. A shape can also - contain a pointer to a parent shape. Additional compression is achieved - when both shapes are similar because each shape is encoded using the - parent shape as a model. A #"O"# shape for instance could be a parent for - both a #"C"# shape and a #"Q"# shape. + because several blits can refer to the same tqshape. A tqshape can also + contain a pointer to a tqparent tqshape. Additional compression is achieved + when both tqshapes are similar because each tqshape is encoded using the + tqparent tqshape as a model. A #"O"# tqshape for instance could be a tqparent for + both a #"C"# tqshape and a #"Q"# tqshape. {\bf JB2 Dictionary} --- Class \Ref{JB2Dict} is a peculiar kind of - JB2Image which only contains an array of shapes. These shapes can be + JB2Image which only contains an array of tqshapes. These tqshapes can be referenced from another JB2Dict/JB2Image. This is arranged by setting the ``inherited dictionary'' of a JB2Dict/JB2Image using function - \Ref{JB2Dict::set_inherited_dict}. Several JB2Images can use shapes from a + \Ref{JB2Dict::set_inherited_dict}. Several JB2Images can use tqshapes from a same JB2Dict encoded separately. This is how several pages of a same document can share information. {\bf Decoding JB2 data} --- The first step for decoding JB2 data consists of creating an empty #JB2Image# object. Function \Ref{JB2Image::decode} then - reads the data and populates the #JB2Image# with the shapes and the blits. + reads the data and populates the #JB2Image# with the tqshapes and the blits. Function \Ref{JB2Image::get_bitmap} finally produces an anti-aliased image. {\bf Encoding JB2 data} --- The first step for decoding JB2 data also consists of creating an empty #JB2Image# object. You must then use - functions \Ref{JB2Image::add_shape} and \Ref{JB2Image::add_blit} to + functions \Ref{JB2Image::add_tqshape} and \Ref{JB2Image::add_blit} to populate the #JB2Image# object. Function \Ref{JB2Image::encode} finally produces the JB2 data. Function #encode# sequentially encodes the blits - and the necessary shapes. The compression ratio depends on several + and the necessary tqshapes. The compression ratio depends on several factors: \begin{itemize} - \item Blits should reuse shapes as often as possible. + \item Blits should reuse tqshapes as often as possible. \item Blits should be sorted in reading order because this facilitates the prediction of the blit coordinates. \item Shapes should be sorted according to the order of first appearance in the sequence of blits because this facilitates the prediction of the - shape indices. - \item Shapes should be compared to all previous shapes in the shape array. - The shape parent pointer should be set to a suitable parent shape if - such a parent shape exists. The parent shape should have almost the + tqshape indices. + \item Shapes should be compared to all previous tqshapes in the tqshape array. + The tqshape tqparent pointer should be set to a suitable tqparent tqshape if + such a tqparent tqshape exists. The tqparent tqshape should have almost the same size and the same pixels. \end{itemize} All this is quite easy to achieve in the case of an electronically @@ -131,16 +131,16 @@ characters are and where they are located. If you only have a scanned image however you must first locate the characters (connected component analysis) and cut the remaining pieces of ink into smaller blobs. - Ordering the blits and matching the shapes is then an essentially + Ordering the blits and matching the tqshapes is then an essentially heuristic process. Although the quality of the heuristics substantially - effects the file size, misordering blits or mismatching shapes never + effects the file size, misordering blits or mismatching tqshapes never effects the quality of the image. The last refinement consists in - smoothing the shapes in order to reduce the noise and maximize the - similarities between shapes. + smoothing the tqshapes in order to reduce the noise and maximize the + similarities between tqshapes. {\bf JB2 extensions} --- Two extensions of the JB2 encoding format have been introduced with DjVu files version 21. The first - extension addresses the shared shape dictionaries. The second extension + extension addresses the shared tqshape dictionaries. The second extension bounds the number of probability contexts used for coding numbers. Both extensions maintain backward compatibility with JB2 as described in the ICFDD proposal. A more complete discussion @@ -190,42 +190,42 @@ class ByteStream; /** Blit data structure. A #JB2Image# contains an array of #JB2Blit# data structures. Each array entry instructs the decoder to render a particular - shape at a particular location. Members #left# and #bottom# specify the - coordinates of the bottom left corner of the shape bitmap. All + tqshape at a particular location. Members #left# and #bottom# specify the + coordinates of the bottom left corner of the tqshape bitmap. All coordinates are relative to the bottom left corner of the image. Member - #shapeno# is the subscript of the shape to be rendered. */ + #tqshapeno# is the subscript of the tqshape to be rendered. */ class JB2Blit { public: - /** Horizontal coordinate of the blit. */ + /**Qt::Horizontal coordinate of the blit. */ unsigned short left; - /** Vertical coordinate of the blit. */ + /**Qt::Vertical coordinate of the blit. */ unsigned short bottom; - /** Index of the shape to blit. */ - unsigned int shapeno; + /** Index of the tqshape to blit. */ + unsigned int tqshapeno; }; /** Shape data structure. A #JB2Image# contains an array of #JB2Shape# data structures. Each array entry represents an elementary blob of ink such as a character or a segment of line art. Member #bits# points to a bilevel - image representing the shape pixels. Member #parent# is the subscript of - the parent shape. */ + image representing the tqshape pixels. Member #tqparent# is the subscript of + the tqparent tqshape. */ class JB2Shape { public: - /** Subscript of the parent shape. The parent shape must always be located - before the current shape in the shape array. A negative value indicates - that this shape has no parent. Any negative values smaller than #-1# - further indicates that this shape does not look like a character. This + /** Subscript of the tqparent tqshape. The tqparent tqshape must always be located + before the current tqshape in the tqshape array. A negative value indicates + that this shape.has no tqparent. Any negative values smaller than #-1# + further indicates that this tqshape does not look like a character. This is used to enable a few internal optimizations. This information is - saved into the JB2 file, but the actual value of the #parent# variable + saved into the JB2 file, but the actual value of the #tqparent# variable is not. */ - int parent; - /** Bilevel image of the shape pixels. This must be a pointer to a bilevel + int tqparent; + /** Bilevel image of the tqshape pixels. This must be a pointer to a bilevel #GBitmap# image. This pointer can also be null. The encoder will just - silently discard all blits referring to a shape containing a null + silently discard all blits referring to a tqshape containing a null bitmap. */ GP bits; /** Private user data. This long word is provided as a convenience for users @@ -238,14 +238,14 @@ public: /** JB2 Dictionary callback. The decoding function call this callback function when they discover that - the current JB2Image or JB2Dict needs a pre-existing shape dictionary. + the current JB2Image or JB2Dict needs a pre-existing tqshape dictionary. The callback function must return a pointer to the dictionary or NULL if none is found. */ typedef GP JB2DecoderCallback ( void* ); -/** Dictionary of JB2 shapes. */ +/** Dictionary of JB2 tqshapes. */ class JB2Dict : public GPEnabled { @@ -257,43 +257,43 @@ public: // CONSTRUCTION /** Default creator. Constructs an empty #JB2Dict# object. You can then call the decoding function #decode#. You can also manually set the - image size using #add_shape#. */ + image size using #add_tqshape#. */ static GP create(void); // INITIALIZATION - /** Resets the #JB2Image# object. This function reinitializes both the shape + /** Resets the #JB2Image# object. This function reinitializes both the tqshape and the blit arrays. All allocated memory is freed. */ void init(void); // INHERITED /** Returns the inherited dictionary. */ GP get_inherited_dict(void) const; - /** Returns the number of inherited shapes. */ - int get_inherited_shape_count(void) const; + /** Returns the number of inherited tqshapes. */ + int get_inherited_tqshape_count(void) const; /** Sets the inherited dictionary. */ void set_inherited_dict(const GP &dict); // ACCESSING THE SHAPE LIBRARY - /** Returns the total number of shapes. - Shape indices range from #0# to #get_shape_count()-1#. */ - int get_shape_count(void) const; - /** Returns a pointer to shape #shapeno#. - The returned pointer directly points into the shape array. - This pointer can be used for reading or writing the shape data. */ - JB2Shape &get_shape(const int shapeno); - /** Returns a constant pointer to shape #shapeno#. - The returned pointer directly points into the shape array. - This pointer can only be used for reading the shape data. */ - const JB2Shape &get_shape(const int shapeno) const; - /** Appends a shape to the shape array. This function appends a copy of - shape #shape# to the shape array and returns the subscript of the new - shape. The subscript of the parent shape #shape.parent# must - actually designate an already existing shape. */ - int add_shape(const JB2Shape &shape); + /** Returns the total number of tqshapes. + Shape indices range from #0# to #get_tqshape_count()-1#. */ + int get_tqshape_count(void) const; + /** Returns a pointer to tqshape #tqshapeno#. + The returned pointer directly points into the tqshape array. + This pointer can be used for reading or writing the tqshape data. */ + JB2Shape &get_tqshape(const int tqshapeno); + /** Returns a constant pointer to tqshape #tqshapeno#. + The returned pointer directly points into the tqshape array. + This pointer can only be used for reading the tqshape data. */ + const JB2Shape &get_tqshape(const int tqshapeno) const; + /** Appends a tqshape to the tqshape array. This function appends a copy of + tqshape #tqshape# to the tqshape array and returns the subscript of the new + tqshape. The subscript of the tqparent tqshape #tqshape.tqparent# must + actually designate an already existing tqshape. */ + int add_tqshape(const JB2Shape &tqshape); // MEMORY OPTIMIZATION - /** Compresses all shape bitmaps. This function reduces the memory required - by the #JB2Image# by calling \Ref{GBitmap::compress} on all shapes + /** Compresses all tqshape bitmaps. This function reduces the memory required + by the #JB2Image# by calling \Ref{GBitmap::compress} on all tqshapes bitmaps. This function is best called after decoding a #JB2Image#, because function \Ref{get_bitmap} can directly use the compressed bitmaps. */ @@ -307,9 +307,9 @@ public: This function generates the JB2 data stream without any header. */ void encode(const GP &gbs) const; /** Decodes JB2 data from ByteStream #bs#. This function decodes the image - size and populates the shape and blit arrays. The callback function + size and populates the tqshape and blit arrays. The callback function #cb# is called when the decoder determines that the ByteStream data - requires a shape dictionary which has not been set with + requires a tqshape dictionary which has not been set with \Ref{JB2Dict::set_inherited_dict}. The callback receives argument #arg# and must return a suitable dictionary which will be installed as the inherited dictionary. The callback should return null if no such @@ -322,15 +322,15 @@ public: GUTF8String comment; private: - int inherited_shapes; + int inherited_tqshapes; GP inherited_dict; - GArray shapes; + GArray tqshapes; }; -/** Main JB2 data structure. Each #JB2Image# consists of an array of shapes +/** Main JB2 data structure. Each #JB2Image# consists of an array of tqshapes and an array of blits. These arrays can be populated by hand using - functions \Ref{add_shape} and \Ref{add_blit}, or by decoding JB2 data + functions \Ref{add_tqshape} and \Ref{add_blit}, or by decoding JB2 data using function \Ref{decode}. You can then use function \Ref{get_bitmap} to render anti-aliased images, or use function \Ref{encode} to generate JB2 data. */ @@ -343,12 +343,12 @@ public: /** Creates an empty #JB2Image# object. You can then call the decoding function #decode#. You can also manually set the - image size using #set_dimension# and populate the shape and blit arrays - using #add_shape# and #add_blit#. */ + image size using #set_dimension# and populate the tqshape and blit arrays + using #add_tqshape# and #add_blit#. */ static GP create(void) { return new JB2Image(); } // INITIALIZATION - /** Resets the #JB2Image# object. This function reinitializes both the shape + /** Resets the #JB2Image# object. This function reinitializes both the tqshape and the blit arrays. All allocated memory is freed. */ void init(void); @@ -370,7 +370,7 @@ public: JB2Image as a bilevel or gray level image. Argument #subsample# specifies the desired subsampling ratio in range #1# to #15#. The returned image uses #1+subsample^2# gray levels for representing - anti-aliased edges. Argument #align# specified the alignment of the + anti-aliased edges. Argument #align# specified the tqalignment of the rows of the returned images. Setting #align# to #4#, for instance, will adjust the bitmap border in order to make sure that each row of the returned image starts on a word (four byte) boundary. */ @@ -380,7 +380,7 @@ public: this function first renders the full JB2Image with subsampling ratio #subsample# and then extracts rectangle #rect# in the subsampled image. Both operations of course are efficiently performed simultaneously. - Argument #align# specified the alignment of the rows of the returned + Argument #align# specified the tqalignment of the rows of the returned images, as explained above. Argument #dispy# should remain null. */ GP get_bitmap(const GRect &rect, int subsample=1, int align=1, int dispy=0) const; @@ -393,13 +393,13 @@ public: This pointer can be used for reading or writing the blit data. */ JB2Blit *get_blit(int blitno); /** Returns a constant pointer to blit #blitno#. - The returned pointer directly points into the shape array. - This pointer can only be used for reading the shape data. */ + The returned pointer directly points into the tqshape array. + This pointer can only be used for reading the tqshape data. */ const JB2Blit *get_blit(int blitno) const; /** Appends a blit to the blit array. This function appends a copy of blit #blit# to the blit array and returns the subscript of the new blit. The - shape subscript #blit.shapeno# must actually designate an already - existing shape. */ + tqshape subscript #blit.tqshapeno# must actually designate an already + existing tqshape. */ int add_blit(const JB2Blit &blit); // MEMORY OPTIMIZATION @@ -412,9 +412,9 @@ public: This function generates the JB2 data stream without any header. */ void encode(const GP &gbs) const; /** Decodes JB2 data from ByteStream #bs#. This function decodes the image - size and populates the shape and blit arrays. The callback function + size and populates the tqshape and blit arrays. The callback function #cb# is called when the decoder determines that the ByteStream data - requires a shape dictionary which has not been set with + requires a tqshape dictionary which has not been set with \Ref{JB2Dict::set_inherited_dict}. The callback receives argument #arg# and must return a suitable dictionary which will be installed as the inherited dictionary. The callback should return null if no such @@ -438,15 +438,15 @@ public: // JB2DICT INLINE FUNCTIONS inline int -JB2Dict::get_shape_count(void) const +JB2Dict::get_tqshape_count(void) const { - return inherited_shapes + shapes.size(); + return inherited_tqshapes + tqshapes.size(); } inline int -JB2Dict::get_inherited_shape_count(void) const +JB2Dict::get_inherited_tqshape_count(void) const { - return inherited_shapes; + return inherited_tqshapes; } inline GP @@ -501,7 +501,7 @@ JB2Image::get_blit(int blitno) const These extensions are described below by reference to the ICFDD proposal dated August 1999. Both extension make use of the unused record type value #9# (cf. ICFDD page 24) which has been renamed - #REQUIRED_DICT_OR_RESET#. + #RETQUIRED_DICT_OR_RESET#. {\bf Shared Shape Dictionaries} --- This extension provides support for sharing symbol definitions between the pages of a @@ -515,7 +515,7 @@ JB2Image::get_blit(int blitno) const by the following records. The first record usually is a ``Start Of Image'' record describing the size of the image. - Starting with version 21, a #REQUIRED_DICT_OR_RESET# (9) record + Starting with version 21, a #RETQUIRED_DICT_OR_RESET# (9) record type can appear {\em before} the #START_OF_DATA# (0) record. The record type field is followed by a single number arithmetically encoded (cf. ICFDD page 26) using a sixteenth context (cf. ICFDD @@ -548,7 +548,7 @@ JB2Image::get_blit(int blitno) const contexts. These contexts are normally allocated when they are used for the first time (cf. ICFDD informative note, page 27). - Starting with version 21, a #REQUIRED_DICT_OR_RESET# (9) record + Starting with version 21, a #RETQUIRED_DICT_OR_RESET# (9) record type can appear {\em after} the #START_OF_DATA# (0) record. The decoder should proceed with the next record after {\em clearing all binary contexts used for coding numbers}. This operation @@ -556,7 +556,7 @@ JB2Image::get_blit(int blitno) const numbers can be deallocated. Starting with version 21, the JB2 encoder should insert a - #REQUIRED_DICT_OR_RESET# record type whenever the number of these + #RETQUIRED_DICT_OR_RESET# record type whenever the number of these allocated binary contexts exceeds #20000#. Only very large documents ever reach such a large number of allocated binary contexts (e.g large maps). Hardware implementation however can @@ -612,7 +612,7 @@ protected: void reset_numcoder(void); inline void code_eventual_lossless_refinement(void); void init_library(JB2Dict &jim); - int add_library(const int shapeno, JB2Shape &jshp); + int add_library(const int tqshapeno, JB2Shape &jshp); void code_relative_location(JB2Blit *jblt, int rows, int columns); void code_bitmap_directly (GBitmap &bm); void code_bitmap_by_cross_coding (GBitmap &bm, GP &cbm, const int libno); @@ -640,7 +640,7 @@ protected: virtual void code_comment(GUTF8String &comment) = 0; virtual void code_record_type(int &rectype) = 0; virtual int code_match_index(int &index, JB2Dict &jim)=0; - virtual void code_inherited_shape_count(JB2Dict &jim)=0; + virtual void code_inherited_tqshape_count(JB2Dict &jim)=0; virtual void code_image_size(JB2Dict &jim); virtual void code_image_size(JB2Image &jim); virtual void code_absolute_location(JB2Blit *jblt, int rows, int columns)=0; @@ -678,8 +678,8 @@ protected: NumContext dist_match_index; BitContext dist_refinement_flag; // Library - GTArray shape2lib; - GTArray lib2shape; + GTArray tqshape2lib; + GTArray lib2tqshape; GTArray libinfo; // Code pairs NumContext abs_loc_x; @@ -687,7 +687,7 @@ protected: NumContext abs_size_x; NumContext abs_size_y; NumContext image_size_dist; - NumContext inherited_shape_count_dist; + NumContext inherited_tqshape_count_dist; BitContext offset_type_dist; NumContext rel_loc_x_current; NumContext rel_loc_x_last; diff --git a/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp b/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp index b14220d1..eace389e 100644 --- a/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp +++ b/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp @@ -603,7 +603,7 @@ MMRDecoder::scanruns(const unsigned short **endptr) b1 += *pr++; break; } - /* Horizontal Mode */ + /*Qt::Horizontal Mode */ case H: { // First run @@ -617,7 +617,7 @@ MMRDecoder::scanruns(const unsigned short **endptr) *xr = rle; xr++; rle = 0; break; } - /* Vertical Modes */ + /*Qt::Vertical Modes */ case V0: case VR3: case VR2: @@ -933,16 +933,16 @@ MMRDecoder::decode(GP gbs) // Insert blocks into JB2Image for (int b=0; bcompress(); + tqshape.tqparent = -1; + tqshape.bits->compress(); JB2Blit blit; blit.left = b*blocksize; blit.bottom = line+1; - blit.shapeno = jimg->add_shape(shape); + blit.tqshapeno = jimg->add_tqshape(tqshape); jimg->add_blit(blit); } } diff --git a/kviewshell/plugins/djvu/libdjvu/MMRDecoder.h b/kviewshell/plugins/djvu/libdjvu/MMRDecoder.h index 6516b4cd..7340bfea 100644 --- a/kviewshell/plugins/djvu/libdjvu/MMRDecoder.h +++ b/kviewshell/plugins/djvu/libdjvu/MMRDecoder.h @@ -81,9 +81,9 @@ class JB2Image; CCITT-G4/MMR decoder suitable for use in DjVu. The main entry point is function \Ref{MMRDecoder::decode}. - The foreground mask layer of a DjVu file is usually encoded with a + The foreground tqmask layer of a DjVu file is usually encoded with a #"Sjbz"# chunk containing JB2 encoded data (cf. \Ref{JB2Image.h}). - Alternatively, the qmask layer may be encoded with a #"Smmr"# + Alternatively, the qtqmask layer may be encoded with a #"Smmr"# chunk containing a small header followed by MMR encoded data. This encoding scheme produces significantly larger files. On the other hand, many scanners a printers talk MMR using very efficient diff --git a/kviewshell/plugins/djvu/libdjvu/XMLParser.cpp b/kviewshell/plugins/djvu/libdjvu/XMLParser.cpp index b1d9f469..b936affb 100644 --- a/kviewshell/plugins/djvu/libdjvu/XMLParser.cpp +++ b/kviewshell/plugins/djvu/libdjvu/XMLParser.cpp @@ -301,7 +301,7 @@ lt_XMLParser::Impl::ChangeAnno( const GP ganno(DjVuAnno::create()); DjVuAnno &anno=*ganno; GPosition map_pos; - map_pos=map.contains(areatag); + map_pos=map.tqcontains(areatag); if(dfile.contains_anno()) { GP annobs=dfile.get_merged_anno(); @@ -350,7 +350,7 @@ lt_XMLParser::Impl::ChangeAnno( // with no matching y). // ****************************************************** { - GPosition coords_pos=args.contains("coords"); + GPosition coords_pos=args.tqcontains("coords"); if(coords_pos) { GList raw_coords; @@ -373,20 +373,20 @@ lt_XMLParser::Impl::ChangeAnno( } } } - GUTF8String shape; + GUTF8String tqshape; { - GPosition shape_pos=args.contains("shape"); - if(shape_pos) + GPosition tqshape_pos=args.tqcontains("tqshape"); + if(tqshape_pos) { - shape=args[shape_pos]; + tqshape=args[tqshape_pos]; } } GP a; - if(shape == "default") + if(tqshape == "default") { GRect rect(0,0,w,h); a=GMapRect::create(rect); - }else if(!shape.length() || shape == "rect") + }else if(!tqshape.length() || tqshape == "rect") { int xx[4]; int i=0; @@ -420,7 +420,7 @@ lt_XMLParser::Impl::ChangeAnno( } GRect rect(xmin,ymin,xmax-xmin,ymax-ymin); a=GMapRect::create(rect); - }else if(shape == "circle") + }else if(tqshape == "circle") { int xx[4]; int i=0; @@ -440,7 +440,7 @@ lt_XMLParser::Impl::ChangeAnno( int x=xx[0],y=xx[1],rx=xx[2],ry=(h-xx[3])-1; GRect rect(x-rx,y-ry,2*rx,2*ry); a=GMapOval::create(rect); - }else if(shape == "oval") + }else if(tqshape == "oval") { int xx[4]; int i=0; @@ -474,7 +474,7 @@ lt_XMLParser::Impl::ChangeAnno( } GRect rect(xmin,ymin,xmax-xmin,ymax-ymin); a=GMapOval::create(rect); - }else if(shape == "poly") + }else if(tqshape == "poly") { GP p=GMapPoly::create(); for(GPosition poly_pos=coords;poly_pos;++poly_pos) @@ -489,28 +489,28 @@ lt_XMLParser::Impl::ChangeAnno( a=p; }else { - G_THROW( ( ERR_MSG("XMLAnno.unknown_shape") "\t")+shape ); + G_THROW( ( ERR_MSG("XMLAnno.unknown_tqshape") "\t")+tqshape ); } if(a) { GPosition pos; - if((pos=args.contains("href"))) + if((pos=args.tqcontains("href"))) { a->url=args[pos]; } - if((pos=args.contains("target"))) + if((pos=args.tqcontains("target"))) { a->target=args[pos]; } - if((pos=args.contains("alt"))) + if((pos=args.tqcontains("alt"))) { a->comment=args[pos]; } - if((pos=args.contains("bordertype"))) + if((pos=args.tqcontains("bordertype"))) { GUTF8String b=args[pos]; static const GMap typeMap=BorderTypeMap(); - if((pos=typeMap.contains(b))) + if((pos=typeMap.tqcontains(b))) { a->border_type=typeMap[pos]; }else @@ -518,16 +518,16 @@ lt_XMLParser::Impl::ChangeAnno( G_THROW( (ERR_MSG("XMLAnno.unknown_border") "\t")+b ); } } - a->border_always_visible=!!args.contains("visible"); - if((pos=args.contains("bordercolor"))) + a->border_always_visible=!!args.tqcontains("visible"); + if((pos=args.tqcontains("bordercolor"))) { a->border_color=convertToColor(args[pos]); } - if((pos=args.contains("highlight"))) + if((pos=args.tqcontains("highlight"))) { a->hilite_color=convertToColor(args[pos]); } - if((pos=args.contains("border"))) + if((pos=args.tqcontains("border"))) { a->border_width=args[pos].toInt(); //atoi(args[pos]); } @@ -548,7 +548,7 @@ lt_XMLParser::Impl::get_file(const GURL &url,GUTF8String id) GP doc; GCriticalSectionLock lock(&xmlparser_lock); { - GPosition pos=m_docs.contains(url.get_string()); + GPosition pos=m_docs.tqcontains(url.get_string()); if(pos) { doc=m_docs[pos]; @@ -572,10 +572,10 @@ lt_XMLParser::Impl::get_file(const GURL &url,GUTF8String id) } } const GURL fileurl(doc->id_to_url(id)); - GPosition dpos(m_files.contains(fileurl.get_string())); + GPosition dpos(m_files.tqcontains(fileurl.get_string())); if(!dpos) { - if(!doc->get_id_list().contains(id)) + if(!doc->get_id_list().tqcontains(id)) { G_THROW( ERR_MSG("XMLAnno.bad_page") ); } @@ -622,7 +622,7 @@ lt_XMLParser::Impl::parse(const lt_XMLTags &tags) GURL codebase; { DEBUG_MSG("Setting up codebase... m_codebase = " << m_codebase << "\n"); - GPosition codebasePos=args.contains("codebase"); + GPosition codebasePos=args.tqcontains("codebase"); // If user specified a codebase attribute, assume it is correct (absolute URL): // the GURL constructor will throw an exception if it isn't if(codebasePos) @@ -642,11 +642,11 @@ lt_XMLParser::Impl::parse(const lt_XMLTags &tags) // URL (for now, just a path and file name). If it's absolute, // our GURL will adequately wrap it. If it's relative, we need // to use the codebase attribute to form an absolute URL first. - GPosition datapos=args.contains("data"); + GPosition datapos=args.tqcontains("data"); if(datapos) { bool isDjVuType=false; - GPosition typePos(args.contains("type")); + GPosition typePos(args.tqcontains("type")); if(typePos) { if(args[typePos] != mimetype) @@ -659,12 +659,12 @@ lt_XMLParser::Impl::parse(const lt_XMLTags &tags) const GURL url=GURL::UTF8(args[datapos],(args[datapos][0] == '/')?codebase.base():codebase); int width; { - GPosition widthPos=args.contains("width"); + GPosition widthPos=args.tqcontains("width"); width=(widthPos)?args[widthPos].toInt():0; } int height; { - GPosition heightPos=args.contains("height"); + GPosition heightPos=args.tqcontains("height"); height=(heightPos)?args[heightPos].toInt():0; } GUTF8String gamma; @@ -672,17 +672,17 @@ lt_XMLParser::Impl::parse(const lt_XMLTags &tags) GUTF8String page; GUTF8String do_ocr; { - GPosition paramPos(GObject.contains(paramtag)); + GPosition paramPos(GObject.tqcontains(paramtag)); if(paramPos) { const GPList Params(GObject[paramPos]); for(GPosition loc=Params;loc;++loc) { const GMap &pargs=Params[loc]->get_args(); - GPosition namepos=pargs.contains("name"); + GPosition namepos=pargs.tqcontains("name"); if(namepos) { - GPosition valuepos=pargs.contains("value"); + GPosition valuepos=pargs.tqcontains("value"); if(valuepos) { const GUTF8String name=pargs[namepos].downcase(); @@ -691,19 +691,19 @@ lt_XMLParser::Impl::parse(const lt_XMLTags &tags) { GMap args; lt_XMLTags::ParseValues(value,args,true); - if(args.contains("page")) + if(args.tqcontains("page")) { page=args["page"]; } - if(args.contains("dpi")) + if(args.tqcontains("dpi")) { dpi=args["dpi"]; } - if(args.contains("gamma")) + if(args.tqcontains("gamma")) { gamma=args["gamma"]; } - if(args.contains("ocr")) + if(args.tqcontains("ocr")) { do_ocr=args["ocr"]; } @@ -749,14 +749,14 @@ lt_XMLParser::Impl::parse_anno( { GP map; { - GPosition usemappos=GObject.get_args().contains("usemap"); + GPosition usemappos=GObject.get_args().tqcontains("usemap"); if(usemappos) { const GUTF8String mapname(GObject.get_args()[usemappos]); - GPosition mappos=Maps.contains(mapname); + GPosition mappos=Maps.tqcontains(mapname); if(!mappos) { - G_THROW((ERR_MSG("XMLAnno.map_find") "\t")+mapname ); + G_THROW((ERR_MSG("XMLAnno.map_tqfind") "\t")+mapname ); }else { map=Maps[mappos]; @@ -782,10 +782,10 @@ static inline TYPE min(TYPE a,TYPE b) { return (aztype = DjVuTXT::WORD; sepchar=' '; }else if(name == linetag) { - self_ptr=parent.append_child(); + self_ptr=tqparent.append_child(); self_ptr->ztype = DjVuTXT::LINE; sepchar=DjVuTXT::end_of_line; }else if(name == paragraphtag) { - self_ptr=parent.append_child(); + self_ptr=tqparent.append_child(); self_ptr->ztype = DjVuTXT::PARAGRAPH; sepchar=DjVuTXT::end_of_paragraph; }else if(name == regiontag) { - self_ptr=parent.append_child(); + self_ptr=tqparent.append_child(); self_ptr->ztype = DjVuTXT::REGION; sepchar=DjVuTXT::end_of_region; }else if(name == pagecolumntag) { - self_ptr=parent.append_child(); + self_ptr=tqparent.append_child(); self_ptr->ztype = DjVuTXT::COLUMN; sepchar=DjVuTXT::end_of_column; }else { - self_ptr = &parent; + self_ptr = &tqparent; self_ptr->ztype = DjVuTXT::PAGE; sepchar=0; } @@ -833,12 +833,12 @@ make_child_layer( int &xmin=self.rect.xmin, &ymin=self.rect.ymin, &xmax=self.rect.xmax, &ymax=self.rect.ymax; GRect default_rect; - default_rect.xmin=max(parent.rect.xmax,parent.rect.xmin); - default_rect.xmax=min(parent.rect.xmax,parent.rect.xmin); - default_rect.ymin=max(parent.rect.ymax,parent.rect.ymin); - default_rect.ymax=min(parent.rect.ymax,parent.rect.ymin); + default_rect.xmin=max(tqparent.rect.xmax,tqparent.rect.xmin); + default_rect.xmax=min(tqparent.rect.xmax,tqparent.rect.xmin); + default_rect.ymin=max(tqparent.rect.ymax,tqparent.rect.ymin); + default_rect.ymax=min(tqparent.rect.ymax,tqparent.rect.ymin); // Now if there are coordinates, use those. - GPosition pos(tag.get_args().contains("coords")); + GPosition pos(tag.get_args().tqcontains("coords")); if(pos) { GList rectArgs; @@ -926,7 +926,7 @@ make_child_layer( }else { // If the child doesn't have coordinates, we need to use a box - // at least as big as the parent's coordinates. + // at least as big as the tqparent's coordinates. xmin=min(save_rect.xmin,default_rect.xmax); xmax=max(save_rect.xmax,default_rect.xmin); ymin=min(save_rect.ymin,default_rect.ymax); @@ -952,10 +952,10 @@ make_child_layer( self.text_length = bs.tell() - self.text_start; } } - parent.rect.xmin=min(xmin,parent.rect.xmin); - parent.rect.ymin=min(ymin,parent.rect.ymin); - parent.rect.xmax=max(xmax,parent.rect.xmax); - parent.rect.ymax=max(ymax,parent.rect.ymax); + tqparent.rect.xmin=min(xmin,tqparent.rect.xmin); + tqparent.rect.ymin=min(ymin,tqparent.rect.ymin); + tqparent.rect.xmax=max(xmax,tqparent.rect.xmax); + tqparent.rect.ymax=max(ymax,tqparent.rect.ymax); if(xmin>xmax) { const int t=xmin; @@ -1029,11 +1029,11 @@ lt_XMLParser::Impl::ChangeText( const int h=info->height; const int w=info->width; txt->page_zone.text_start = 0; - DjVuTXT::Zone &parent=txt->page_zone; - parent.rect.xmin=0; - parent.rect.ymin=0; - parent.rect.ymax=h; - parent.rect.xmax=w; + DjVuTXT::Zone &tqparent=txt->page_zone; + tqparent.rect.xmin=0; + tqparent.rect.ymin=0; + tqparent.rect.ymax=h; + tqparent.rect.xmax=w; double ws=1.0; if(width && width != w) { @@ -1044,7 +1044,7 @@ lt_XMLParser::Impl::ChangeText( { hs=((double)h)/((double)height); } - make_child_layer(parent, tags, *textbs, h, ws,hs); + make_child_layer(tqparent, tags, *textbs, h, ws,hs); textbs->write8(0); long len = textbs->tell(); txt->page_zone.text_length = len; @@ -1062,7 +1062,7 @@ lt_XMLParser::Impl::parse_text( const lt_XMLTags &GObject, DjVuFile &dfile ) { - GPosition textPos = GObject.contains(hiddentexttag); + GPosition textPos = GObject.tqcontains(hiddentexttag); if(textPos) { // loop through the hidden text - there should only be one @@ -1078,7 +1078,7 @@ lt_XMLParser::Impl::parse_meta( const lt_XMLTags &GObject, DjVuFile &dfile ) { - GPosition metaPos = GObject.contains(metadatatag); + GPosition metaPos = GObject.tqcontains(metadatatag); if(metaPos) { // loop through the hidden text - there should only be one diff --git a/kviewshell/plugins/djvu/libdjvu/XMLTags.cpp b/kviewshell/plugins/djvu/libdjvu/XMLTags.cpp index 2511a585..9c1ad58a 100644 --- a/kviewshell/plugins/djvu/libdjvu/XMLTags.cpp +++ b/kviewshell/plugins/djvu/libdjvu/XMLTags.cpp @@ -321,7 +321,7 @@ lt_XMLTags::init(XMLByteStream &xmlbs) GPList lt_XMLTags::get_Tags(char const tagname[]) const { - GPosition pos=allTags.contains(tagname); + GPosition pos=allTags.tqcontains(tagname); GPList retval; return (pos?allTags[pos]:retval); } @@ -338,7 +338,7 @@ lt_XMLTags::get_Maps(char const tagname[], if(tag) { GPosition loc; - if((loc=tag->contains(tagname))) + if((loc=tag->tqcontains(tagname))) { GPList maps=(GPList &)((*tag)[loc]); for(GPosition mloc=maps;mloc;++mloc) @@ -348,7 +348,7 @@ lt_XMLTags::get_Maps(char const tagname[], { GMap &args=gtag->args; GPosition gpos; - if((gpos=args.contains(argn))) + if((gpos=args.tqcontains(argn))) { map[args[gpos]]=gtag; } diff --git a/kviewshell/plugins/djvu/libdjvu/XMLTags.h b/kviewshell/plugins/djvu/libdjvu/XMLTags.h index 027e629b..df5974d0 100644 --- a/kviewshell/plugins/djvu/libdjvu/XMLTags.h +++ b/kviewshell/plugins/djvu/libdjvu/XMLTags.h @@ -121,7 +121,7 @@ public: inline void addtag(GP x); inline void addraw(GUTF8String raw); - inline GPosition contains(GUTF8String name) const; + inline GPosition tqcontains(GUTF8String name) const; inline const GPList & operator [] (const GUTF8String name) const; inline const GPList & operator [] (const GPosition &pos) const; static void ParseValues(char const *t, GMap &args,bool downcase=true); @@ -213,9 +213,9 @@ inline const GMap > & lt_XMLTags::get_allTags(void) const { return allTags; } inline GPosition -lt_XMLTags::contains(GUTF8String name) const +lt_XMLTags::tqcontains(GUTF8String name) const { - return allTags.contains(name); + return allTags.tqcontains(name); } inline const GPList & diff --git a/kviewshell/plugins/djvu/libdjvu/ZPCodec.h b/kviewshell/plugins/djvu/libdjvu/ZPCodec.h index 4eba6901..1483b93e 100644 --- a/kviewshell/plugins/djvu/libdjvu/ZPCodec.h +++ b/kviewshell/plugins/djvu/libdjvu/ZPCodec.h @@ -615,7 +615,7 @@ ZPCodec::IWencoder(const bool bit) numbers are much more probable than large numbers. We will first group our numbers into several sets. Each number is coded by first coding which set contains the number and then coding a position within the set. Each - set contains #2^n# numbers that we consider roughly equiprobable. Since + set tqcontains #2^n# numbers that we consider roughly equiprobable. Since the most probable values occur much more often, we want to model their probability more precisely. Therefore we use small sets for the most probable values and large sets for the least probable values, as @@ -716,7 +716,7 @@ ZPCodec::IWencoder(const bool bit) Adaptation on the other hand is a great simplification. A good data compression program must (a) represent the data in order to make its - predictability apparent, and (b) perform the predictions and generate the + predictability aptqparent, and (b) perform the predictions and generate the code bits. The ZP-Coder is an efficient and effortless solution for implementing task (b). diff --git a/kviewshell/plugins/djvu/libdjvu/configure.in.in b/kviewshell/plugins/djvu/libdjvu/configure.in.in index c2a1d2b6..9af3757d 100644 --- a/kviewshell/plugins/djvu/libdjvu/configure.in.in +++ b/kviewshell/plugins/djvu/libdjvu/configure.in.in @@ -217,7 +217,7 @@ AC_REQUIRE([AC_CANONICAL_HOST]) acx_pthread_ok=no # First, check if the POSIX threads header, pthread.h, is available. # If it isn't, don't bother looking for the threads libraries. -AC_CHECK_HEADER(pthread.h, , acx_pthread_ok=noheader) +KDE_CHECK_HEADER(pthread.h, , acx_pthread_ok=noheader) # We must check for the threads library under a number of different # names; the ordering is very important because some systems # (e.g. DEC) have both -lpthread and -lpthreads, where one of the @@ -378,10 +378,13 @@ fi if test x$acx_cothread != xno ; then AC_MSG_CHECKING([whether libgcc contains the cothread patch]) AC_LANG_PUSH([C++]) + kde_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS $qt_includes" AC_TRY_LINK([extern "C" { void *(*__get_eh_context_ptr)(); void *__new_eh_context(void); }], [ __get_eh_context_ptr = &__new_eh_context;], [acx_cothread_patch=yes], [acx_cothread_patch=no]) + CXXFLAGS="$kde_save_CXXFLAGS" AC_LANG_POP([C++]) AC_MSG_RESULT($acx_cothread_patch) if test x$acx_cothread_patch = xno ; then @@ -560,8 +563,8 @@ AC_HEADER_STDC AC_HEADER_DIRENT AC_HEADER_TIME AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS(wchar.h wctype.h sys/mman.h iconv.h) -AC_CHECK_HEADERS(stdint.h sys/ipc.h sys/shm.h) +KDE_CHECK_HEADERS(wchar.h wctype.h sys/mman.h iconv.h) +KDE_CHECK_HEADERS(stdint.h sys/ipc.h sys/shm.h) # ---------------------------------------- # Types diff --git a/kviewshell/plugins/djvu/pageRangeWidget.cpp b/kviewshell/plugins/djvu/pageRangeWidget.cpp index ddff8299..1c1cb6fd 100644 --- a/kviewshell/plugins/djvu/pageRangeWidget.cpp +++ b/kviewshell/plugins/djvu/pageRangeWidget.cpp @@ -23,7 +23,7 @@ #include "pageRangeWidget.h" -PageRangeWidget::PageRangeWidget( Q_UINT16 _from, Q_UINT16 _to, Q_UINT16 _current, TQWidget *parent, const char *name) : PageRangeWidget_base(parent, name) +PageRangeWidget::PageRangeWidget( TQ_UINT16 _from, TQ_UINT16 _to, TQ_UINT16 _current, TQWidget *tqparent, const char *name) : PageRangeWidget_base(tqparent, name) { // Paranoid security checks if ((from == 0) || (to == 0)) diff --git a/kviewshell/plugins/djvu/pageRangeWidget.h b/kviewshell/plugins/djvu/pageRangeWidget.h index 3ddb497b..a1d2ec58 100644 --- a/kviewshell/plugins/djvu/pageRangeWidget.h +++ b/kviewshell/plugins/djvu/pageRangeWidget.h @@ -29,12 +29,13 @@ class PageRangeWidget : public PageRangeWidget_base { Q_OBJECT + TQ_OBJECT public: - PageRangeWidget( Q_UINT16 _from, Q_UINT16 _to, Q_UINT16 _current, TQWidget *parent = 0, const char *name = 0 ); + PageRangeWidget( TQ_UINT16 _from, TQ_UINT16 _to, TQ_UINT16 _current, TQWidget *tqparent = 0, const char *name = 0 ); - Q_UINT16 getFrom() const {return (from == 0) ? 0 : from->value(); } - Q_UINT16 getTo() const {return (to == 0) ? 0 : to->value(); } + TQ_UINT16 getFrom() const {return (from == 0) ? 0 : from->value(); } + TQ_UINT16 getTo() const {return (to == 0) ? 0 : to->value(); } private slots: void toValueChanged(int val); diff --git a/kviewshell/plugins/djvu/pageRangeWidget_base.ui b/kviewshell/plugins/djvu/pageRangeWidget_base.ui index 29784c3a..90f85b5a 100644 --- a/kviewshell/plugins/djvu/pageRangeWidget_base.ui +++ b/kviewshell/plugins/djvu/pageRangeWidget_base.ui @@ -1,6 +1,6 @@ PageRangeWidget_base - + PageRangeWidget_base @@ -19,7 +19,7 @@ unnamed - + textLabel1 @@ -40,7 +40,7 @@ from - + textLabel2 @@ -65,7 +65,7 @@ - + knuminput.h knuminput.h diff --git a/kviewshell/renderedDocumentPage.cpp b/kviewshell/renderedDocumentPage.cpp index 1d535bc5..990f1de6 100644 --- a/kviewshell/renderedDocumentPage.cpp +++ b/kviewshell/renderedDocumentPage.cpp @@ -21,7 +21,7 @@ RenderedDocumentPage::RenderedDocumentPage() textBoxList.reserve(250); pageNr = 0; isEmpty = true; - pageText = TQString::null; + pageText = TQString(); } @@ -46,7 +46,7 @@ void RenderedDocumentPage::clear() textBoxList.clear(); hyperLinkList.clear(); - pageText = TQString::null; + pageText = TQString(); isEmpty = true; } @@ -194,7 +194,7 @@ TextSelection RenderedDocumentPage::select(const TQPoint& point) for (unsigned int i=0; i thr) val = 128 + (127 * (val - thr)) / (255 - thr); else if ( val < thr ) @@ -100,7 +100,7 @@ TQPixmap RenderedDocumentPagePixmap::accessiblePixmap() else if (val < 0) val = 0; } - data[i] = qRgba(val, val, val, 255); + data[i] = tqRgba(val, val, val, 255); } break; } diff --git a/kviewshell/renderedDocumentPagePixmap.h b/kviewshell/renderedDocumentPagePixmap.h index 5e6e79fb..00a21dfa 100644 --- a/kviewshell/renderedDocumentPagePixmap.h +++ b/kviewshell/renderedDocumentPagePixmap.h @@ -19,9 +19,10 @@ // This class contains everything documentRenderer needs to know // about a certain page. -class RenderedDocumentPagePixmap: public RenderedDocumentPage, public QPixmap +class RenderedDocumentPagePixmap: public RenderedDocumentPage, public TQPixmap { Q_OBJECT + TQ_OBJECT public: RenderedDocumentPagePixmap(); diff --git a/kviewshell/searchWidget.cpp b/kviewshell/searchWidget.cpp index 27ca42f8..95d06295 100644 --- a/kviewshell/searchWidget.cpp +++ b/kviewshell/searchWidget.cpp @@ -36,41 +36,41 @@ #include "searchWidget.h" -SearchWidget::SearchWidget(TQWidget* parent, const char* name, WFlags fl) - : TQWidget(parent, name, fl) +SearchWidget::SearchWidget(TQWidget* tqparent, const char* name, WFlags fl) + : TQWidget(tqparent, name, fl) { setName("SearchWidget"); - setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed); + tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed); - layout = new TQHBoxLayout(this, 4, 6, "SearchWidgetLayout"); + tqlayout = new TQHBoxLayout(this, 4, 6, "SearchWidgetLayout"); stopButton = new TQPushButton(this, "stopButton"); stopButton->setPixmap(KGlobal::iconLoader()->loadIcon("stop", KIcon::Small, KIcon::SizeSmall)); - layout->addWidget(stopButton); + tqlayout->addWidget(stopButton); searchLabel = new TQLabel(this, "searchLabel"); searchLabel->setText(i18n("Search:")); - layout->addWidget(searchLabel); + tqlayout->addWidget(searchLabel); searchText = new KLineEdit(this, "searchText"); - layout->addWidget(searchText); + tqlayout->addWidget(searchText); searchLabel->setBuddy(searchText); findPrevButton = new TQPushButton(this, "findPrevButton"); findPrevButton->setPixmap(KGlobal::iconLoader()->loadIcon("back", KIcon::NoGroup, KIcon::SizeSmall)); TQToolTip::add(findPrevButton, i18n("Find previous")); - layout->addWidget(findPrevButton); + tqlayout->addWidget(findPrevButton); findNextButton = new TQPushButton(this, "findNextButton"); findNextButton->setPixmap(KGlobal::iconLoader()->loadIcon("forward", KIcon::NoGroup, KIcon::SizeSmall)); TQToolTip::add(findNextButton, i18n("Find next")); - layout->addWidget(findNextButton); + tqlayout->addWidget(findNextButton); caseSensitiveCheckBox = new TQCheckBox(this, "caseSensitiveCheckBox"); caseSensitiveCheckBox->setText(i18n("Case sensitive")); - layout->addWidget(caseSensitiveCheckBox); + tqlayout->addWidget(caseSensitiveCheckBox); connect(stopButton, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(stopSearch())); @@ -126,12 +126,12 @@ void SearchWidget::setFocus() void SearchWidget::keyPressEvent(TQKeyEvent* e) { - if (e->key() == Qt::Key_Escape) + if (e->key() == TQt::Key_Escape) emit stopSearch(); - if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) + if (e->key() == TQt::Key_Return || e->key() == TQt::Key_Enter) { - if (e->state() == Qt::ShiftButton) + if (e->state() == TQt::ShiftButton) emit findPrevText(); else emit findNextText(); diff --git a/kviewshell/searchWidget.h b/kviewshell/searchWidget.h index 8875597d..189970ee 100644 --- a/kviewshell/searchWidget.h +++ b/kviewshell/searchWidget.h @@ -31,12 +31,13 @@ class TQPushButton; class TQCheckBox; class TQString; -class SearchWidget : public QWidget +class SearchWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SearchWidget(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0); + SearchWidget(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0); ~SearchWidget(); TQString getText() const; @@ -67,7 +68,7 @@ private: TQPushButton* findPrevButton; TQCheckBox* caseSensitiveCheckBox; - TQHBoxLayout* layout; + TQHBoxLayout* tqlayout; }; #endif diff --git a/kviewshell/selection.cpp b/kviewshell/selection.cpp index 83b9b5db..50edb80f 100644 --- a/kviewshell/selection.cpp +++ b/kviewshell/selection.cpp @@ -15,11 +15,11 @@ TextSelection::TextSelection() : page(PageNumber::invalidPage), - selectedText(TQString::null) + selectedText(TQString()) {} -void TextSelection::set(const PageNumber& pageNr, Q_INT32 start, Q_INT32 end, const TQString& text) +void TextSelection::set(const PageNumber& pageNr, TQ_INT32 start, TQ_INT32 end, const TQString& text) { page = pageNr; selectedTextStart = start; @@ -27,11 +27,11 @@ void TextSelection::set(const PageNumber& pageNr, Q_INT32 start, Q_INT32 end, co if (page != 0) selectedText = text; else - selectedText = TQString::null; + selectedText = TQString(); if (page != 0) { - TQApplication::clipboard()->setSelectionMode(true); - TQApplication::clipboard()->setText(selectedText); + TQApplication::tqclipboard()->setSelectionMode(true); + TQApplication::tqclipboard()->setText(selectedText); } } @@ -53,14 +53,14 @@ bool TextSelection::operator!= (const TextSelection& s) const void TextSelection::copyText() const { if (!isEmpty()) { - TQApplication::clipboard()->setSelectionMode(false); - TQApplication::clipboard()->setText(selectedText); + TQApplication::tqclipboard()->setSelectionMode(false); + TQApplication::tqclipboard()->setText(selectedText); } } void TextSelection::clear() { - set(0, -1, -1, TQString::null); + set(0, -1, -1, TQString()); } diff --git a/kviewshell/selection.h b/kviewshell/selection.h index 30fe415d..0f58fe5b 100644 --- a/kviewshell/selection.h +++ b/kviewshell/selection.h @@ -18,7 +18,7 @@ the page number, - two Q_INT32 numbers, 'selectedTextStart' and 'selectedTextEnd' that + two TQ_INT32 numbers, 'selectedTextStart' and 'selectedTextEnd' that should hold indiced referring to the start and the end of the selected text in the appropriate documentPage's textLinkList @@ -47,17 +47,17 @@ public: // values; it is not even checked if selectedTextStart <= // selectedTextEnd! The signals pageChanged() and // selectionIsNotEmpty() are emitted if appropriate. - void set(const PageNumber& pageNr, Q_INT32 selectedTextStart, Q_INT32 selectedTextEnd, const TQString& text); + void set(const PageNumber& pageNr, TQ_INT32 selectedTextStart, TQ_INT32 selectedTextEnd, const TQString& text); // This method can be used to find out if the selection is empty, // i.e. if the page number is invalid or the selected text is empty. bool isEmpty() const {return (!page.isValid() || selectedText.isEmpty());} // Method used to retrieve the data described above - Q_INT32 getSelectedTextStart() const {return selectedTextStart;} + TQ_INT32 getSelectedTextStart() const {return selectedTextStart;} // Method used to retrieve the data described above - Q_INT32 getSelectedTextEnd() const {return selectedTextEnd;} + TQ_INT32 getSelectedTextEnd() const {return selectedTextEnd;} // Method used to retrieve the data described above const TQString &getSelectedText() const {return selectedText;} @@ -77,7 +77,7 @@ public: PageNumber page; // Described above - Q_INT32 selectedTextStart, selectedTextEnd; + TQ_INT32 selectedTextStart, selectedTextEnd; // Described above TQString selectedText; diff --git a/kviewshell/simplePageSize.cpp b/kviewshell/simplePageSize.cpp index 9f222105..358f6798 100644 --- a/kviewshell/simplePageSize.cpp +++ b/kviewshell/simplePageSize.cpp @@ -15,7 +15,7 @@ #include "simplePageSize.h" -double SimplePageSize::zoomForHeight(Q_UINT32 height) const +double SimplePageSize::zoomForHeight(TQ_UINT32 height) const { if (!isValid()) { kdError(1223) << "SimplePageSize::zoomForHeight() called when paper height was invalid" << endl; @@ -25,7 +25,7 @@ double SimplePageSize::zoomForHeight(Q_UINT32 height) const } -double SimplePageSize::zoomForWidth(Q_UINT32 width) const +double SimplePageSize::zoomForWidth(TQ_UINT32 width) const { if (!isValid()) { kdError(1223) << "SimplePageSize::zoomForWidth() called when paper width was invalid" << endl; @@ -45,5 +45,5 @@ double SimplePageSize::zoomToFitInto(const SimplePageSize &target) const double z1 = target.width() / pageWidth; double z2 = target.height() / pageHeight; - return QMIN(z1,z2); + return TQMIN(z1,z2); } diff --git a/kviewshell/simplePageSize.h b/kviewshell/simplePageSize.h index 523eb62b..46972e88 100644 --- a/kviewshell/simplePageSize.h +++ b/kviewshell/simplePageSize.h @@ -93,7 +93,7 @@ class SimplePageSize 'height' pixels. If the pageSize is invalid, an undefined value is returned. */ - double zoomForHeight(Q_UINT32 height) const; + double zoomForHeight(TQ_UINT32 height) const; /** \brief Zoom value required to scale to a certain height @@ -109,7 +109,7 @@ class SimplePageSize 'width' pixels. If the pageSize is invalid, an undefined value is returned. */ - double zoomForWidth(Q_UINT32 width) const; + double zoomForWidth(TQ_UINT32 width) const; /** \brief Returns a zoom to fit into a certain page size diff --git a/kviewshell/sizePreview.cpp b/kviewshell/sizePreview.cpp index 37f7bb66..e3ba44df 100644 --- a/kviewshell/sizePreview.cpp +++ b/kviewshell/sizePreview.cpp @@ -18,8 +18,8 @@ #include "simplePageSize.h" -SizePreview::SizePreview( TQWidget *parent, const char *name, WFlags) - : TQWidget( parent, name, WStaticContents | WNoAutoErase ) +SizePreview::SizePreview( TQWidget *tqparent, const char *name, WFlags) + : TQWidget( tqparent, name, WStaticContents | WNoAutoErase ) { // Set a sane default _width = _height = 50.0; @@ -74,15 +74,15 @@ void SizePreview::paintEvent( TQPaintEvent * ) pixmap.resize(width(), height()); TQPainter p(&pixmap); - p.fillRect(rect(), colorGroup().background()); - p.setPen(Qt::black); - p.setBrush(Qt::white); + p.fillRect(rect(), tqcolorGroup().background()); + p.setPen(TQt::black); + p.setBrush(TQt::white); p.drawRect(hOffset, vOffset, displayedWidth, displayedHeight); // mark the textbox; we assume 25mm margin int margin = (int)(25.0*displayedWidth/_width + 0.5); TQRect textBox(hOffset+margin, vOffset+margin, displayedWidth-2*margin, displayedHeight-2*margin); - p.setPen(Qt::lightGray); + p.setPen(TQt::lightGray); p.drawRect(textBox); // Draw some dummy "text", represented by black lines @@ -96,7 +96,7 @@ void SizePreview::paintEvent( TQPaintEvent * ) KRandomSequence rnd(1); // to generate word widths p.setClipRect(textBox); - p.setPen(Qt::black); + p.setPen(TQt::black); int count = 1; // Counts lines for (int y = vOffset+margin+lineSpacing; y <= vOffset+displayedHeight-margin; y += lineSpacing) { // We start each line with its own seed. diff --git a/kviewshell/sizePreview.h b/kviewshell/sizePreview.h index 96e37a04..aeaf264f 100644 --- a/kviewshell/sizePreview.h +++ b/kviewshell/sizePreview.h @@ -16,12 +16,13 @@ class SimplePageSize; -class SizePreview : public QWidget +class SizePreview : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SizePreview( TQWidget *parent, const char* name=0, WFlags f=0 ); + SizePreview( TQWidget *tqparent, const char* name=0, WFlags f=0 ); public slots: // Sets the size. diff --git a/kviewshell/tableOfContents.cpp b/kviewshell/tableOfContents.cpp index 51618d9a..7003de53 100644 --- a/kviewshell/tableOfContents.cpp +++ b/kviewshell/tableOfContents.cpp @@ -28,19 +28,19 @@ #include "kvsprefs.h" -TocItem::TocItem(TocItem* parent) - : KListViewItem(parent) +TocItem::TocItem(TocItem* tqparent) + : KListViewItem(tqparent) { } -TocItem::TocItem(TQListView* parent) - : KListViewItem(parent) +TocItem::TocItem(TQListView* tqparent) + : KListViewItem(tqparent) { } -TableOfContents::TableOfContents(TQWidget* parent) - : KListView(parent) +TableOfContents::TableOfContents(TQWidget* tqparent) + : KListView(tqparent) { addColumn(i18n("Topic")); addColumn(i18n("Page")); @@ -79,7 +79,7 @@ void TableOfContents::setContents(const TQPtrList& bookmarks) addItems(bookmarks); } -void TableOfContents::addItems(const TQPtrList& _bookmarks, TocItem* parent) +void TableOfContents::addItems(const TQPtrList& _bookmarks, TocItem* tqparent) { kdDebug(1223) << "TableOfContents::setContents()" << endl; if (_bookmarks.isEmpty()) @@ -90,10 +90,10 @@ void TableOfContents::addItems(const TQPtrList& _bookmarks, TocItem* p TQPtrList bookmarks = _bookmarks; for (Bookmark* current = bookmarks.last(); current; current = bookmarks.prev() ) { TocItem* item; - if (!parent) + if (!tqparent) item = new TocItem(this); else - item = new TocItem(parent); + item = new TocItem(tqparent); item->setText(0, current->bookmarkText); if (current->position.page != 0) diff --git a/kviewshell/tableOfContents.h b/kviewshell/tableOfContents.h index de5885ac..a6d4f311 100644 --- a/kviewshell/tableOfContents.h +++ b/kviewshell/tableOfContents.h @@ -32,8 +32,8 @@ class Bookmark; class TocItem : public KListViewItem { public: - TocItem(TocItem* parent); - TocItem(TQListView* parent); + TocItem(TocItem* tqparent); + TocItem(TQListView* tqparent); void setAnchor(const Anchor & _anchor) { anchor = _anchor; } Anchor getAnchor() { return anchor; } @@ -46,9 +46,10 @@ private: class TableOfContents : public KListView { Q_OBJECT + TQ_OBJECT public: - TableOfContents(TQWidget* parent); + TableOfContents(TQWidget* tqparent); virtual ~TableOfContents(); void setContents(const TQPtrList& bookmarks); @@ -60,7 +61,7 @@ signals: void gotoPage(const Anchor&); private: - void addItems(const TQPtrList& bookmarks, TocItem* parent = 0); + void addItems(const TQPtrList& bookmarks, TocItem* tqparent = 0); private slots: void itemClicked(TQListViewItem*); diff --git a/kviewshell/units.cpp b/kviewshell/units.cpp index 99dc2da9..0e465198 100644 --- a/kviewshell/units.cpp +++ b/kviewshell/units.cpp @@ -64,7 +64,7 @@ float distance::convertToMM(const TQString &distance, bool *ok) // of the unit in 'unitPos', so that distance[0..unitPos] will hold // the value. Store the number of mm per unit in 'MMperUnit'. for(int i=0; MMperUnit==0.0 && distanceUnitTable[i].name != 0; i++) { - unitPos = distance.findRev(distanceUnitTable[i].name); + unitPos = distance.tqfindRev(distanceUnitTable[i].name); if (unitPos != -1) MMperUnit = distanceUnitTable[i].mmPerUnit; } diff --git a/kviewshell/zoom.cpp b/kviewshell/zoom.cpp index 1c3ee6f6..595f4982 100644 --- a/kviewshell/zoom.cpp +++ b/kviewshell/zoom.cpp @@ -28,7 +28,7 @@ Zoom::Zoom() _zoomValue = 1.0; valNo = 6; // 1.0 is 6rd entry in the list for(int i=0; zoomVals[i] != 0; i++) - valueNames << TQString("%1%").arg(zoomVals[i]); + valueNames << TQString("%1%").tqarg(zoomVals[i]); } @@ -49,7 +49,7 @@ void Zoom::setZoomValue(const TQString &cval) else { emit(zoomNamesChanged(valueNames)); emit(valNoChanged(valNo)); - emit(zoomNameChanged(TQString("%1%").arg((int)(_zoomValue*100.0+0.5)))); + emit(zoomNameChanged(TQString("%1%").tqarg((int)(_zoomValue*100.0+0.5)))); } } @@ -64,7 +64,7 @@ void Zoom::setZoomFitWidth(float zoom) valNo = 0; emit(valNoChanged(valNo)); - emit(zoomNameChanged(TQString("%1%").arg((int)(_zoomValue*100.0+0.5)))); + emit(zoomNameChanged(TQString("%1%").tqarg((int)(_zoomValue*100.0+0.5)))); } void Zoom::setZoomFitHeight(float zoom) @@ -78,7 +78,7 @@ void Zoom::setZoomFitHeight(float zoom) valNo = 1; emit(valNoChanged(valNo)); - emit(zoomNameChanged(TQString("%1%").arg((int)(_zoomValue*100.0+0.5)))); + emit(zoomNameChanged(TQString("%1%").tqarg((int)(_zoomValue*100.0+0.5)))); } void Zoom::setZoomFitPage(float zoom) @@ -92,7 +92,7 @@ void Zoom::setZoomFitPage(float zoom) valNo = 2; emit(valNoChanged(valNo)); - emit(zoomNameChanged(TQString("%1%").arg((int)(_zoomValue*100.0+0.5)))); + emit(zoomNameChanged(TQString("%1%").tqarg((int)(_zoomValue*100.0+0.5)))); } void Zoom::setZoomValue(float f) @@ -117,19 +117,19 @@ void Zoom::setZoomValue(float f) flag = true; valNo = i + 3; if (fabs(_zoomValue-zoomVals[i]) > 0.01) - valueNames << TQString("%1%").arg((int)(_zoomValue*100.0+0.5)); + valueNames << TQString("%1%").tqarg((int)(_zoomValue*100.0+0.5)); } - valueNames << TQString("%1%").arg((int)(zoomVals[i]*100.0+0.5)); + valueNames << TQString("%1%").tqarg((int)(zoomVals[i]*100.0+0.5)); } if (flag == false) { valNo = valueNames.size(); - valueNames << TQString("%1%").arg((int)(_zoomValue*100.0+0.5)); + valueNames << TQString("%1%").tqarg((int)(_zoomValue*100.0+0.5)); } emit(zoomNamesChanged(valueNames)); emit(valNoChanged(valNo)); - emit(zoomNameChanged(TQString("%1%").arg((int)(_zoomValue*100.0+0.5)))); + emit(zoomNameChanged(TQString("%1%").tqarg((int)(_zoomValue*100.0+0.5)))); } float Zoom::zoomIn() diff --git a/kviewshell/zoom.h b/kviewshell/zoom.h index b6108d05..21b182f0 100644 --- a/kviewshell/zoom.h +++ b/kviewshell/zoom.h @@ -15,9 +15,10 @@ #include -class Zoom : public QObject +class Zoom : public TQObject { Q_OBJECT + TQ_OBJECT public: /** Initializs the zoom with a default of 100% */ -- cgit v1.2.3