diff options
Diffstat (limited to 'kviewshell')
69 files changed, 319 insertions, 340 deletions
diff --git a/kviewshell/documentPageCache.h b/kviewshell/documentPageCache.h index 0218addd..7c7ee657 100644 --- a/kviewshell/documentPageCache.h +++ b/kviewshell/documentPageCache.h @@ -25,7 +25,7 @@ class RenderedDocumentPage; class DocumentPageCache: public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/documentRenderer.h b/kviewshell/documentRenderer.h index b94f0d9a..eea0cd16 100644 --- a/kviewshell/documentRenderer.h +++ b/kviewshell/documentRenderer.h @@ -49,7 +49,7 @@ thread-safe. class DocumentRenderer : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/documentWidget.cpp b/kviewshell/documentWidget.cpp index 619135df..dfd97033 100644 --- a/kviewshell/documentWidget.cpp +++ b/kviewshell/documentWidget.cpp @@ -83,9 +83,9 @@ DocumentWidget::DocumentWidget(TQWidget *parent, PageView *sv, DocumentPageCache scrollGuide = -1; setMouseTracking(true); - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); - connect(&clearStatusBarTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(clearStatusBar())); + connect(&clearStatusBarTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(clearStatusBar())); setBackgroundMode(TQt::NoBackground); if (!busyIcon) @@ -187,7 +187,7 @@ void DocumentWidget::paintEvent(TQPaintEvent *e) if (!isVisible()) { //kdDebug() << "widget of page " << pageNr << " is not visible. Abort rendering" << endl; - kapp->processEvents(); + tdeApp->processEvents(); return; } @@ -260,7 +260,7 @@ void DocumentWidget::paintEvent(TQPaintEvent *e) { // Request page pixmap. pixmapRequested = true; - TQTimer::singleShot(50, this, TQT_SLOT(delayedRequestPage())); + TQTimer::singleShot(50, this, TQ_SLOT(delayedRequestPage())); } return; } @@ -367,7 +367,7 @@ void DocumentWidget::drawScrollGuide(int ycoord) //kdDebug() << "draw scroll guide for page " << pageNr << " at y = " << ycoord << endl; scrollGuide = ycoord; update(TQRect(1, scrollGuide, pageSize().width(), 1)); - TQTimer::singleShot(1000, this, TQT_SLOT(clearScrollGuide())); + TQTimer::singleShot(1000, this, TQ_SLOT(clearScrollGuide())); } void DocumentWidget::clearScrollGuide() @@ -450,7 +450,7 @@ void DocumentWidget::mousePressEvent ( TQMouseEvent * e ) } // Check if the mouse is pressed on a regular hyperlink - if (e->button() == Qt::LeftButton) { + if (e->button() == TQt::LeftButton) { if (pageData->hyperLinkList.size() > 0) for(unsigned int i = 0; i < pageData->hyperLinkList.size(); i++) { if (pageData->hyperLinkList[i].box.contains(e->pos())) { @@ -464,7 +464,7 @@ void DocumentWidget::mousePressEvent ( TQMouseEvent * e ) setCursor(TQt::IbeamCursor); } - if (e->button() == Qt::RightButton || (!moveTool && e->button() == Qt::LeftButton)) + if (e->button() == TQt::RightButton || (!moveTool && e->button() == TQt::LeftButton)) { setCursor(TQt::IbeamCursor); // If Shift is not pressed clear the current selection, @@ -486,7 +486,7 @@ void DocumentWidget::mouseReleaseEvent ( TQMouseEvent *e ) // otherwise the mouse cursor in the centeringScrollview is wrong e->ignore(); - if (e->button() == Qt::RightButton || (!moveTool && e->button() == Qt::LeftButton)) + if (e->button() == TQt::RightButton || (!moveTool && e->button() == TQt::LeftButton)) { // If the selectedRectangle is empty then there was only a single right click. if (firstSelectedPoint == e->pos()) @@ -589,7 +589,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() & Qt::LeftButton) != 0 && moveTool) + if ((e->state() & TQt::LeftButton) != 0 && moveTool) { // Pass the mouse event on to the owner of this widget ---under // normal circumstances that is the centeringScrollView which will @@ -598,7 +598,7 @@ void DocumentWidget::mouseMoveEvent ( TQMouseEvent * e ) } // Right mouse button pressed -> Text copy function - if ((e->state() & Qt::RightButton) != 0 || (!moveTool && (e->state() & Qt::LeftButton != 0))) + if ((e->state() & TQt::RightButton) != 0 || (!moveTool && (e->state() & TQt::LeftButton != 0))) { if (selectedRectangle.isEmpty()) { firstSelectedPoint = e->pos(); @@ -687,7 +687,7 @@ void DocumentWidget::delayedRequestPage() //kdDebug() << "delayedRequest: widget of page " << pageNr << " is not visible. Abort rendering" << endl; pixmapRequested = false; - kapp->processEvents(); + tdeApp->processEvents(); return; } @@ -699,7 +699,7 @@ void DocumentWidget::delayedRequestPage() // displayed one after another. Widthout it all widgets are updated after all the rendering // is completed. This is especially noticable in overview mode. After the change to a seperate // rendering thread this will probably not be needed anymore. - kapp->processEvents(); + tdeApp->processEvents(); } TQSize DocumentWidget::pageSize() const diff --git a/kviewshell/documentWidget.h b/kviewshell/documentWidget.h index 911d3c9d..194bcdcd 100644 --- a/kviewshell/documentWidget.h +++ b/kviewshell/documentWidget.h @@ -28,7 +28,7 @@ class TQPaintEvent; class DocumentWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/emptyRenderer.h b/kviewshell/emptyRenderer.h index 3c8a3f8e..895f1de4 100644 --- a/kviewshell/emptyRenderer.h +++ b/kviewshell/emptyRenderer.h @@ -27,7 +27,7 @@ class RenderedDocumentPage; class EmptyRenderer : public DocumentRenderer { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/empty_multipage.h b/kviewshell/empty_multipage.h index 753cdaba..6bcf770f 100644 --- a/kviewshell/empty_multipage.h +++ b/kviewshell/empty_multipage.h @@ -28,7 +28,7 @@ class EmptyMultiPage : public KMultiPage { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/history.h b/kviewshell/history.h index 791e39be..c35d5531 100644 --- a/kviewshell/history.h +++ b/kviewshell/history.h @@ -32,7 +32,7 @@ bool operator!=(const HistoryItem& lhs, const HistoryItem& rhs) class History : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp index c9d2b63f..794297bc 100644 --- a/kviewshell/kviewpart.cpp +++ b/kviewshell/kviewpart.cpp @@ -20,7 +20,7 @@ #include <kfilterbase.h> #include <kfilterdev.h> #include <tdeglobal.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeio/job.h> #include <tdelocale.h> #include <kiconloader.h> @@ -30,7 +30,7 @@ #include <tdeparts/genericfactory.h> #include <tdeparts/partmanager.h> #include <kprogress.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstdaction.h> #include <tdetempfile.h> #include <ktrader.h> @@ -68,11 +68,11 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p setInstance(KViewPartFactory::instance()); watch = KDirWatch::self(); - connect(watch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(fileChanged(const TQString&))); + connect(watch, TQ_SIGNAL(dirty(const TQString&)), this, TQ_SLOT(fileChanged(const TQString&))); watch->startScan(); mainWidget = new TQHBox(parentWidget, widgetName); - mainWidget->setFocusPolicy(TQ_StrongFocus); + mainWidget->setFocusPolicy(TQWidget::StrongFocus); setWidget(mainWidget); // Setup part manager @@ -83,7 +83,7 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p // Without this the GUI-items of the KMultiPages are not merged partManager->setAllowNestedParts(true); - connect(partManager, TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SIGNAL(pluginChanged(KParts::Part*))); + connect(partManager, TQ_SIGNAL(activePartChanged(KParts::Part*)), this, TQ_SIGNAL(pluginChanged(KParts::Part*))); partManager->addPart(this); // create the displaying part @@ -122,7 +122,7 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p // Try to load the multiPage int error; - multiPage = static_cast<KMultiPage*>(KParts::ComponentFactory::createInstanceFromService<KParts::ReadOnlyPart>(service, TQT_TQOBJECT(mainWidget), + multiPage = static_cast<KMultiPage*>(KParts::ComponentFactory::createInstanceFromService<KParts::ReadOnlyPart>(service, mainWidget, service->name().utf8(), TQStringList(), &error )); // If the loading of the MultiPage failed report and error and abort. @@ -170,28 +170,28 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p // Add the multipage to the GUI. partManager->addPart(multiPage); - exportTextAction = new TDEAction(i18n("Text..."), 0, this, TQT_SLOT(mp_exportText()), actionCollection(), "export_text"); + exportTextAction = new TDEAction(i18n("Text..."), 0, this, TQ_SLOT(mp_exportText()), actionCollection(), "export_text"); // edit menu - findTextAction = KStdAction::find(this, TQT_SLOT(mp_showFindTextDialog()), actionCollection(), "find"); - findNextAction = KStdAction::findNext(this, TQT_SLOT(mp_findNextText()), actionCollection(), "findnext"); + findTextAction = KStdAction::find(this, TQ_SLOT(mp_showFindTextDialog()), actionCollection(), "find"); + findNextAction = KStdAction::findNext(this, TQ_SLOT(mp_findNextText()), actionCollection(), "findnext"); findNextAction->setEnabled(false); - findPrevAction = KStdAction::findPrev(this, TQT_SLOT(mp_findPrevText()), actionCollection(), "findprev"); + findPrevAction = KStdAction::findPrev(this, TQ_SLOT(mp_findPrevText()), actionCollection(), "findprev"); findPrevAction->setEnabled(false); - selectAllAction = KStdAction::selectAll(this, TQT_SLOT(mp_doSelectAll()), actionCollection(), "edit_select_all"); + selectAllAction = KStdAction::selectAll(this, TQ_SLOT(mp_doSelectAll()), actionCollection(), "edit_select_all"); - copyTextAction = KStdAction::copy(this, TQT_SLOT(mp_copyText()), actionCollection(), "copy_text"); + copyTextAction = KStdAction::copy(this, TQ_SLOT(mp_copyText()), actionCollection(), "copy_text"); copyTextAction->setEnabled(false); - deselectAction = KStdAction::deselect(this, TQT_SLOT(mp_clearSelection()), actionCollection(), "edit_deselect_all"); + deselectAction = KStdAction::deselect(this, TQ_SLOT(mp_clearSelection()), actionCollection(), "edit_deselect_all"); deselectAction->setEnabled(false); - saveAction = KStdAction::save(this, TQT_SLOT(mp_slotSave_defaultFilename()), actionCollection()); + saveAction = KStdAction::save(this, TQ_SLOT(mp_slotSave_defaultFilename()), actionCollection()); // settings menu showSidebar = new TDEToggleAction (i18n("Show &Sidebar"), "show_side_panel", 0, this, - TQT_SLOT(slotShowSidebar()), actionCollection(), "show_sidebar"); + TQ_SLOT(slotShowSidebar()), actionCollection(), "show_sidebar"); showSidebar->setCheckedState(i18n("Hide &Sidebar")); watchAct = new TDEToggleAction(i18n("&Watch File"), 0, 0, 0, actionCollection(), "watch_file"); scrollbarHandling = new TDEToggleAction (i18n("Show Scrollbars"), 0, 0, 0, actionCollection(), "scrollbarHandling"); @@ -212,17 +212,17 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p orientations.append(i18n("Landscape")); orientation = new TDESelectAction (i18n("Preferred &Orientation"), 0, 0, 0, actionCollection(), "view_orientation"); orientation->setItems(orientations); - connect(orientation, TQT_SIGNAL(activated (int)), &userRequestedPaperSize, TQT_SLOT(setOrientation(int))); + connect(orientation, TQ_SIGNAL(activated (int)), &userRequestedPaperSize, TQ_SLOT(setOrientation(int))); // Zoom Menu zoom_action = new TDESelectAction (i18n("&Zoom"), 0, 0, 0, actionCollection(), "view_zoom"); zoom_action->setEditable(true); zoom_action->setItems(_zoomVal.zoomNames()); - connect (&_zoomVal, TQT_SIGNAL(zoomNamesChanged(const TQStringList &)), zoom_action, TQT_SLOT(setItems(const TQStringList &))); - connect (&_zoomVal, TQT_SIGNAL(valNoChanged(int)), zoom_action, TQT_SLOT(setCurrentItem(int))); - connect (&_zoomVal, TQT_SIGNAL(zoomNameChanged(const TQString &)), this, TQT_SIGNAL(zoomChanged(const TQString &)) ); - connect (zoom_action, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(setZoomValue(const TQString &))); + connect (&_zoomVal, TQ_SIGNAL(zoomNamesChanged(const TQStringList &)), zoom_action, TQ_SLOT(setItems(const TQStringList &))); + connect (&_zoomVal, TQ_SIGNAL(valNoChanged(int)), zoom_action, TQ_SLOT(setCurrentItem(int))); + connect (&_zoomVal, TQ_SIGNAL(zoomNameChanged(const TQString &)), this, TQ_SIGNAL(zoomChanged(const TQString &)) ); + connect (zoom_action, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(setZoomValue(const TQString &))); _zoomVal.setZoomValue(1.0); // should not be necessary @@@@ emit(zoomChanged("100%")); @@ -231,14 +231,14 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p TQStringList items = userRequestedPaperSize.pageSizeNames(); items.prepend(i18n("Custom Size...")); media->setItems(items); - connect (media, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMedia(int))); + connect (media, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMedia(int))); - useDocumentSpecifiedSize = new TDEToggleAction(i18n("&Use Document Specified Paper Size"), 0, this, TQT_SLOT(slotShowSidebar()), + useDocumentSpecifiedSize = new TDEToggleAction(i18n("&Use Document Specified Paper Size"), 0, this, TQ_SLOT(slotShowSidebar()), actionCollection(), "view_use_document_specified_size"); // Zoom Actions - zoomInAct = KStdAction::zoomIn (this, TQT_SLOT(zoomIn()), actionCollection()); - zoomOutAct = KStdAction::zoomOut(this, TQT_SLOT(zoomOut()), actionCollection()); + zoomInAct = KStdAction::zoomIn (this, TQ_SLOT(zoomIn()), actionCollection()); + zoomOutAct = KStdAction::zoomOut(this, TQ_SLOT(zoomOut()), actionCollection()); fitPageAct = new TDEToggleAction(i18n("&Fit to Page"), "view_fit_window", Key_P, actionCollection(), "view_fit_to_page"); @@ -251,24 +251,24 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p fitWidthAct -> setExclusiveGroup("view_fit"); fitHeightAct -> setExclusiveGroup("view_fit"); - connect(fitPageAct, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(enableFitToPage(bool))); - connect(fitWidthAct, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(enableFitToWidth(bool))); - connect(fitHeightAct, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(enableFitToHeight(bool))); + connect(fitPageAct, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(enableFitToPage(bool))); + connect(fitWidthAct, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(enableFitToWidth(bool))); + connect(fitHeightAct, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(enableFitToHeight(bool))); // go menu - backAct = KStdAction::prior(this, TQT_SLOT(mp_prevPage()), actionCollection()); - forwardAct = KStdAction::next(this, TQT_SLOT(mp_nextPage()), actionCollection()); - startAct = KStdAction::firstPage(this, TQT_SLOT(mp_firstPage()), actionCollection()); - endAct = KStdAction::lastPage(this, TQT_SLOT(mp_lastPage()), actionCollection()); - gotoAct = KStdAction::gotoPage(this, TQT_SLOT(goToPage()), actionCollection()); + backAct = KStdAction::prior(this, TQ_SLOT(mp_prevPage()), actionCollection()); + forwardAct = KStdAction::next(this, TQ_SLOT(mp_nextPage()), actionCollection()); + startAct = KStdAction::firstPage(this, TQ_SLOT(mp_firstPage()), actionCollection()); + endAct = KStdAction::lastPage(this, TQ_SLOT(mp_lastPage()), actionCollection()); + gotoAct = KStdAction::gotoPage(this, TQ_SLOT(goToPage()), actionCollection()); gotoAct->setShortcut("CTRL+G"); - readUpAct = new TDEAction(i18n("Read Up Document"), "go-up", SHIFT+Key_Space, this, TQT_SLOT(mp_readUp()), actionCollection(), "go_read_up"); - readDownAct = new TDEAction(i18n("Read Down Document"), "go-down", Key_Space, this, TQT_SLOT(mp_readDown()), actionCollection(), "go_read_down"); + readUpAct = new TDEAction(i18n("Read Up Document"), "go-up", SHIFT+Key_Space, this, TQ_SLOT(mp_readUp()), actionCollection(), "go_read_up"); + readDownAct = new TDEAction(i18n("Read Down Document"), "go-down", Key_Space, this, TQ_SLOT(mp_readDown()), actionCollection(), "go_read_down"); - printAction = KStdAction::print(this, TQT_SLOT(slotPrint()), actionCollection()); + printAction = KStdAction::print(this, TQ_SLOT(slotPrint()), actionCollection()); - saveAsAction = KStdAction::saveAs(this, TQT_SLOT(mp_slotSave()), actionCollection()); + saveAsAction = KStdAction::saveAs(this, TQ_SLOT(mp_slotSave()), actionCollection()); // mode action moveModeAction = new TDERadioAction(i18n("&Move Tool"), "movetool", Key_F4, actionCollection(), "move_tool"); @@ -279,20 +279,20 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p moveModeAction->setChecked(true); - connect(moveModeAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableMoveTool(bool))); - //connect(selectionModeAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableSelectionTool(bool))); + connect(moveModeAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableMoveTool(bool))); + //connect(selectionModeAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableSelectionTool(bool))); // history action backAction = new TDEAction(i18n("&Back"), "1leftarrow", 0, - this, TQT_SLOT(mp_doGoBack()), actionCollection(), "go_back"); + this, TQ_SLOT(mp_doGoBack()), actionCollection(), "go_back"); forwardAction = new TDEAction(i18n("&Forward"), "1rightarrow", 0, - this, TQT_SLOT(mp_doGoForward()), actionCollection(), "go_forward"); + this, TQ_SLOT(mp_doGoForward()), actionCollection(), "go_forward"); backAction->setEnabled(false); forwardAction->setEnabled(false); - settingsAction = KStdAction::preferences(this, TQT_SLOT(doSettings()), actionCollection()); + settingsAction = KStdAction::preferences(this, TQ_SLOT(doSettings()), actionCollection()); // We only show this menuitem if no default mimetype is set. This usually means kviewshell // has been started by itself. Otherwise if KDVI or KFaxView has been started show the @@ -300,20 +300,20 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p if (!args.isEmpty()) { aboutAction = new TDEAction(i18n("About KViewShell"), "kviewshell", 0, this, - TQT_SLOT(aboutKViewShell()), actionCollection(), "help_about_kviewshell"); + TQ_SLOT(aboutKViewShell()), actionCollection(), "help_about_kviewshell"); } // keyboard accelerators accel = new TDEAccel(mainWidget); - accel->insert(I18N_NOOP("Scroll Up"), Key_Up, this, TQT_SLOT(mp_scrollUp())); - accel->insert(I18N_NOOP("Scroll Down"), Key_Down, this, TQT_SLOT(mp_scrollDown())); - accel->insert(I18N_NOOP("Scroll Left"), Key_Left, this, TQT_SLOT(mp_scrollLeft())); - accel->insert(I18N_NOOP("Scroll Right"), Key_Right, this, TQT_SLOT(mp_scrollRight())); + accel->insert(I18N_NOOP("Scroll Up"), Key_Up, this, TQ_SLOT(mp_scrollUp())); + accel->insert(I18N_NOOP("Scroll Down"), Key_Down, this, TQ_SLOT(mp_scrollDown())); + accel->insert(I18N_NOOP("Scroll Left"), Key_Left, this, TQ_SLOT(mp_scrollLeft())); + accel->insert(I18N_NOOP("Scroll Right"), Key_Right, this, TQ_SLOT(mp_scrollRight())); - accel->insert(I18N_NOOP("Scroll Up Page"), SHIFT+Key_Up, this, TQT_SLOT(mp_scrollUpPage())); - accel->insert(I18N_NOOP("Scroll Down Page"), SHIFT+Key_Down, this, TQT_SLOT(mp_scrollDownPage())); - accel->insert(I18N_NOOP("Scroll Left Page"), SHIFT+Key_Left, this, TQT_SLOT(mp_scrollLeftPage())); - accel->insert(I18N_NOOP("Scroll Right Page"), SHIFT+Key_Right, this, TQT_SLOT(mp_scrollRightPage())); + accel->insert(I18N_NOOP("Scroll Up Page"), SHIFT+Key_Up, this, TQ_SLOT(mp_scrollUpPage())); + accel->insert(I18N_NOOP("Scroll Down Page"), SHIFT+Key_Down, this, TQ_SLOT(mp_scrollDownPage())); + accel->insert(I18N_NOOP("Scroll Left Page"), SHIFT+Key_Left, this, TQ_SLOT(mp_scrollLeftPage())); + accel->insert(I18N_NOOP("Scroll Right Page"), SHIFT+Key_Right, this, TQ_SLOT(mp_scrollRightPage())); accel->readSettings(); readSettings(); @@ -333,7 +333,7 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p // We disconnect because we dont want some FocusEvents to trigger a GUI update, which might mess // with our menus. - disconnect(partManager, TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SIGNAL(pluginChanged(KParts::Part*))); + disconnect(partManager, TQ_SIGNAL(activePartChanged(KParts::Part*)), this, TQ_SIGNAL(pluginChanged(KParts::Part*))); } KViewPart::~KViewPart() @@ -360,41 +360,41 @@ void KViewPart::initializeMultiPage() // Paper Size handling multiPage->setUseDocumentSpecifiedSize(useDocumentSpecifiedSize->isChecked()); multiPage->setUserPreferredSize(userRequestedPaperSize); - connect(&userRequestedPaperSize, TQT_SIGNAL(sizeChanged(const SimplePageSize&)), multiPage, TQT_SLOT(setUserPreferredSize(const SimplePageSize&))); - connect(useDocumentSpecifiedSize, TQT_SIGNAL(toggled(bool)), multiPage, TQT_SLOT(setUseDocumentSpecifiedSize(bool))); + connect(&userRequestedPaperSize, TQ_SIGNAL(sizeChanged(const SimplePageSize&)), multiPage, TQ_SLOT(setUserPreferredSize(const SimplePageSize&))); + connect(useDocumentSpecifiedSize, TQ_SIGNAL(toggled(bool)), multiPage, TQ_SLOT(setUseDocumentSpecifiedSize(bool))); - connect(scrollbarHandling, TQT_SIGNAL(toggled(bool)), multiPage, TQT_SLOT(slotShowScrollbars(bool))); + connect(scrollbarHandling, TQ_SIGNAL(toggled(bool)), multiPage, TQ_SLOT(slotShowScrollbars(bool))); // connect to the multi page view - connect( this, TQT_SIGNAL(scrollbarStatusChanged(bool)), multiPage, TQT_SLOT(slotShowScrollbars(bool))); - connect( multiPage, TQT_SIGNAL(pageInfo(int, int)), this, TQT_SLOT(pageInfo(int, int)) ); - connect( multiPage, TQT_SIGNAL(askingToCheckActions()), this, TQT_SLOT(checkActions()) ); - connect( multiPage, TQT_SIGNAL( started( TDEIO::Job * ) ), this, TQT_SIGNAL( started( TDEIO::Job * ) ) ); - connect( multiPage, TQT_SIGNAL( completed() ), this, TQT_SIGNAL( completed() ) ); - connect( multiPage, TQT_SIGNAL( canceled( const TQString & ) ), this, TQT_SIGNAL( canceled( const TQString & ) ) ); - connect( multiPage, TQT_SIGNAL( setStatusBarText( const TQString& ) ), this, TQT_SLOT( setStatusBarTextFromMultiPage( const TQString& ) ) ); + connect( this, TQ_SIGNAL(scrollbarStatusChanged(bool)), multiPage, TQ_SLOT(slotShowScrollbars(bool))); + connect( multiPage, TQ_SIGNAL(pageInfo(int, int)), this, TQ_SLOT(pageInfo(int, int)) ); + connect( multiPage, TQ_SIGNAL(askingToCheckActions()), this, TQ_SLOT(checkActions()) ); + connect( multiPage, TQ_SIGNAL( started( TDEIO::Job * ) ), this, TQ_SIGNAL( started( TDEIO::Job * ) ) ); + connect( multiPage, TQ_SIGNAL( completed() ), this, TQ_SIGNAL( completed() ) ); + connect( multiPage, TQ_SIGNAL( canceled( const TQString & ) ), this, TQ_SIGNAL( canceled( const TQString & ) ) ); + connect( multiPage, TQ_SIGNAL( setStatusBarText( const TQString& ) ), this, TQ_SLOT( setStatusBarTextFromMultiPage( const TQString& ) ) ); - connect( multiPage, TQT_SIGNAL(zoomIn()), this, TQT_SLOT(zoomIn()) ); - connect( multiPage, TQT_SIGNAL(zoomOut()), this, TQT_SLOT(zoomOut()) ); + connect( multiPage, TQ_SIGNAL(zoomIn()), this, TQ_SLOT(zoomIn()) ); + connect( multiPage, TQ_SIGNAL(zoomOut()), this, TQ_SLOT(zoomOut()) ); // change the viewmode - connect(viewModeAction, TQT_SIGNAL(activated (int)), multiPage, TQT_SLOT(setViewMode(int))); + connect(viewModeAction, TQ_SIGNAL(activated (int)), multiPage, TQ_SLOT(setViewMode(int))); // Update zoomlevel on viewmode changes - connect(multiPage, TQT_SIGNAL(viewModeChanged()), this, TQT_SLOT(updateZoomLevel())); + connect(multiPage, TQ_SIGNAL(viewModeChanged()), this, TQ_SLOT(updateZoomLevel())); // navigation history - connect(multiPage->history(), TQT_SIGNAL(backItem(bool)), backAction, TQT_SLOT(setEnabled(bool))); - connect(multiPage->history(), TQT_SIGNAL(forwardItem(bool)), forwardAction, TQT_SLOT(setEnabled(bool))); + connect(multiPage->history(), TQ_SIGNAL(backItem(bool)), backAction, TQ_SLOT(setEnabled(bool))); + connect(multiPage->history(), TQ_SIGNAL(forwardItem(bool)), forwardAction, TQ_SLOT(setEnabled(bool))); // text selection - connect(multiPage, TQT_SIGNAL(textSelected(bool)), copyTextAction, TQT_SLOT(setEnabled(bool))); - connect(multiPage, TQT_SIGNAL(textSelected(bool)), deselectAction, TQT_SLOT(setEnabled(bool))); + connect(multiPage, TQ_SIGNAL(textSelected(bool)), copyTextAction, TQ_SLOT(setEnabled(bool))); + connect(multiPage, TQ_SIGNAL(textSelected(bool)), deselectAction, TQ_SLOT(setEnabled(bool))); // text search - connect(multiPage, TQT_SIGNAL(searchEnabled(bool)), findNextAction, TQT_SLOT(setEnabled(bool))); - connect(multiPage, TQT_SIGNAL(searchEnabled(bool)), findPrevAction, TQT_SLOT(setEnabled(bool))); + connect(multiPage, TQ_SIGNAL(searchEnabled(bool)), findNextAction, TQ_SLOT(setEnabled(bool))); + connect(multiPage, TQ_SIGNAL(searchEnabled(bool)), findPrevAction, TQ_SLOT(setEnabled(bool))); // allow parts to have a GUI, too :-) // (will be merged automatically) @@ -724,7 +724,7 @@ bool KViewPart::openFile() bool progress_dialog_was_cancelled = false; while ((read = filterDev->readBlock(buf.data(), buf.size())) > 0) { - kapp->processEvents(); + tdeApp->processEvents(); progress_dialog_was_cancelled = prog->wasCancelled(); if (progress_dialog_was_cancelled) break; @@ -800,7 +800,7 @@ bool KViewPart::openFile() // Try to load the multiPage int error; - multiPage = static_cast<KMultiPage*>(KParts::ComponentFactory::createInstanceFromService<KParts::ReadOnlyPart>(service, TQT_TQOBJECT(mainWidget), + multiPage = static_cast<KMultiPage*>(KParts::ComponentFactory::createInstanceFromService<KParts::ReadOnlyPart>(service, mainWidget, service->name().utf8(), TQStringList(), &error )); if (multiPage.isNull()) { @@ -845,7 +845,7 @@ bool KViewPart::openFile() // Remember the name of the part. So only need to switch if really necessary. multiPageLibrary = service->library(); - connect(partManager, TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SIGNAL(pluginChanged(KParts::Part*))); + connect(partManager, TQ_SIGNAL(activePartChanged(KParts::Part*)), this, TQ_SIGNAL(pluginChanged(KParts::Part*))); // Switch to the new multiPage partManager->replacePart(oldMultiPage, multiPage); @@ -856,13 +856,13 @@ bool KViewPart::openFile() // is at first show at a very small zoomlevel before the zoom switches to the right value. // This makes the plugin switching actually slower. // TODO: Get rid of this without causing nasty artifacts. - kapp->processEvents(); + tdeApp->processEvents(); initializeMultiPage(); partManager->setActivePart(this); // We disconnect because we dont want some FocusEvents to trigger a GUI update, which might mess // with our menus. - disconnect(partManager, TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SIGNAL(pluginChanged(KParts::Part*))); + disconnect(partManager, TQ_SIGNAL(activePartChanged(KParts::Part*)), this, TQ_SIGNAL(pluginChanged(KParts::Part*))); readSettings(); } @@ -1083,15 +1083,15 @@ void KViewPart::enableFitToPage(bool enable) if (enable) { fitToPage(); - connect(multiPage->mainWidget(), TQT_SIGNAL(viewSizeChanged(const TQSize&)), - this, TQT_SLOT(slotStartFitTimer())); - connect(&fitTimer, TQT_SIGNAL(timeout()), TQT_SLOT(fitToPage())); + connect(multiPage->mainWidget(), TQ_SIGNAL(viewSizeChanged(const TQSize&)), + this, TQ_SLOT(slotStartFitTimer())); + connect(&fitTimer, TQ_SIGNAL(timeout()), TQ_SLOT(fitToPage())); } else { - disconnect(multiPage->mainWidget(), TQT_SIGNAL(viewSizeChanged(const TQSize&)), - this, TQT_SLOT(slotStartFitTimer())); - disconnect(&fitTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fitToPage())); + disconnect(multiPage->mainWidget(), TQ_SIGNAL(viewSizeChanged(const TQSize&)), + this, TQ_SLOT(slotStartFitTimer())); + disconnect(&fitTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(fitToPage())); } } @@ -1100,15 +1100,15 @@ void KViewPart::enableFitToWidth(bool enable) if (enable) { fitToWidth(); - connect(multiPage->mainWidget(), TQT_SIGNAL(viewSizeChanged(const TQSize&)), - this, TQT_SLOT(slotStartFitTimer())); - connect(&fitTimer, TQT_SIGNAL(timeout()), TQT_SLOT(fitToWidth())); + connect(multiPage->mainWidget(), TQ_SIGNAL(viewSizeChanged(const TQSize&)), + this, TQ_SLOT(slotStartFitTimer())); + connect(&fitTimer, TQ_SIGNAL(timeout()), TQ_SLOT(fitToWidth())); } else { - disconnect(multiPage->mainWidget(), TQT_SIGNAL(viewSizeChanged(const TQSize&)), - this, TQT_SLOT(slotStartFitTimer())); - disconnect(&fitTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fitToWidth())); + disconnect(multiPage->mainWidget(), TQ_SIGNAL(viewSizeChanged(const TQSize&)), + this, TQ_SLOT(slotStartFitTimer())); + disconnect(&fitTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(fitToWidth())); } } @@ -1117,15 +1117,15 @@ void KViewPart::enableFitToHeight(bool enable) if (enable) { fitToHeight(); - connect(multiPage->mainWidget(), TQT_SIGNAL(viewSizeChanged(const TQSize&)), - this, TQT_SLOT(slotStartFitTimer())); - connect(&fitTimer, TQT_SIGNAL(timeout()), TQT_SLOT(fitToHeight())); + connect(multiPage->mainWidget(), TQ_SIGNAL(viewSizeChanged(const TQSize&)), + this, TQ_SLOT(slotStartFitTimer())); + connect(&fitTimer, TQ_SIGNAL(timeout()), TQ_SLOT(fitToHeight())); } else { - disconnect(multiPage->mainWidget(), TQT_SIGNAL(viewSizeChanged(const TQSize&)), - this, TQT_SLOT(slotStartFitTimer())); - disconnect(&fitTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fitToHeight())); + disconnect(multiPage->mainWidget(), TQ_SIGNAL(viewSizeChanged(const TQSize&)), + this, TQ_SLOT(slotStartFitTimer())); + disconnect(&fitTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(fitToHeight())); } } @@ -1460,7 +1460,7 @@ void KViewPart::doSettings() multiPage->addConfigDialogs(configDialog); - connect(configDialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(preferencesChanged())); + connect(configDialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(preferencesChanged())); configDialog->show(); } diff --git a/kviewshell/kviewpart.h b/kviewshell/kviewpart.h index aaa0240b..3f3c9bbe 100644 --- a/kviewshell/kviewpart.h +++ b/kviewshell/kviewpart.h @@ -29,7 +29,7 @@ class TQSize; class KViewPart : public KViewPart_Iface { - Q_OBJECT + TQ_OBJECT public: @@ -238,7 +238,7 @@ private: class KViewPartExtension : public KParts::BrowserExtension { - Q_OBJECT + TQ_OBJECT friend class KViewPart; diff --git a/kviewshell/kviewpart_iface.h b/kviewshell/kviewpart_iface.h index 78dd9cec..83e0dbd5 100644 --- a/kviewshell/kviewpart_iface.h +++ b/kviewshell/kviewpart_iface.h @@ -8,7 +8,7 @@ class TQStringList; class KViewPart_Iface : public KParts::ReadOnlyPart { - Q_OBJECT + TQ_OBJECT public: KViewPart_Iface(TQObject *parent, const char *name) diff --git a/kviewshell/kviewshell.cpp b/kviewshell/kviewshell.cpp index 1a29eb71..a759ddeb 100644 --- a/kviewshell/kviewshell.cpp +++ b/kviewshell/kviewshell.cpp @@ -13,7 +13,7 @@ #include <tqregexp.h> #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <tdeaction.h> #include <tdeconfig.h> @@ -55,13 +55,13 @@ KViewShell::KViewShell(const TQString& defaultMimeType) if (factory) { if (defaultMimeType == TQString()) { - view = (KViewPart_Iface*) factory->create(TQT_TQOBJECT(this), "kviewerpart", "KViewPart"); + view = (KViewPart_Iface*) factory->create(this, "kviewerpart", "KViewPart"); } else { TQStringList args; args << defaultMimeType; - view = (KViewPart_Iface*) factory->create(TQT_TQOBJECT(this), "kviewerpart", "KViewPart", args); + view = (KViewPart_Iface*) factory->create(this, "kviewerpart", "KViewPart", args); } if (!view) ::exit(-1); @@ -73,33 +73,33 @@ KViewShell::KViewShell(const TQString& defaultMimeType) setCentralWidget(view->widget()); // file menu - KStdAction::open(TQT_TQOBJECT(view), TQT_SLOT(slotFileOpen()), actionCollection()); - recent = KStdAction::openRecent (TQT_TQOBJECT(this), TQT_SLOT(openURL(const KURL &)), actionCollection()); - reloadAction = new TDEAction(i18n("Reload"), "reload", CTRL + Key_R, view, TQT_SLOT(reload()), actionCollection(), "reload"); - closeAction = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection()); - KStdAction::quit (TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection()); + KStdAction::open(view, TQ_SLOT(slotFileOpen()), actionCollection()); + recent = KStdAction::openRecent (this, TQ_SLOT(openURL(const KURL &)), actionCollection()); + reloadAction = new TDEAction(i18n("Reload"), "reload", CTRL + Key_R, view, TQ_SLOT(reload()), actionCollection(), "reload"); + closeAction = KStdAction::close(this, TQ_SLOT(slotFileClose()), actionCollection()); + KStdAction::quit (this, TQ_SLOT(slotQuit()), actionCollection()); - connect(view, TQT_SIGNAL(fileOpened()), this, TQT_SLOT(addRecentFile())); + connect(view, TQ_SIGNAL(fileOpened()), this, TQ_SLOT(addRecentFile())); // view menu - fullScreenAction = KStdAction::fullScreen(TQT_TQOBJECT(this), TQT_SLOT(slotFullScreen()), actionCollection(), this, "fullscreen" ); + fullScreenAction = KStdAction::fullScreen(this, TQ_SLOT(slotFullScreen()), actionCollection(), this, "fullscreen" ); // settings menu createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbar()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(slotConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(slotEditToolbar()), actionCollection()); // statusbar connects - connect( view, TQT_SIGNAL( zoomChanged(const TQString &) ), this,TQT_SLOT( slotChangeZoomText(const TQString &) ) ); - connect( view, TQT_SIGNAL( pageChanged(const TQString &) ), this,TQT_SLOT( slotChangePageText(const TQString &) ) ); - connect( view, TQT_SIGNAL( sizeChanged(const TQString &) ), this,TQT_SLOT( slotChangeSizeText(const TQString &) ) ); + connect( view, TQ_SIGNAL( zoomChanged(const TQString &) ), this,TQ_SLOT( slotChangeZoomText(const TQString &) ) ); + connect( view, TQ_SIGNAL( pageChanged(const TQString &) ), this,TQ_SLOT( slotChangePageText(const TQString &) ) ); + connect( view, TQ_SIGNAL( sizeChanged(const TQString &) ), this,TQ_SLOT( slotChangeSizeText(const TQString &) ) ); // Setup session management - connect( this, TQT_SIGNAL( restoreDocument(const KURL &, int) ), view, TQT_SLOT( restoreDocument(const KURL &, int))); - connect( this, TQT_SIGNAL( saveDocumentRestoreInfo(TDEConfig*) ), view, TQT_SLOT( saveDocumentRestoreInfo(TDEConfig*))); + connect( this, TQ_SIGNAL( restoreDocument(const KURL &, int) ), view, TQ_SLOT( restoreDocument(const KURL &, int))); + connect( this, TQ_SIGNAL( saveDocumentRestoreInfo(TDEConfig*) ), view, TQ_SLOT( saveDocumentRestoreInfo(TDEConfig*))); setXMLFile( "kviewshell.rc" ); createGUI(view); @@ -120,7 +120,7 @@ KViewShell::KViewShell(const TQString& defaultMimeType) statusBar()->changeItem("", StatusBar_ID_Zoom); statusBar()->insertItem(view->pageSizeDescription(), StatusBar_ID_PageSize, 0, true); - connect( view, TQT_SIGNAL(pluginChanged(KParts::Part*)), this, TQT_SLOT(createGUI(KParts::Part*))); + connect( view, TQ_SIGNAL(pluginChanged(KParts::Part*)), this, TQ_SLOT(createGUI(KParts::Part*))); } @@ -158,8 +158,8 @@ void KViewShell::slotQuit() menuBar()->show(); view->slotSetFullPage(false); } - kapp->closeAllWindows(); - kapp->quit(); + tdeApp->closeAllWindows(); + tdeApp->quit(); } @@ -168,7 +168,7 @@ void KViewShell::readSettings() resize(600, 300); // default size if the config file specifies no size setAutoSaveSettings( "General" ); // apply mainwindow settings (size, toolbars, etc.) - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General"); recent->loadEntries(config, "Recent Files"); @@ -191,7 +191,7 @@ void KViewShell::readSettings() void KViewShell::writeSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup( "General" ); recent->saveEntries(config, "Recent Files"); @@ -290,7 +290,7 @@ void KViewShell::slotEditToolbar() { saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() ); KEditToolbar dlg(factory()); - connect( &dlg, TQT_SIGNAL( newToolbarConfig() ), TQT_SLOT( slotNewToolbarConfig() ) ); + connect( &dlg, TQ_SIGNAL( newToolbarConfig() ), TQ_SLOT( slotNewToolbarConfig() ) ); dlg.exec(); } diff --git a/kviewshell/kviewshell.h b/kviewshell/kviewshell.h index 43876bcd..4a6b7a93 100644 --- a/kviewshell/kviewshell.h +++ b/kviewshell/kviewshell.h @@ -14,7 +14,7 @@ class TQLabel; class KViewShell : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/kviewshell.kcfg b/kviewshell/kviewshell.kcfg index b292b1ec..9a025e8a 100644 --- a/kviewshell/kviewshell.kcfg +++ b/kviewshell/kviewshell.kcfg @@ -81,7 +81,7 @@ </group> <group name="Accessibility" > <entry key="PaperColor" type="Color" > - <default code="true" >Qt::white</default> + <default code="true" >TQt::white</default> </entry> <entry key="ChangeColors" type="Bool" > <default>false</default> diff --git a/kviewshell/marklist.cpp b/kviewshell/marklist.cpp index 798f4559..fcd80160 100644 --- a/kviewshell/marklist.cpp +++ b/kviewshell/marklist.cpp @@ -108,7 +108,7 @@ void ThumbnailWidget::paintEvent(TQPaintEvent* e) // TODO: Disable or find something less distractiong. p.drawPixmap(10, 10, *waitIcon); - TQTimer::singleShot(50, this, TQT_SLOT(setThumbnail())); + TQTimer::singleShot(50, this, TQ_SLOT(setThumbnail())); return; } @@ -144,7 +144,7 @@ void ThumbnailWidget::setThumbnail() // When we are fast scrolling thru the document. Many paint events are created, that // are often not needed anymore at the time the eventloop executes them. //kdDebug() << "Delayed request Abort Thumbnail drawing for page " << pageNumber << endl; - kapp->processEvents(); + tdeApp->processEvents(); return; } @@ -157,7 +157,7 @@ void ThumbnailWidget::setThumbnail() setFixedHeight(thumbnail.height() + 2); update(); - kapp->processEvents(); + tdeApp->processEvents(); } @@ -181,7 +181,7 @@ MarkListWidget::MarkListWidget(TQWidget* _parent, MarkList* _markList, const Pag TQBoxLayout* bottomLayout = new TQHBoxLayout(layout); checkBox = new TQCheckBox(TQString(), this ); - checkBox->setFocusPolicy(TQ_NoFocus); + checkBox->setFocusPolicy(TQWidget::NoFocus); TQToolTip::add(checkBox, i18n("Select for printing")); bottomLayout->addWidget(checkBox, 0, TQt::AlignAuto); @@ -258,11 +258,11 @@ bool MarkListWidget::isVisible() void MarkListWidget::mousePressEvent(TQMouseEvent* e) { // Select Page - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { emit selected(pageNumber); } - else if (e->button() == Qt::RightButton) + else if (e->button() == TQt::RightButton) { emit showPopupMenu(pageNumber, e->globalPos()); } @@ -277,8 +277,8 @@ MarkList::MarkList(TQWidget* parent, const char* name) { currentPage = PageNumber::invalidPage; widgetList.setAutoDelete(true); - setFocusPolicy( TQ_StrongFocus ); - //viewport()->setFocusPolicy( TQ_WheelFocus ); + setFocusPolicy( TQWidget::StrongFocus ); + //viewport()->setFocusPolicy( TQWidget::WheelFocus ); setResizePolicy(TQScrollView::Manual); setVScrollBarMode(TQScrollView::AlwaysOn); @@ -325,8 +325,8 @@ void MarkList::setNumberOfPages(int numberOfPages, bool _showThumbnails) { MarkListWidget* item = new MarkListWidget(viewport(), this, page, pageCache, showThumbnails); - connect(item, TQT_SIGNAL(selected(const PageNumber&)), this, TQT_SLOT(thumbnailSelected(const PageNumber&))); - connect(item, TQT_SIGNAL(showPopupMenu(const PageNumber&, const TQPoint&)), this, TQT_SLOT(showPopupMenu(const PageNumber&, const TQPoint&))); + connect(item, TQ_SIGNAL(selected(const PageNumber&)), this, TQ_SLOT(thumbnailSelected(const PageNumber&))); + connect(item, TQ_SIGNAL(showPopupMenu(const PageNumber&, const TQPoint&)), this, TQ_SLOT(showPopupMenu(const PageNumber&, const TQPoint&))); widgetList.insert(page - 1, item); @@ -502,7 +502,7 @@ void MarkList::updateWidgetSize(const PageNumber& pageNumber) void MarkList::mousePressEvent(TQMouseEvent* e) { - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) { // We call showPopupMenu with an invalid pageNumber to indicate that // the mouse does not point at a thumbnailWidget. diff --git a/kviewshell/marklist.h b/kviewshell/marklist.h index d844934a..9375b73d 100644 --- a/kviewshell/marklist.h +++ b/kviewshell/marklist.h @@ -41,7 +41,7 @@ class MarkListWidget; class ThumbnailWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -72,7 +72,7 @@ private: class MarkListWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -124,7 +124,7 @@ private: class MarkList: public TQScrollView { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/pageSize.h b/kviewshell/pageSize.h index d7f31146..270d12a0 100644 --- a/kviewshell/pageSize.h +++ b/kviewshell/pageSize.h @@ -39,7 +39,7 @@ The main difference to the SimplePageSize class are the following. class pageSize : public TQObject, public SimplePageSize { -Q_OBJECT +TQ_OBJECT public: diff --git a/kviewshell/pageSizeDialog.h b/kviewshell/pageSizeDialog.h index 8c651d55..00300105 100644 --- a/kviewshell/pageSizeDialog.h +++ b/kviewshell/pageSizeDialog.h @@ -27,7 +27,7 @@ class pageSize; class pageSizeDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/pageSizeWidget.cpp b/kviewshell/pageSizeWidget.cpp index 52e52237..b9fd432b 100644 --- a/kviewshell/pageSizeWidget.cpp +++ b/kviewshell/pageSizeWidget.cpp @@ -26,7 +26,7 @@ pageSizeWidget::pageSizeWidget( TQWidget* parent, const char* name, WFlags fl ) : pageSizeWidget_base( parent, name, fl ) { - connect(&chosenSize, TQT_SIGNAL(sizeChanged(const SimplePageSize&)), previewer, TQT_SLOT(setSize(const SimplePageSize&))); + connect(&chosenSize, TQ_SIGNAL(sizeChanged(const SimplePageSize&)), previewer, TQ_SLOT(setSize(const SimplePageSize&))); // Set up the formatChoice TQComboBox formatChoice->insertItem(i18n("Custom Size")); @@ -42,23 +42,23 @@ pageSizeWidget::pageSizeWidget( TQWidget* parent, const char* name, WFlags fl ) } paperSize(formatChoice->currentItem()); - connect(formatChoice, TQT_SIGNAL(activated(int)), this, TQT_SLOT(paperSize(int))); - connect(orientationChoice, TQT_SIGNAL(activated(int)), this, TQT_SLOT(orientationChanged(int))); + connect(formatChoice, TQ_SIGNAL(activated(int)), this, TQ_SLOT(paperSize(int))); + connect(orientationChoice, TQ_SIGNAL(activated(int)), this, TQ_SLOT(orientationChanged(int))); // Update the text fields when the user switches to a new unit, and // when the "custom format" is NOT selected. - connect(widthUnits, TQT_SIGNAL(activated(int)), this, TQT_SLOT(unitsChanged(int))); - connect(heightUnits, TQT_SIGNAL(activated(int)), this, TQT_SLOT(unitsChanged(int))); + connect(widthUnits, TQ_SIGNAL(activated(int)), this, TQ_SLOT(unitsChanged(int))); + connect(heightUnits, TQ_SIGNAL(activated(int)), this, TQ_SLOT(unitsChanged(int))); // Upate the chosen size whenever the user edits the input field. - connect(widthInput, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(input(const TQString &))); - connect(heightInput, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(input(const TQString &))); + connect(widthInput, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(input(const TQString &))); + connect(heightInput, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(input(const TQString &))); // 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, TQT_TQOBJECT(this), "widthValidator")); - heightInput->setValidator(new TQDoubleValidator(0.0, 1200.0, 1, TQT_TQOBJECT(this), "heightValidator")); + widthInput->setValidator(new TQDoubleValidator(0.0, 1200.0, 1, this, "widthValidator")); + heightInput->setValidator(new TQDoubleValidator(0.0, 1200.0, 1, this, "heightValidator")); } diff --git a/kviewshell/pageSizeWidget.h b/kviewshell/pageSizeWidget.h index 4834883f..dbbfe269 100644 --- a/kviewshell/pageSizeWidget.h +++ b/kviewshell/pageSizeWidget.h @@ -17,7 +17,7 @@ class TQDoubleValidator; class pageSizeWidget : public pageSizeWidget_base { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/pageView.cpp b/kviewshell/pageView.cpp index 2be0a51a..028522f1 100644 --- a/kviewshell/pageView.cpp +++ b/kviewshell/pageView.cpp @@ -36,7 +36,7 @@ PageView::PageView( TQWidget* parent, const char* name ) moveTool = true; widgetList = 0; - viewport()->setFocusPolicy(TQ_StrongFocus); + viewport()->setFocusPolicy(TQWidget::StrongFocus); setResizePolicy(TQScrollView::Manual); @@ -54,7 +54,7 @@ PageView::PageView( TQWidget* parent, const char* name ) continuousViewmode = true; fullScreen = false; - connect(this, TQT_SIGNAL(contentsMoving(int, int)), this, TQT_SLOT(calculateCurrentPageNumber(int, int))); + connect(this, TQ_SIGNAL(contentsMoving(int, int)), this, TQ_SLOT(calculateCurrentPageNumber(int, int))); } @@ -195,7 +195,7 @@ void PageView::keyPressEvent( TQKeyEvent* e ) void PageView::contentsMousePressEvent( TQMouseEvent* e ) { - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { if (moveTool) { @@ -222,7 +222,7 @@ void PageView::contentsMouseMoveEvent( TQMouseEvent* e ) { TQPoint newPos = e->globalPos(); - if (e->state() == Qt::LeftButton && moveTool) + if (e->state() == TQt::LeftButton && moveTool) { TQPoint delta = dragGrabPos - newPos; scrollBy(delta.x(), delta.y()); diff --git a/kviewshell/pageView.h b/kviewshell/pageView.h index 6b15b1f7..2664f4f9 100644 --- a/kviewshell/pageView.h +++ b/kviewshell/pageView.h @@ -35,7 +35,7 @@ class PageNumber; */ class PageView : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/plugins/djvu/djvumultipage.cpp b/kviewshell/plugins/djvu/djvumultipage.cpp index ae1ab9f6..8cfde527 100644 --- a/kviewshell/plugins/djvu/djvumultipage.cpp +++ b/kviewshell/plugins/djvu/djvumultipage.cpp @@ -67,10 +67,10 @@ DjVuMultiPage::DjVuMultiPage(TQWidget *parentWidget, const char *widgetName, TQO renderModeAction->setCurrentItem(Prefs::renderMode()); - deletePagesAction = new TDEAction(i18n("Delete Pages..."), 0, this, TQT_SLOT(slotDeletePages()), actionCollection(), "delete_pages"); + deletePagesAction = new TDEAction(i18n("Delete Pages..."), 0, this, TQ_SLOT(slotDeletePages()), actionCollection(), "delete_pages"); // change the rendermode - connect(renderModeAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setRenderMode(int))); + connect(renderModeAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setRenderMode(int))); /* It is very important that this method is called in the constructor. Otherwise tdemultipage does not know how to render diff --git a/kviewshell/plugins/djvu/djvumultipage.h b/kviewshell/plugins/djvu/djvumultipage.h index 2bbc6f4a..83cf8ff1 100644 --- a/kviewshell/plugins/djvu/djvumultipage.h +++ b/kviewshell/plugins/djvu/djvumultipage.h @@ -86,7 +86,7 @@ required. class DjVuMultiPage : public KMultiPage { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/plugins/djvu/djvurenderer.cpp b/kviewshell/plugins/djvu/djvurenderer.cpp index c9e52c1e..2fac80bb 100644 --- a/kviewshell/plugins/djvu/djvurenderer.cpp +++ b/kviewshell/plugins/djvu/djvurenderer.cpp @@ -27,7 +27,7 @@ #include <tqfileinfo.h> #include <tqimage.h> #include <tqpainter.h> -#include <kapp.h> +#include <tdeapplication.h> #include "GBitmap.h" #include "BSByteStream.h" @@ -403,7 +403,7 @@ bool DjVuRenderer::initializeDocument() for(TQ_UINT16 i=0; i<numPages; i++) { // Keep the GUI updated if (i%100 == 0) - kapp->processEvents(); + tdeApp->processEvents(); GP<DjVuFile> djvuFile = document->get_djvu_file(i); int resolution; @@ -611,7 +611,7 @@ bool DjVuRenderer::convertToPSFile( DjVuToPS &converter, TQString filename, TQVa delete pdialog; // This is to keep the GUI updated. - kapp->processEvents(); + tdeApp->processEvents(); obs->flush(); return !iscancelled; @@ -639,7 +639,7 @@ void DjVuRenderer::deletePages(TQ_UINT16 from, TQ_UINT16 to) pdialog->progressBar()->setTotalSteps(to-from+1); pdialog->progressBar()->setFormat(TQString()); pdialog->show(); - kapp->processEvents(); + tdeApp->processEvents(); } // set the document pointer temporarily to 0, so that no-one tries @@ -658,7 +658,7 @@ void DjVuRenderer::deletePages(TQ_UINT16 from, TQ_UINT16 to) document_new->remove_page(from-1); pdialog->progressBar()->setProgress(i-from); pdialog->progressBar()->setFormat(i18n("deleting page %1").arg(i)); - kapp->processEvents(); + tdeApp->processEvents(); } delete pdialog; } @@ -712,7 +712,7 @@ void DjVuRenderer::printerInfoCallBack(int page_num, int page_count, int, DjVuTo G_THROW("STOP"); // This is to keep the GUI updated. - kapp->processEvents(); + tdeApp->processEvents(); } diff --git a/kviewshell/plugins/djvu/djvurenderer.h b/kviewshell/plugins/djvu/djvurenderer.h index ff615033..8dd61e68 100644 --- a/kviewshell/plugins/djvu/djvurenderer.h +++ b/kviewshell/plugins/djvu/djvurenderer.h @@ -50,7 +50,7 @@ with 10 empty pages of A4 size and a few anchors and bookmarks. class DjVuRenderer : public DocumentRenderer { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/plugins/djvu/libdjvu/Arrays.h b/kviewshell/plugins/djvu/libdjvu/Arrays.h index 2e16520c..ca0b1771 100644 --- a/kviewshell/plugins/djvu/libdjvu/Arrays.h +++ b/kviewshell/plugins/djvu/libdjvu/Arrays.h @@ -478,10 +478,8 @@ public: subscript range, you must stop using the pointers returned by prior invocation of this conversion operator. */ operator const TYPE* () const; - -#ifndef __MWERKS__ //MCW can't compile operator const TYPE* (); -#endif + /** Insert new elements into an array. This function inserts #howmany# elements at position #n# into the array. The initial value #val# is copied into the new elements. All array elements previously located at subscripts @@ -528,14 +526,12 @@ ArrayBaseT<TYPE>::operator TYPE* () return &((TYPE *) rep->data)[-rep->minlo]; } -#ifndef __MWERKS__ //MCW can't compile template <class TYPE> inline ArrayBaseT<TYPE>::operator const TYPE* () { const ArrayRep * rep=(const ArrayRep *) get(); return &((const TYPE *) rep->data)[-rep->minlo]; } -#endif template <class TYPE> inline ArrayBaseT<TYPE>::operator const TYPE* () const @@ -903,11 +899,7 @@ public: const GP<TYPE>& operator[](int n) const; // -- CONVERSION operator GP<TYPE>* (); - -#ifndef __MWERKS__ //MCW can't compile operator const GP<TYPE>* (); -#endif - operator const GP<TYPE>* () const; // -- ALTERATION void ins(int n, const GP<TYPE> &val, unsigned int howmany=1); @@ -952,13 +944,11 @@ inline DPArray<TYPE>::operator GP<TYPE>* () return (GP<TYPE> *) DArray<GPBase>::operator GPBase*(); } -#ifndef __MWERKS__ //MCW can't compile template<class TYPE> inline DPArray<TYPE>::operator const GP<TYPE>* () { return (const GP<TYPE> *) DArray<GPBase>::operator const GPBase*(); } -#endif template<class TYPE> inline DPArray<TYPE>::operator const GP<TYPE>* () const diff --git a/kviewshell/plugins/djvu/libdjvu/ByteStream.h b/kviewshell/plugins/djvu/libdjvu/ByteStream.h index a92e8aa4..29874faf 100644 --- a/kviewshell/plugins/djvu/libdjvu/ByteStream.h +++ b/kviewshell/plugins/djvu/libdjvu/ByteStream.h @@ -186,7 +186,7 @@ public: {\bf Error reporting}: If #seek()# succeeds, #0# is returned. Otherwise it either returns - #-1# (if #nothrow# is set to #FALSE#) or throws the \Ref{GException} + #-1# (if #nothrow# is set to #false#) or throws the \Ref{GException} exception. */ virtual int seek(long offset, int whence = SEEK_SET, bool nothrow=false); /** Flushes all buffers in the ByteStream. Calling this function diff --git a/kviewshell/plugins/djvu/libdjvu/DataPool.cpp b/kviewshell/plugins/djvu/libdjvu/DataPool.cpp index ab738a56..5766e67e 100644 --- a/kviewshell/plugins/djvu/libdjvu/DataPool.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DataPool.cpp @@ -1268,7 +1268,7 @@ DataPool::get_data(void * buffer, int offset, int sz, int level) // This call to get_data() should return immediately as there MUST // be data in the buffer after wait_for_data(reader) returns - // or eof_flag should be TRUE + // or eof_flag should be true return get_data(buffer, reader->offset, reader->size, level); } return 0; diff --git a/kviewshell/plugins/djvu/libdjvu/DataPool.h b/kviewshell/plugins/djvu/libdjvu/DataPool.h index ffd99ec5..c6a4e672 100644 --- a/kviewshell/plugins/djvu/libdjvu/DataPool.h +++ b/kviewshell/plugins/djvu/libdjvu/DataPool.h @@ -139,10 +139,10 @@ class ByteStream; Functions like \Ref{get_data}() or \Ref{get_stream}() can be used to obtain direct or sequential access to the data. As - long as \Ref{is_eof}() is #FALSE#, #DataPool# will block every + long as \Ref{is_eof}() is #false#, #DataPool# will block every reader, which is trying to read unavailable data until it really becomes available. But as soon as \Ref{is_eof}() is - #TRUE#, any attempt to read non-existing data will read #0# bytes. + #true#, any attempt to read non-existing data will read #0# bytes. Taking into account the fact, that #DataPool# was designed to store DjVu files, which are in IFF formats, it becomes possible @@ -205,7 +205,7 @@ class ByteStream; The usage of \Ref{add_data}() functions is meaningless and is prohibited. - \Ref{is_eof}() function always returns #TRUE#. Thus \Ref{set_eof}() + \Ref{is_eof}() function always returns #true#. Thus \Ref{set_eof}() us meaningless and does nothing. \Ref{get_length}() function always returns the file size. @@ -300,12 +300,12 @@ public: /** Tells the #DataPool# to stop serving readers. - If #only_blocked# flag is #TRUE# then only those requests will + If #only_blocked# flag is #true# then only those requests will be processed, which would not block. Any attempt to get non-existing data would result in a #STOP# exception (instead of blocking until data is available). - If #only_blocked# flag is #FALSE# then any further attempt to read + If #only_blocked# flag is #false# then any further attempt to read from this #DataPool# (as well as from any #DataPool# connected to this one) will result in a #STOP# exception. */ void stop(bool only_blocked=false); @@ -388,11 +388,11 @@ public: immediately. If there is no data available, and \Ref{is_eof}() returns - #FALSE#, the reader (and the thread) will be {\bf blocked} + #false#, the reader (and the thread) will be {\bf blocked} until the data actually arrives. Please note, that since the reader is blocked, it should run in a separate thread so that other threads have a chance to call \Ref{add_data}(). - If there is no data available, but \Ref{is_eof}() is #TRUE# + If there is no data available, but \Ref{is_eof}() is #true# the behavior is different and depends on the #DataPool#'s estimate of the file size: \begin{itemize} @@ -430,22 +430,22 @@ public: /** @name State querying functions. */ //@{ - /** Returns #TRUE# if this #DataPool# is connected to another #DataPool# + /** Returns #true# if this #DataPool# is connected to another #DataPool# or to a file. */ bool is_connected(void) const; - /** Returns #TRUE# if all data available for offsets from + /** Returns #true# if all data available for offsets from #start# till #start+length-1#. If #length# is negative, the range is assumed to extend up to the end of the #DataPool#. This function works both for connected and not connected #DataPool#s. - Once it returned #TRUE# for some offsets range, you can be + Once it returned #true# for some offsets range, you can be sure that the subsequent \Ref{get_data}() request will not block. */ bool has_data(int start, int length); - /* Returns #TRUE# if no more data is planned to be added. + /* Returns #true# if no more data is planned to be added. - {\bf Note:} This function always returns #TRUE# when the #DataPool# + {\bf Note:} This function always returns #true# when the #DataPool# has been initialized with a file name. */ bool is_eof(void) const {return eof_flag;} @@ -495,7 +495,7 @@ public: given data range. {\bf Note:} The callback may be called immediately if all - data for the given range is already available or #EOF# is #TRUE#. + data for the given range is already available or #EOF# is #true#. @param start The beginning of the range for which all data should be available diff --git a/kviewshell/plugins/djvu/libdjvu/DjVmDir.h b/kviewshell/plugins/djvu/libdjvu/DjVmDir.h index 80a93b40..216ded79 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVmDir.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVmDir.h @@ -300,14 +300,14 @@ public: return (flags & TYPE_MASK)==PAGE; } - /** Returns #TRUE# if this file is included into some other files of + /** Returns #true# if this file is included into some other files of this document. */ bool is_include(void) const { return (flags & TYPE_MASK)==INCLUDE; } - /** Returns #TRUE# if this file contains thumbnails for the document pages. */ + /** Returns #true# if this file contains thumbnails for the document pages. */ bool is_thumbnails(void) const { return (flags & TYPE_MASK)==THUMBNAILS; diff --git a/kviewshell/plugins/djvu/libdjvu/DjVmDir0.h b/kviewshell/plugins/djvu/libdjvu/DjVmDir0.h index 289a63c6..16b25864 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVmDir0.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVmDir0.h @@ -135,7 +135,7 @@ public: /** Creates a new file record with name #name# at offset #offset# and size #size#, which is in IFF format if - #iff_file# is #TRUE#. */ + #iff_file# is #true#. */ void add_file(const GUTF8String &name, bool iff_file, int offset=-1, int size=-1); diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuAnno.h b/kviewshell/plugins/djvu/libdjvu/DjVuAnno.h index 54c91e83..dde4b63a 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuAnno.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuAnno.h @@ -151,10 +151,10 @@ public: special cases. \end{description} */ int mode; - /**Qt::Horizontal page alignment. Possible values are #ALIGN_LEFT#, + /** Horizontal page alignment. Possible values are #ALIGN_LEFT#, #ALIGN_CENTER#, #ALIGN_RIGHT# and #ALIGN_UNSPEC#. */ alignment hor_align; - /**Qt::Vertical page alignment. Possible values are #ALIGN_TOP#, + /** Vertical page alignment. Possible values are #ALIGN_TOP#, #ALIGN_CENTER#, #ALIGN_BOTTOM# and #ALIGN_UNSPEC#. */ alignment ver_align; /** List of defined map areas. They may be just areas of highlighting @@ -165,7 +165,7 @@ public: /** Metainformations like title, author ... */ GMap<GUTF8String,GUTF8String> metadata; #endif - /** Returns TRUE if no features are specified or specified features + /** Returns true if no features are specified or specified features are not different from default ones */ bool is_empty(void) const; diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp index 1c6a3445..25eac90c 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp @@ -519,8 +519,8 @@ DjVuDocEditor::insert_file(const GURL &file_url, const GUTF8String &parent_id, // // Also, if a name is in name2id, we will not insert that file again. // - // Will return TRUE if the file has been successfully inserted. - // FALSE, if the file contains NDIR chunk and has been skipped. + // Will return true if the file has been successfully inserted. + // false, if the file contains NDIR chunk and has been skipped. bool DjVuDocEditor::insert_file(const GURL &file_url, bool is_page, int & file_pos, GMap<GUTF8String, GUTF8String> & name2id, @@ -968,7 +968,7 @@ DjVuDocEditor::remove_file(const GUTF8String &id, bool remove_unref, // If will also remove all INCL chunks in parent files pointing // to this one // - // Finally, if remove_unref is TRUE, we will go down the files + // 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 diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.h b/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.h index c7474cb3..0d5cd14c 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.h @@ -141,7 +141,7 @@ public: learn the original format of the document being edited. */ int get_orig_doc_type(void) const; - /** Returns #TRUE# if the document can be "saved" (sometimes + /** Returns #true# if the document can be "saved" (sometimes the only possibility is to do a "save as"). The reason why we have this function is that #DjVuDocEditor# can save documents in new formats only (#BUNDLED# and #INDIRECT#). @@ -178,7 +178,7 @@ public: is "bundled" into one file and this file is written into the passed stream. - If #force_djvm# is #TRUE# then even one page documents will be + If #force_djvm# is #true# then even one page documents will be saved in the #DJVM BUNDLED# format (inside a #FORM:DJVM#); {\bf Plugin Warning}. This function will read contents of the whole @@ -257,11 +257,11 @@ public: void insert_group(const GList<GURL> & furl_list, int page_num=-1, void (* refresh_cb)(void *)=0, void * cl_data=0); /** Removes the specified page from the document. If #remove_unref# - is #TRUE#, the function will also remove from the document any file, + is #true#, the function will also remove from the document any file, which became unreferenced due to the page's removal */ void remove_page(int page_num, bool remove_unref=true); /** Removes the specified pages from the document. If #remove_unref# - is #TRUE#, the function will also remove from the document any file, + is #true#, the function will also remove from the document any file, which became unreferenced due to the pages' removal */ void remove_pages(const GList<int> & page_list, bool remove_unref=true); /** Removes a DjVu file with the specified #id#. @@ -269,7 +269,7 @@ public: If some other files include this file, the corresponding #INCL# chunks will be removed to avoid dead links. - If #remove_unref# is #TRUE#, the function will also remove every + If #remove_unref# is #true#, the function will also remove every file, which will become unreferenced after the removal of this file. */ void remove_file(const GUTF8String &id, bool remove_unref=true); /** Makes page number #page_num# to be #new_page_num#. If #new_page_num# @@ -351,8 +351,8 @@ public: the document already has thumbnail images for some of its pages, the callback will be called #pages_num# times, where #pages_num# is the total number of pages in the document. - The callback should return #FALSE# if thumbnails generating - should proceed. #TRUE# will stop it. */ + The callback should return #false# if thumbnails generating + should proceed. #true# will stop it. */ void generate_thumbnails(int thumb_size, bool (* cb)(int page_num, void *)=0, void * cl_data=0); @@ -386,7 +386,7 @@ public: GURL get_doc_url(void) const; - /** Returns TRUE if #class_name# is #"DjVuDocEditor"#, + /** Returns true if #class_name# is #"DjVuDocEditor"#, #"DjVuDocument"# or #"DjVuPort"# */ virtual bool inherits(const GUTF8String &class_name) const; virtual GP<DataPool> request_data(const DjVuPort * source, const GURL & url); diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDocument.h b/kviewshell/plugins/djvu/libdjvu/DjVuDocument.h index 68376e39..9730d5b8 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuDocument.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuDocument.h @@ -376,7 +376,7 @@ public: void init(const GURL & url, GP<DjVuPort> port=0, DjVuFileCache * cache=0); - /** Returns #TRUE# if the initialization thread finished (does not + /** Returns #true# if the initialization thread finished (does not matter successfully or not). As soon as it happens, the document becomes completely initialized and its every function should work properly. Please refer to the description of \Ref{init}() function @@ -395,21 +395,21 @@ public: completes before the \Ref{init}() function returns. */ bool is_init_complete(void) const; - /** Returns #TRUE# is the initialization thread finished successfully. + /** Returns #true# is the initialization thread finished successfully. See \Ref{is_init_complete}() and \Ref{wait_for_complete_init}() for more details. */ bool is_init_ok(void) const; /** Forces compression with the next save_as function. */ void set_needs_compression(void); - /** Returns #TRUE# if there are uncompressed pages in this document. */ + /** Returns #true# if there are uncompressed pages in this document. */ bool needs_compression(void) const; - /** Returns #TRUE# if this file must be renamed before saving. */ + /** Returns #true# if this file must be renamed before saving. */ bool needs_rename(void) const; - /** Returns #TRUE# if this file must be renamed before saving. */ + /** Returns #true# if this file must be renamed before saving. */ bool can_compress(void) const; - /** Returns #TRUE# is the initialization thread failed. + /** Returns #true# is the initialization thread failed. See \Ref{is_init_complete}() and \Ref{wait_for_complete_init}() for more details. */ @@ -441,7 +441,7 @@ public: returns. */ long get_doc_flags(void) const; - /** Returns #TRUE# if the document is in bundled format (either in + /** Returns #true# if the document is in bundled format (either in #DjVuDocument::OLD_BUNDLED# or #DjVuDocument::BUNDLED# formats). */ bool is_bundled(void) const; @@ -560,7 +560,7 @@ public: #page_num#. If caching is enabled, and there is a {\em fully decoded} \Ref{DjVuFile} in the cache, the image will be reused and will be returned fully decoded. Otherwise, if multi-threaded behavior - is allowed, and #sync# is set to #FALSE#, the decoding will be + is allowed, and #sync# is set to #false#, the decoding will be started in a separate thread, which enables to do progressive redisplay. Thus, in this case the image returned may be partially decoded. @@ -592,7 +592,7 @@ public: returns. @param page_num Number of the page to be decoded - @param sync When set to #TRUE# the function will not return + @param sync When set to #true# the function will not return until the page is completely decoded. Otherwise, in a multi-threaded program, this function will start decoding in a new thread and will return @@ -635,7 +635,7 @@ public: \Ref{page_to_url}(), \Ref{id_to_url}() functions start working properly. - If #dont_create# is #FALSE# the function will return the file + If #dont_create# is #false# the function will return the file only if it already exists. {\bf Note:} To wait for the initialization to complete use @@ -657,7 +657,7 @@ public: If so, it just calls the #get_djvu_file()# function above. If ID is #ZERO# or just empty, page number #-1# is assumed. - If #dont_create# is #FALSE# the function will return the file + If #dont_create# is #false# the function will return the file only if it already exists. */ GP<DjVuFile> get_djvu_file(const GUTF8String &id, bool dont_create=false); GP<DjVuFile> get_djvu_file(const GURL &url, bool dont_create=false); @@ -714,7 +714,7 @@ public: is "bundled" into one file and this file is written into the passed stream. - If #force_djvm# is #TRUE# then even one page documents will be + If #force_djvm# is #true# then even one page documents will be saved in the #DJVM BUNDLED# format (inside a #FORM:DJVM#); {\bf Plugin Warning}. This function will read contents of the whole @@ -791,7 +791,7 @@ public: /// Create a complete DjVuXML file. void writeDjVuXML(const GP<ByteStream> &gstr_out,int flags) const; - /// Returns TRUE if #class_name# is #"DjVuDocument"# or #"DjVuPort"# + /// Returns true if #class_name# is #"DjVuDocument"# or #"DjVuPort"# virtual bool inherits(const GUTF8String &class_name) const; /// Converts the specified id to a URL. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp index 415992d4..21a33450 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp @@ -332,10 +332,10 @@ DjVuFile::wait_for_chunk(void) bool DjVuFile::wait_for_finish(bool self) -// if self==TRUE, will block until decoding of this file is over -// if self==FALSE, will block until decoding of a child (direct +// if self==true, will block until decoding of this file is over +// if self==false, will block until decoding of a child (direct // or indirect) is over. -// Will return FALSE if there is nothing to wait for. TRUE otherwise +// Will return false if there is nothing to wait for. true otherwise { DEBUG_MSG("DjVuFile::wait_for_finish(): self=" << self <<"\n"); DEBUG_MAKE_INDENT(3); diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuFile.h b/kviewshell/plugins/djvu/libdjvu/DjVuFile.h index 5648184e..e8ec6298 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuFile.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuFile.h @@ -339,21 +339,21 @@ public: \Ref{get_included_files}() is OK. \end{itemize} */ long get_flags(void) const; - /// Returns #TRUE# if the file is being decoded. + /// Returns #true# if the file is being decoded. bool is_decoding(void) const; - /// Returns #TRUE# if decoding of the file has finished successfully. + /// Returns #true# if decoding of the file has finished successfully. bool is_decode_ok(void) const; - /// Returns #TRUE# if decoding of the file has failed. + /// Returns #true# if decoding of the file has failed. bool is_decode_failed(void) const; - /** Returns #TRUE# if decoding of the file has been stopped by + /** Returns #true# if decoding of the file has been stopped by \Ref{stop_decode}() function. */ bool is_decode_stopped(void) const; - /// Returns #TRUE# if this file has received all data. + /// Returns #true# if this file has received all data. bool is_data_present(void) const; - /** Returns #TRUE# if this file {\bf and} all included files have + /** Returns #true# if this file {\bf and} all included files have received all data. */ bool is_all_data_present(void) const; - /** Returns #TRUE# if all included files have been created. Only when + /** Returns #true# if all included files have been created. Only when this function returns 1, the \Ref{get_included_files}() returns the correct information. */ bool are_incl_files_created(void) const; @@ -388,11 +388,11 @@ public: Depending on the value of #only_blocked# flag this works as follows: \begin{itemize} - \item If #only_blocked# is #TRUE#, the function will make sure, + \item If #only_blocked# is #true#, the function will make sure, that any further access to the file's data will result in a #STOP# exception if the desired data is not available (and the thread would normally block). - \item If #only_blocked# is #FALSE#, then {\bf any} further + \item If #only_blocked# is #false#, then {\bf any} further access to the file's data will result in immediate #STOP# exception. \end{itemize} @@ -440,11 +440,11 @@ 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 + 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, which may block your application, if not all data is available. - @param only_created If #TRUE#, the file will not try to process + @param only_created If #true#, the file will not try to process #INCL# chunks and load referenced files. It will return just those files, which have already been created during the decoding procedure. */ @@ -485,7 +485,7 @@ public: page file. {\bf Summary:} This function will return complete annotations only - when the \Ref{is_all_data_present}() returns #TRUE#. */ + when the \Ref{is_all_data_present}() returns #true#. */ GP<ByteStream> get_merged_anno(int * max_level_ptr=0); /** Returns the annotation chunks (#"ANTa"# and #"ANTz"#). This @@ -495,7 +495,7 @@ public: been found, #ZERO# will be returned. {\bf Summary:} This function will return complete annotations - only when the \Ref{is_all_data_present}() returns #TRUE#. */ + only when the \Ref{is_all_data_present}() returns #true#. */ GP<ByteStream> get_anno(void); /** Returns the text chunks (#"TXTa"# and #"TXTz"#). This function may @@ -505,7 +505,7 @@ public: #ZERO# will be returned. {\bf Summary:} This function will return complete hidden text layers - only when the \Ref{is_all_data_present}() returns #TRUE#. */ + only when the \Ref{is_all_data_present}() returns #true#. */ GP<ByteStream> get_text(void); /** Returns the meta chunks (#"METa"# and #"METz"#). This function may @@ -515,7 +515,7 @@ public: will be returned. {\bf Summary:} This function will return complete meta data only - when the \Ref{is_all_data_present}() returns #TRUE#. */ + when the \Ref{is_all_data_present}() returns #true#. */ GP<ByteStream> get_meta(void); /** Goes down the hierarchy of #DjVuFile#s and merges their annotations. @@ -537,17 +537,17 @@ public: /// Clears the meta data. void remove_meta(void); - /** Returns #TRUE# if the file contains annotation chunks. + /** Returns #true# if the file contains annotation chunks. Known annotation chunks at the time of writing this help are: {\bf ANTa}, {\bf ANTz}, {\bf FORM:ANNO}. */ bool contains_anno(void); - /** Returns #TRUE# if the file contains hiddentext chunks. + /** Returns #true# if the file contains hiddentext chunks. Known hiddentext chunks at the time of writing this help are: {\bf TXTa}, and {\bf TXTz}. */ bool contains_text(void); - /** Returns #TRUE# if the file contains metadata chunks. + /** Returns #true# if the file contains metadata chunks. Known metadata chunks at the time of writing this help are: {\bf METa}, and {\bf METz}. */ bool contains_meta(void); diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuFileCache.h b/kviewshell/plugins/djvu/libdjvu/DjVuFileCache.h index c6b1b70b..c1151c2d 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuFileCache.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuFileCache.h @@ -151,12 +151,12 @@ public: int get_max_size(void) const; /** Enables or disables the cache. See \Ref{is_enabled}() for details - @param en - If {\em en} is TRUE, the cache will be enabled. + @param en - If {\em en} is true, the cache will be enabled. Otherwise it will be disabled. */ void enable(bool en); - /** Returns #TRUE# if the cache is enabled, #FALSE# otherwise. + /** Returns #true# if the cache is enabled, #false# otherwise. When a cache is disabled, \Ref{add_file}(), and \Ref{del_file}() do nothing. But the {\em maximum size} is preserved inside the class so that next time the cache is enabled, it will diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuImage.h b/kviewshell/plugins/djvu/libdjvu/DjVuImage.h index f898c5a6..696fe4ff 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuImage.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuImage.h @@ -217,7 +217,7 @@ public: /** The decoder is now started when the image is created by function \Ref{DjVuDocument::get_page} in \Ref{DjVuDocument}. This function waits until the decoding thread terminates - and returns TRUE if the image has been successfully decoded. */ + and returns true if the image has been successfully decoded. */ bool wait_for_complete_decode(void); //@} diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuPort.h b/kviewshell/plugins/djvu/libdjvu/DjVuPort.h index d7700997..8e1af703 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuPort.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuPort.h @@ -162,7 +162,7 @@ public: to help to identify the source of the request. For example, \Ref{DjVuFile} is also derived from #DjVuPort#. In order for the receiver to recognize the sender, the \Ref{DjVuFile} should - override this function to return #TRUE# when the #class_name# + override this function to return #true# when the #class_name# is either #DjVuPort# or #DjVuFile# */ virtual bool inherits(const GUTF8String &class_name) const; diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp index 152efa2c..fc69e154 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp @@ -87,7 +87,7 @@ static inline TYPE min(TYPE a,TYPE b) { return (a<b)?a:b; } //******************************** DjVuTXT ********************************** //*************************************************************************** -const char DjVuTXT::end_of_column = 013; // VT:Qt::Vertical Tab +const char DjVuTXT::end_of_column = 013; // VT: Vertical Tab const char DjVuTXT::end_of_region = 035; // GS: Group Separator const char DjVuTXT::end_of_paragraph = 037; // US: Unit Separator const char DjVuTXT::end_of_line = 012; // LF: Line Feed diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuText.h b/kviewshell/plugins/djvu/libdjvu/DjVuText.h index abd57a62..6f23c3b3 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuText.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuText.h @@ -171,13 +171,13 @@ public: control character: \begin{tabular}{lll} {\bf Name} & {\bf Octal} & {\bf Ascii name} \\\hline\\ - {\tt DjVuText::end_of_column} & 013 & VT,Qt::Vertical Tab \\ + {\tt DjVuText::end_of_column} & 013 & VT, 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:Qt::Vertical Tab + static const char end_of_column ; // VT: 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 diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuToPS.h b/kviewshell/plugins/djvu/libdjvu/DjVuToPS.h index 7c3efb2e..f4293afe 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuToPS.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuToPS.h @@ -121,11 +121,11 @@ public: \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) - \item[Color] ({\em TRUE} or {\em FALSE}). Choosing {\em FALSE} + \item[Color] ({\em true} or {\em false}). Choosing {\em false} converts color images to gray scale. \item[Gamma] Printer color correction. This parameter ranges from #0.3# to #5.0#. - \item[sRGB] ({\em TRUE} or {\em FALSE}). Choosing {\em TRUE} + \item[sRGB] ({\em true} or {\em false}). Choosing {\em true} enables accurate sRGB color calibration. This option only works with language level 2. When this is set, gamma correction is clamped to #2.2#. @@ -228,13 +228,13 @@ public: This parameter does {\bf not} affect the size of output file */ int get_copies(void) const { return copies; } - /** Returns #TRUE# if there will be a gray frame */ + /** Returns #true# if there will be a gray frame */ bool get_frame(void) const { return frame; } - /** Returns #TRUE# if there will be a gray frame */ + /** Returns #true# if there will be a gray frame */ bool get_cropmarks(void) const { return cropmarks; } - /** Returns #TRUE# if there will be a shadow text printed */ + /** Returns #true# if there will be a shadow text printed */ bool get_text(void) const { return text; } /** Returns the booklet mode */ diff --git a/kviewshell/plugins/djvu/libdjvu/GContainer.h b/kviewshell/plugins/djvu/libdjvu/GContainer.h index 9a298b04..5b55b15d 100644 --- a/kviewshell/plugins/djvu/libdjvu/GContainer.h +++ b/kviewshell/plugins/djvu/libdjvu/GContainer.h @@ -96,8 +96,6 @@ namespace DJVU { #define GCONTAINER_NO_MEMBER_TEMPLATES 1 #elif defined(_MSC_VER) && !defined(__ICL) #define GCONTAINER_NO_MEMBER_TEMPLATES 1 -#elif defined(__MWERKS__) -#define GCONTAINER_NO_MEMBER_TEMPLATES 1 #else #define GCONTAINER_NO_MEMBER_TEMPLATES 0 #endif diff --git a/kviewshell/plugins/djvu/libdjvu/GException.h b/kviewshell/plugins/djvu/libdjvu/GException.h index 822b668e..41a8b9a8 100644 --- a/kviewshell/plugins/djvu/libdjvu/GException.h +++ b/kviewshell/plugins/djvu/libdjvu/GException.h @@ -229,9 +229,6 @@ private: #if defined(_MSC_VER) #define CPP_SUPPORTS_EXCEPTIONS #endif -#if defined(__MWERKS__) -#define CPP_SUPPORTS_EXCEPTIONS -#endif #if defined(__EXCEPTIONS) #define CPP_SUPPORTS_EXCEPTIONS #endif diff --git a/kviewshell/plugins/djvu/libdjvu/GIFFManager.h b/kviewshell/plugins/djvu/libdjvu/GIFFManager.h index 921a7c64..b379e556 100644 --- a/kviewshell/plugins/djvu/libdjvu/GIFFManager.h +++ b/kviewshell/plugins/djvu/libdjvu/GIFFManager.h @@ -127,13 +127,13 @@ public: GUTF8String get_full_name(void) const; /// Returns the chunk type, like #CAT# for chunk #CAT:DJVU# GUTF8String get_type(void) const; - /// Returns TRUE if the chunk may contain other chunks or FALSE otherwise + /// Returns true if the chunk may contain other chunks or false otherwise bool is_container(void) const; /** Sets the chunk name. The {\em name} may not contain dots or brackets, but {\bf may} contain colons. */ void set_name(GUTF8String name); /** Parses the {\em name} probably containing colon and compares it - with its own name returning TRUE if they are the same */ + with its own name returning true if they are the same */ bool check_name(GUTF8String name); /** Adds the {\em chunk} to the chunks list at position {\em order}. diff --git a/kviewshell/plugins/djvu/libdjvu/GMapAreas.h b/kviewshell/plugins/djvu/libdjvu/GMapAreas.h index 46319147..439829d2 100644 --- a/kviewshell/plugins/djvu/libdjvu/GMapAreas.h +++ b/kviewshell/plugins/djvu/libdjvu/GMapAreas.h @@ -198,7 +198,7 @@ public: \item #SHADOW_EOUT_BORDER# - The opposite of #SHADOW_EIN_BORDER#. \end{itemize} */ BorderType border_type; - /** If #TRUE#, the border will be made always visible. Otherwise + /** If #true#, the border will be made always visible. Otherwise it will be drawn when the mouse moves over the map area. */ bool border_always_visible; /// Border color (when relevant) in #0x00RRGGBB# format diff --git a/kviewshell/plugins/djvu/libdjvu/GOS.cpp b/kviewshell/plugins/djvu/libdjvu/GOS.cpp index 515c9e23..223e63ac 100644 --- a/kviewshell/plugins/djvu/libdjvu/GOS.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GOS.cpp @@ -100,12 +100,6 @@ # include <unistd.h> #endif -// -- TRUE FALSE -#undef TRUE -#undef FALSE -#define TRUE 1 -#define FALSE 0 - // -- MAXPATHLEN #ifndef MAXPATHLEN # ifdef _MAX_PATH diff --git a/kviewshell/plugins/djvu/libdjvu/GRect.h b/kviewshell/plugins/djvu/libdjvu/GRect.h index 67c0ce94..518691ea 100644 --- a/kviewshell/plugins/djvu/libdjvu/GRect.h +++ b/kviewshell/plugins/djvu/libdjvu/GRect.h @@ -131,7 +131,7 @@ namespace DJVU { class GRect { public: - /** #Qt::OrientationBits# defines 3 mutually exclusive + /** #OrientationBits# defines 3 mutually exclusive bits to indicate the image orientation. There are four possible rotation values for an image @@ -149,7 +149,7 @@ public: }; /** #Orientations# defines all 8 possible orientations, using - the three \Ref{Qt::OrientationBits}. + the three \Ref{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. diff --git a/kviewshell/plugins/djvu/libdjvu/GString.h b/kviewshell/plugins/djvu/libdjvu/GString.h index a605de1d..96634c29 100644 --- a/kviewshell/plugins/djvu/libdjvu/GString.h +++ b/kviewshell/plugins/djvu/libdjvu/GString.h @@ -510,9 +510,9 @@ public: character of a string is numbered zero. Negative positions represent characters relative to the end of the string. */ char operator[] (int n) const; - /// Returns #TRUE# if the string contains an integer number. + /// Returns #true# if the string contains an integer number. bool is_int(void) const; - /// Returns #TRUE# if the string contains a float number. + /// Returns #true# if the string contains a float number. bool is_float(void) const; /** Converts strings between native & UTF8 **/ diff --git a/kviewshell/plugins/djvu/libdjvu/GThreads.h b/kviewshell/plugins/djvu/libdjvu/GThreads.h index 1e43ea80..ac83d8f8 100644 --- a/kviewshell/plugins/djvu/libdjvu/GThreads.h +++ b/kviewshell/plugins/djvu/libdjvu/GThreads.h @@ -525,8 +525,8 @@ public: /** 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 - #FALSE#. */ + #clr_mask1# 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); diff --git a/kviewshell/plugins/djvu/libdjvu/GURL.cpp b/kviewshell/plugins/djvu/libdjvu/GURL.cpp index 812f1d22..07853b55 100644 --- a/kviewshell/plugins/djvu/libdjvu/GURL.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GURL.cpp @@ -212,7 +212,7 @@ hexval(char c) static bool is_argument(const char * start) - // Returns TRUE if 'start' points to the beginning of an argument + // Returns true if 'start' points to the beginning of an argument // (either hash or CGI) { // return (*start=='#' || *start=='?' || *start=='&' || *start==';'); @@ -221,7 +221,7 @@ is_argument(const char * start) static bool is_argument_sep(const char * start) - // Returns TRUE if 'start' points to the beginning of an argument + // Returns true if 'start' points to the beginning of an argument // (either hash or CGI) { return (*start=='&')||(*start == ';'); diff --git a/kviewshell/plugins/djvu/libdjvu/GURL.h b/kviewshell/plugins/djvu/libdjvu/GURL.h index 077da24a..d353c4d1 100644 --- a/kviewshell/plugins/djvu/libdjvu/GURL.h +++ b/kviewshell/plugins/djvu/libdjvu/GURL.h @@ -276,10 +276,10 @@ public: // GURL operator+(const GUTF8String &name) const; //@} - /// Returns TRUE if #gurl1# and #gurl2# are the same + /// Returns true if #gurl1# and #gurl2# are the same bool operator==(const GURL & gurl2) const; - /// Returns TRUE if #gurl1# and #gurl2# are different + /// Returns true if #gurl1# and #gurl2# are different bool operator!=(const GURL & gurl2) const; /// Assignment operator diff --git a/kviewshell/plugins/djvu/libdjvu/JB2Image.h b/kviewshell/plugins/djvu/libdjvu/JB2Image.h index d3f2acaa..4619445e 100644 --- a/kviewshell/plugins/djvu/libdjvu/JB2Image.h +++ b/kviewshell/plugins/djvu/libdjvu/JB2Image.h @@ -196,9 +196,9 @@ class ByteStream; class JB2Blit { public: - /**Qt::Horizontal coordinate of the blit. */ + /** Horizontal coordinate of the blit. */ unsigned short left; - /**Qt::Vertical coordinate of the blit. */ + /** Vertical coordinate of the blit. */ unsigned short bottom; /** Index of the shape to blit. */ unsigned int shapeno; diff --git a/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp b/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp index add09e3b..3dced77a 100644 --- a/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp +++ b/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp @@ -602,7 +602,7 @@ MMRDecoder::scanruns(const unsigned short **endptr) b1 += *pr++; break; } - /*Qt::Horizontal Mode */ + /* Horizontal Mode */ case H: { // First run @@ -616,7 +616,7 @@ MMRDecoder::scanruns(const unsigned short **endptr) *xr = rle; xr++; rle = 0; break; } - /*Qt::Vertical Modes */ + /* Vertical Modes */ case V0: case VR3: case VR2: diff --git a/kviewshell/plugins/djvu/libdjvu/configure.in.in b/kviewshell/plugins/djvu/libdjvu/configure.in.in index 05cf6bc5..88cd71bc 100644 --- a/kviewshell/plugins/djvu/libdjvu/configure.in.in +++ b/kviewshell/plugins/djvu/libdjvu/configure.in.in @@ -335,7 +335,7 @@ if test "x$acx_pthread_ok" = xyes; then flag=no case "${host_cpu}-${host_os}" in *-aix* | *-freebsd*) flag="-D_THREAD_SAFE";; - *solaris* | alpha*-osf*) flag="-D_REENTRANT";; + *solaris*) flag="-D_REENTRANT";; esac AC_MSG_RESULT(${flag}) if test "x$flag" != xno; then diff --git a/kviewshell/plugins/djvu/libdjvu/debug.cpp b/kviewshell/plugins/djvu/libdjvu/debug.cpp index 40e57b70..cba08577 100644 --- a/kviewshell/plugins/djvu/libdjvu/debug.cpp +++ b/kviewshell/plugins/djvu/libdjvu/debug.cpp @@ -233,7 +233,7 @@ DjVuDebug& DjVuDebug::operator<<(type arg)\ DjVuDebug& DjVuDebug::operator<<(bool arg) { - format("%s", arg ? "TRUE" : "FALSE"); return *this; + format("%s", arg ? "true" : "false"); return *this; } OP(char, "%c") diff --git a/kviewshell/plugins/djvu/pageRangeWidget.cpp b/kviewshell/plugins/djvu/pageRangeWidget.cpp index 1d5c7be1..4acd8294 100644 --- a/kviewshell/plugins/djvu/pageRangeWidget.cpp +++ b/kviewshell/plugins/djvu/pageRangeWidget.cpp @@ -41,8 +41,8 @@ PageRangeWidget::PageRangeWidget( TQ_UINT16 _from, TQ_UINT16 _to, TQ_UINT16 _cur _current = _to; } - connect(from, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(fromValueChanged(int))); - connect(to, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(toValueChanged(int))); + connect(from, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(fromValueChanged(int))); + connect(to, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(toValueChanged(int))); from->setRange(_from, _to); from->setValue(_current); diff --git a/kviewshell/plugins/djvu/pageRangeWidget.h b/kviewshell/plugins/djvu/pageRangeWidget.h index 1aaf0c48..4f353b10 100644 --- a/kviewshell/plugins/djvu/pageRangeWidget.h +++ b/kviewshell/plugins/djvu/pageRangeWidget.h @@ -28,7 +28,7 @@ class PageRangeWidget : public PageRangeWidget_base { -Q_OBJECT +TQ_OBJECT public: diff --git a/kviewshell/renderedDocumentPage.h b/kviewshell/renderedDocumentPage.h index 2de1f992..18b67d07 100644 --- a/kviewshell/renderedDocumentPage.h +++ b/kviewshell/renderedDocumentPage.h @@ -65,7 +65,7 @@ class TextSelection; class RenderedDocumentPage : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/renderedDocumentPagePixmap.h b/kviewshell/renderedDocumentPagePixmap.h index 19c69567..1fc497ec 100644 --- a/kviewshell/renderedDocumentPagePixmap.h +++ b/kviewshell/renderedDocumentPagePixmap.h @@ -20,7 +20,7 @@ // about a certain page. class RenderedDocumentPagePixmap: public RenderedDocumentPage, public TQPixmap { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/searchWidget.cpp b/kviewshell/searchWidget.cpp index a753ec45..cd971934 100644 --- a/kviewshell/searchWidget.cpp +++ b/kviewshell/searchWidget.cpp @@ -72,12 +72,12 @@ SearchWidget::SearchWidget(TQWidget* parent, const char* name, WFlags fl) caseSensitiveCheckBox->setText(i18n("Case sensitive")); layout->addWidget(caseSensitiveCheckBox); - connect(stopButton, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(stopSearch())); + connect(stopButton, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(stopSearch())); - connect(findNextButton, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(findNextText())); - connect(findPrevButton, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(findPrevText())); + connect(findNextButton, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(findNextText())); + connect(findPrevButton, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(findPrevText())); - connect(searchText, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(textChanged())); + connect(searchText, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(textChanged())); textChanged(); } diff --git a/kviewshell/searchWidget.h b/kviewshell/searchWidget.h index f01b66bc..13c1590e 100644 --- a/kviewshell/searchWidget.h +++ b/kviewshell/searchWidget.h @@ -32,7 +32,7 @@ class TQString; class SearchWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/sizePreview.h b/kviewshell/sizePreview.h index f5cddb50..768306aa 100644 --- a/kviewshell/sizePreview.h +++ b/kviewshell/sizePreview.h @@ -17,7 +17,7 @@ class SimplePageSize; class SizePreview : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/tableOfContents.cpp b/kviewshell/tableOfContents.cpp index 82862d14..e5e54598 100644 --- a/kviewshell/tableOfContents.cpp +++ b/kviewshell/tableOfContents.cpp @@ -55,7 +55,7 @@ TableOfContents::TableOfContents(TQWidget* parent) readSettings(); - connect(this, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(itemClicked(TQListViewItem*))); + connect(this, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(itemClicked(TQListViewItem*))); } TableOfContents::~TableOfContents() diff --git a/kviewshell/tableOfContents.h b/kviewshell/tableOfContents.h index 3e878ae3..9eaeb610 100644 --- a/kviewshell/tableOfContents.h +++ b/kviewshell/tableOfContents.h @@ -44,7 +44,7 @@ private: class TableOfContents : public TDEListView { -Q_OBJECT +TQ_OBJECT public: diff --git a/kviewshell/tdemultipage.cpp b/kviewshell/tdemultipage.cpp index 8135cd83..b11f9b38 100644 --- a/kviewshell/tdemultipage.cpp +++ b/kviewshell/tdemultipage.cpp @@ -49,7 +49,7 @@ KMultiPage::KMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject searchInProgress = false; TQVBox* verticalBox = new TQVBox(parentWidget); - verticalBox->setFocusPolicy(TQ_StrongFocus); + verticalBox->setFocusPolicy(TQWidget::StrongFocus); setWidget(verticalBox); splitterWidget = new TQSplitter(verticalBox, widgetName); @@ -63,7 +63,7 @@ KMultiPage::KMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject tableOfContents = new TableOfContents(sideBar); sideBar->addItem(tableOfContents, TQIconSet(SmallIcon("contents")), i18n("Contents")); - connect(tableOfContents, TQT_SIGNAL(gotoPage(const Anchor&)), this, TQT_SLOT(gotoPage(const Anchor&))); + connect(tableOfContents, TQ_SIGNAL(gotoPage(const Anchor&)), this, TQ_SLOT(gotoPage(const Anchor&))); // Create MarkList _markList = new MarkList(sideBar, "marklist"); @@ -74,30 +74,30 @@ KMultiPage::KMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject splitterWidget->setResizeMode(sideBar, TQSplitter::KeepSize); - connect(_markList, TQT_SIGNAL(selected(const PageNumber&)), this, TQT_SLOT(gotoPage(const PageNumber&))); + connect(_markList, TQ_SIGNAL(selected(const PageNumber&)), this, TQ_SLOT(gotoPage(const PageNumber&))); _scrollView = new PageView(splitterWidget, widgetName); // Create Search Panel searchWidget = new SearchWidget(verticalBox); searchWidget->hide(); - connect(searchWidget, TQT_SIGNAL(findNextText()), this, TQT_SLOT(findNextText())); - connect(searchWidget, TQT_SIGNAL(findPrevText()), this, TQT_SLOT(findPrevText())); + connect(searchWidget, TQ_SIGNAL(findNextText()), this, TQ_SLOT(findNextText())); + connect(searchWidget, TQ_SIGNAL(findPrevText()), this, TQ_SLOT(findPrevText())); sideBar->setMinimumWidth(80); sideBar->setMaximumWidth(300); - connect(_scrollView, TQT_SIGNAL(currentPageChanged(const PageNumber&)), this, TQT_SLOT(setCurrentPageNumber(const PageNumber&))); - connect(_scrollView, TQT_SIGNAL(viewSizeChanged(const TQSize&)), scrollView(), TQT_SLOT(calculateCurrentPageNumber())); - connect(_scrollView, TQT_SIGNAL(wheelEventReceived(TQWheelEvent *)), this, TQT_SLOT(wheelEvent(TQWheelEvent*))); + connect(_scrollView, TQ_SIGNAL(currentPageChanged(const PageNumber&)), this, TQ_SLOT(setCurrentPageNumber(const PageNumber&))); + connect(_scrollView, TQ_SIGNAL(viewSizeChanged(const TQSize&)), scrollView(), TQ_SLOT(calculateCurrentPageNumber())); + connect(_scrollView, TQ_SIGNAL(wheelEventReceived(TQWheelEvent *)), this, TQ_SLOT(wheelEvent(TQWheelEvent*))); - connect(this, TQT_SIGNAL(enableMoveTool(bool)), _scrollView, TQT_SLOT(slotEnableMoveTool(bool))); + connect(this, TQ_SIGNAL(enableMoveTool(bool)), _scrollView, TQ_SLOT(slotEnableMoveTool(bool))); splitterWidget->setCollapsible(sideBar, false); splitterWidget->setSizes(KVSPrefs::guiLayout()); - connect(searchWidget, TQT_SIGNAL(searchEnabled(bool)), this, TQT_SIGNAL(searchEnabled(bool))); - connect(searchWidget, TQT_SIGNAL(stopSearch()), this, TQT_SLOT(stopSearch())); + connect(searchWidget, TQ_SIGNAL(searchEnabled(bool)), this, TQ_SIGNAL(searchEnabled(bool))); + connect(searchWidget, TQ_SIGNAL(stopSearch()), this, TQ_SLOT(stopSearch())); } @@ -173,7 +173,7 @@ void KMultiPage::slotSave() } TDEIO::Job *job = TDEIO::file_copy( KURL( m_file ), KURL( fileName ), 0600, true, false, true ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotIOJobFinished ( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotIOJobFinished ( TDEIO::Job * ) ) ); return; } @@ -352,8 +352,8 @@ void KMultiPage::initializePageCache() DocumentWidget* KMultiPage::createDocumentWidget() { DocumentWidget* documentWidget = new DocumentWidget(scrollView()->viewport(), scrollView(), pageCache, "singlePageWidget"); - connect(documentWidget, TQT_SIGNAL(clearSelection()), this, TQT_SLOT(clearSelection())); - connect(this, TQT_SIGNAL(enableMoveTool(bool)), documentWidget, TQT_SLOT(slotEnableMoveTool(bool))); + connect(documentWidget, TQ_SIGNAL(clearSelection()), this, TQ_SLOT(clearSelection())); + connect(this, TQ_SIGNAL(enableMoveTool(bool)), documentWidget, TQ_SLOT(slotEnableMoveTool(bool))); return documentWidget; } @@ -436,8 +436,8 @@ void KMultiPage::generateDocumentWidgets(const PageNumber& _startPage) widgetList.insert(i, documentWidget); documentWidget->show(); - connect(documentWidget, TQT_SIGNAL(localLink(const TQString &)), this, TQT_SLOT(handleLocalLink(const TQString &))); - connect(documentWidget, TQT_SIGNAL(setStatusBarText(const TQString&)), this, TQT_SIGNAL(setStatusBarText(const TQString&)) ); + connect(documentWidget, TQ_SIGNAL(localLink(const TQString &)), this, TQ_SLOT(handleLocalLink(const TQString &))); + connect(documentWidget, TQ_SIGNAL(setStatusBarText(const TQString&)), this, TQ_SIGNAL(setStatusBarText(const TQString&)) ); } } @@ -639,7 +639,7 @@ void KMultiPage::handleLocalLink(const TQString &linkText) TQStringList args; args << "openURL"; args << Link_Url.toString(); - kapp->tdeinitExec("kfmclient", args); + tdeApp->tdeinitExec("kfmclient", args); } } } @@ -868,11 +868,11 @@ void KMultiPage::setRenderer(DocumentRenderer* _renderer) widgetList.resize(0); // Relay signals. - connect(renderer, TQT_SIGNAL(setStatusBarText(const TQString&)), this, TQT_SIGNAL(setStatusBarText(const TQString&))); - 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(renderer, TQ_SIGNAL(setStatusBarText(const TQString&)), this, TQ_SIGNAL(setStatusBarText(const TQString&))); + connect(pageCache, TQ_SIGNAL(paperSizeChanged()), this, TQ_SLOT(renderModeChanged())); + connect(pageCache, TQ_SIGNAL(textSelected(bool)), this, TQ_SIGNAL(textSelected(bool))); + connect(renderer, TQ_SIGNAL(documentIsChanged()), this, TQ_SLOT(renderModeChanged())); + connect(this, TQ_SIGNAL(zoomChanged()), this, TQ_SLOT(repaintAllVisibleWidgets())); } @@ -1428,7 +1428,7 @@ void KMultiPage::findNextText() if (i != 0) { setStatusBarText(i18n("Search page %1 of %2").arg(pageNumber).arg(numberOfPages())); - kapp->processEvents(); + tdeApp->processEvents(); } // Check if we already have a rendered version of the page in the cache. As we are only interested in the @@ -1570,7 +1570,7 @@ void KMultiPage::findPrevText() if (i != 0) { setStatusBarText(i18n("Search page %1 of %2").arg(pageNumber).arg(numberOfPages())); - kapp->processEvents(); + tdeApp->processEvents(); } // Check if we already have a rendered version of the page in the cache. As we are only interested in the diff --git a/kviewshell/tdemultipage.h b/kviewshell/tdemultipage.h index f41ff94f..e5363ef9 100644 --- a/kviewshell/tdemultipage.h +++ b/kviewshell/tdemultipage.h @@ -35,7 +35,7 @@ class SearchWidget; // TODO remove virtual inheritance for KDE 4. It's the reason for the strange DCOPObject construction class KMultiPage : public KParts::ReadOnlyPart, virtual public tdemultipageInterface { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/zoom.h b/kviewshell/zoom.h index 2ceb5f59..a71b3430 100644 --- a/kviewshell/zoom.h +++ b/kviewshell/zoom.h @@ -16,7 +16,7 @@ class Zoom : public TQObject { -Q_OBJECT +TQ_OBJECT public: |