diff options
Diffstat (limited to 'kviewshell')
159 files changed, 242 insertions, 455 deletions
diff --git a/kviewshell/CMakeL10n.txt b/kviewshell/CMakeL10n.txt index f7aa7dab..512902e6 100644 --- a/kviewshell/CMakeL10n.txt +++ b/kviewshell/CMakeL10n.txt @@ -6,3 +6,9 @@ tde_l10n_create_template( ) tde_l10n_auto_add_subdirectories( ) + +tde_l10n_create_template( + CATALOG "desktop_files/kviewshell-desktops/" + SOURCES *.desktop + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/kviewshell/CMakeLists.txt b/kviewshell/CMakeLists.txt index e41b832f..71d53359 100644 --- a/kviewshell/CMakeLists.txt +++ b/kviewshell/CMakeLists.txt @@ -64,8 +64,19 @@ if ( BUILD_KVIEWSHELL ) install( FILES kviewshell.rc DESTINATION ${DATA_INSTALL_DIR}/kviewshell ) install( FILES kviewerpart.rc DESTINATION ${DATA_INSTALL_DIR}/kviewerpart ) - install( FILES tdemultipage.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) - install( FILES emptymultipage.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) + + tde_create_translated_desktop( + SOURCE tdemultipage.desktop + DESTINATION ${SERVICETYPES_INSTALL_DIR} + PO_DIR kviewshell-desktops + ) + + tde_create_translated_desktop( + SOURCE emptymultipage.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR kviewshell-desktops + ) + install( FILES kviewshell.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) diff --git a/kviewshell/anchor.h b/kviewshell/anchor.h index f3faf13e..e6c4869e 100644 --- a/kviewshell/anchor.h +++ b/kviewshell/anchor.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // // anchor.h // diff --git a/kviewshell/bookmark.h b/kviewshell/bookmark.h index a1a310fb..f5dd2c0d 100644 --- a/kviewshell/bookmark.h +++ b/kviewshell/bookmark.h @@ -1,4 +1,3 @@ -// -*- C++ -*- /*************************************************************************** * Copyright (C) 2005 by Stefan Kebekus * * kebekus@kde.org * diff --git a/kviewshell/documentPageCache.h b/kviewshell/documentPageCache.h index 5e5936d5..7c7ee657 100644 --- a/kviewshell/documentPageCache.h +++ b/kviewshell/documentPageCache.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // // Class: documentPageCache // @@ -26,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 4ac576fc..eea0cd16 100644 --- a/kviewshell/documentRenderer.h +++ b/kviewshell/documentRenderer.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // // Class: documentRenderer // @@ -50,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..90533c26 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) @@ -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(); diff --git a/kviewshell/documentWidget.h b/kviewshell/documentWidget.h index d9b2839c..194bcdcd 100644 --- a/kviewshell/documentWidget.h +++ b/kviewshell/documentWidget.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // // Class: documentWidet // @@ -29,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 87ec5a0c..895f1de4 100644 --- a/kviewshell/emptyRenderer.h +++ b/kviewshell/emptyRenderer.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // *************************************************************************** // // Copyright (C) 2005 by Wilfried Huss <Wilfried.Huss@gmx.at> @@ -28,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 5f425ec8..6bcf770f 100644 --- a/kviewshell/empty_multipage.h +++ b/kviewshell/empty_multipage.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // *************************************************************************** // // Copyright (C) 2005 by Wilfried Huss <Wilfried.Huss@gmx.at> @@ -29,7 +28,7 @@ class EmptyMultiPage : public KMultiPage { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/emptymultipage.desktop b/kviewshell/emptymultipage.desktop index 3b8a90bc..87696453 100644 --- a/kviewshell/emptymultipage.desktop +++ b/kviewshell/emptymultipage.desktop @@ -1,28 +1,6 @@ [Desktop Entry] Type=Service -Comment= Name=EmptyMultiPage -Name[de]=Leere Mehrfachseite -Name[el]=ΚενήΠολλαπλήΣελίδα -Name[es]=Vaciado multipágina -Name[fi]=TyhjäMoniSivu -Name[fr]=Multi-page vide -Name[gl]=MultiPáxinaBaleira -Name[hu]=ÜresTöbbOldalas -Name[it]=MultiPaginaVuota -Name[nb]=Tom Flerside -Name[nds]=Leddig Mehrfachsiet -Name[ne]=रिक्त बहुपृष्ठ -Name[nl]=LegeMultiPagina -Name[nn]=Tom fleirside -Name[pl]=Puste wielostronicowe -Name[pt_BR]=MultiPáginas Vazias -Name[ro]=Pagini multiple goale -Name[sk]=EmprtyMultiPage -Name[sv]=Tom flera sidor -Name[ta]=காலியான பலபக்கம் -Name[tr]=BoşÇokluSayfa -Name[zh_HK]=空的多頁 X-TDE-ServiceTypes=KViewShell/MultiPage X-TDE-Library=emptymultipagepart X-TDE-EmptyMultiPage=1 diff --git a/kviewshell/history.h b/kviewshell/history.h index ba6376ef..c35d5531 100644 --- a/kviewshell/history.h +++ b/kviewshell/history.h @@ -1,4 +1,3 @@ -// -*- C++ -*- #ifndef history_h #define history_h @@ -33,7 +32,7 @@ bool operator!=(const HistoryItem& lhs, const HistoryItem& rhs) class History : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/hyperlink.h b/kviewshell/hyperlink.h index d57843b8..723c7237 100644 --- a/kviewshell/hyperlink.h +++ b/kviewshell/hyperlink.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // // Class: hyperlink // diff --git a/kviewshell/kprintDialogPage_pageoptions.h b/kviewshell/kprintDialogPage_pageoptions.h index 8b3ff434..68fe8a8c 100644 --- a/kviewshell/kprintDialogPage_pageoptions.h +++ b/kviewshell/kprintDialogPage_pageoptions.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // KPrintDialogPage_PageOptions.h // // Part of KVIEWSHELL - A framework for multipage text/gfx viewers diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp index c9d2b63f..a370bc76 100644 --- a/kviewshell/kviewpart.cpp +++ b/kviewshell/kviewpart.cpp @@ -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) @@ -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); @@ -862,7 +862,7 @@ bool KViewPart::openFile() // 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 b378028b..3f3c9bbe 100644 --- a/kviewshell/kviewpart.h +++ b/kviewshell/kviewpart.h @@ -1,4 +1,3 @@ -// -*- C++ -*- #ifndef KVIEWPART_H #define KVIEWPART_H @@ -30,7 +29,7 @@ class TQSize; class KViewPart : public KViewPart_Iface { - Q_OBJECT + TQ_OBJECT public: @@ -239,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 009552f1..83e0dbd5 100644 --- a/kviewshell/kviewpart_iface.h +++ b/kviewshell/kviewpart_iface.h @@ -1,4 +1,3 @@ -// -*- C++ -*- #ifndef KVIEWPART_IFACE_H #define KVIEWPART_IFACE_H @@ -9,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..12d56b73 100644 --- a/kviewshell/kviewshell.cpp +++ b/kviewshell/kviewshell.cpp @@ -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*))); } @@ -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 e4c45ee7..4a6b7a93 100644 --- a/kviewshell/kviewshell.h +++ b/kviewshell/kviewshell.h @@ -1,4 +1,3 @@ -// -*- C++ -*- #ifndef KVIEWSHELL_H #define KVIEWSHELL_H @@ -15,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/length.h b/kviewshell/length.h index 149c8a10..4578d5e0 100644 --- a/kviewshell/length.h +++ b/kviewshell/length.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // // Class: length // diff --git a/kviewshell/marklist.cpp b/kviewshell/marklist.cpp index 798f4559..0d895df3 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; } @@ -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 0ee15758..9375b73d 100644 --- a/kviewshell/marklist.h +++ b/kviewshell/marklist.h @@ -1,4 +1,3 @@ -// -*- C++ -*- /* This file is part of the KDE project Copyright (C) 2004 Wilfried Huss <Wilfried.Huss@gmx.at> @@ -42,7 +41,7 @@ class MarkListWidget; class ThumbnailWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -73,7 +72,7 @@ private: class MarkListWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -125,7 +124,7 @@ private: class MarkList: public TQScrollView { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/pageNumber.h b/kviewshell/pageNumber.h index 9fd48dc6..fa91ea52 100644 --- a/kviewshell/pageNumber.h +++ b/kviewshell/pageNumber.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // // pageNumber.h // diff --git a/kviewshell/pageSize.h b/kviewshell/pageSize.h index d7cbbd81..270d12a0 100644 --- a/kviewshell/pageSize.h +++ b/kviewshell/pageSize.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // // pageSize.h // @@ -40,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 5614c7bb..00300105 100644 --- a/kviewshell/pageSizeDialog.h +++ b/kviewshell/pageSizeDialog.h @@ -1,4 +1,3 @@ -// -*- C++ -*- /* * pageSizeDialog, for kviewshell * This file: Copyright (C) 2002-2003 Stefan Kebekus, kebekus@kde.org @@ -28,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 572afe63..dbbfe269 100644 --- a/kviewshell/pageSizeWidget.h +++ b/kviewshell/pageSizeWidget.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // pageSizeWidget.h // // Part of KVIEWSHELL - A framework for multipage text/gfx viewers @@ -18,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 4d2ef271..2664f4f9 100644 --- a/kviewshell/pageView.h +++ b/kviewshell/pageView.h @@ -1,4 +1,3 @@ -// -*- C++ -*- /* This file is part of the KDE project Copyright (C) 2001 Wilco Greven <greven@kde.org> Copyright (C) 2004-2005 Wilfried Huss <Wilfried.Huss@gmx.at> @@ -36,7 +35,7 @@ class PageNumber; */ class PageView : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/plugins/djvu/CMakeLists.txt b/kviewshell/plugins/djvu/CMakeLists.txt index fe9d4ef9..237f6bf3 100644 --- a/kviewshell/plugins/djvu/CMakeLists.txt +++ b/kviewshell/plugins/djvu/CMakeLists.txt @@ -28,7 +28,12 @@ link_directories( ##### other data ################################ -install( FILES djvumultipage.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE djvumultipage.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR kviewshell-desktops +) + install( FILES djvumultipage.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) install( FILES djvumultipage.rc DESTINATION ${DATA_INSTALL_DIR} ) 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.desktop b/kviewshell/plugins/djvu/djvumultipage.desktop index 6da86c47..6aecc337 100644 --- a/kviewshell/plugins/djvu/djvumultipage.desktop +++ b/kviewshell/plugins/djvu/djvumultipage.desktop @@ -1,56 +1,8 @@ [Desktop Entry] Name=kdjview -Name[hu]=KDjView -Name[ja]=Kdjview -Name[ne]=केडीजे दृश्य -Name[sk]=kdjView -Name[sv]=Kdjview -Name[zh_CN]=KDjView Icon=kdjview Type=Service Comment=KViewShell plugin for DjVu files -Comment[bg]=Приставка за файлове DjVu -Comment[br]=Lugent KViewShell evit ar restroù DjVu -Comment[bs]=KViewShell dodatak za DjVu datoteke -Comment[ca]=Connector pel KViewShell per fitxers DjVu -Comment[cs]=KViewShell modul pro DjVu soubory -Comment[da]=Kviewshell-plugin for DjVu-filer -Comment[de]=Ein KViewShell-Modul für DjVu-Dateien -Comment[el]=Πρόσθετο του KViewShell για αρχεία DjVu -Comment[es]=Extensión KViewShell para archivos DjVu -Comment[et]=KView DjVu-failide plugin -Comment[eu]=DjVu fitxategien KViewShell-en plugina -Comment[fa]=وصلۀ KViewShell برای پروندههای DjVu -Comment[fi]=KViewShell sovelma DjVu-tiedostoille -Comment[fr]=Module KViewShell pour les fichiers DjVu -Comment[gl]=Extensión de KViewShell para ficheiros DjVu -Comment[hu]=KViewShell-modul DjVu-fájlokhoz -Comment[is]=KViewShell íforrit fyrir DjVu skrár -Comment[it]=Plugin KViewShell per file DjVu -Comment[ja]=DjVu ファイル用の KViewShell プラグイン -Comment[kk]=DjVu файлдарына арналған KViewShell плагин модулі -Comment[km]=កម្មវិធីជំនួយ KViewShell សម្រាប់ឯកសារ DjVu -Comment[lt]=KViewShell priedas, skirtas DjVu byloms -Comment[ms]=Plugin KViewShell untuk fail DjVu -Comment[nb]=KViewShell programtillegg for DjVu-filer -Comment[nds]=En "KViewShell"-Moduul för DjVu-Dateien -Comment[ne]=डिजे भीयू फाइलका लागि केडीई दृश्य शेल प्लगइन -Comment[nl]=KViewShell-plugin voor DjVu-bestanden -Comment[nn]=KViewShell-programtillegg for DjVu-filer -Comment[pl]=Wtyczka KViewShell do plików DjVu -Comment[pt]='Plugin' do KViewShell para ficheiros do DjVu -Comment[pt_BR]=Plugin KViewShell para arquivos DjVu -Comment[ru]=Компонент просмотра файлов DjVu -Comment[sk]=KViewShell modul pre DjVu súbory -Comment[sl]=Vstavek za KViewShell za datoteke DjVu -Comment[sr]=KViewShell-ов прикључак за DjVu фајлове -Comment[sr@Latn]=KViewShell-ov priključak za DjVu fajlove -Comment[sv]=Kviewshell-insticksprogram för DjVu-filer -Comment[tr]=DjVu dosyaları için KViewShell eklentisi -Comment[uk]=Втулок перегляду файлів DjVu для KViewShell -Comment[zh_CN]=DjVu 文件的 KViewShell 插件 -Comment[zh_HK]=用於 DjVu 檔案的 KViewShell 插件 -Comment[zh_TW]=DjVu 檔的 KViewShell 外掛程式 X-TDE-ServiceTypes=KViewShell/MultiPage X-TDE-MimeTypes=image/x-djvu X-TDE-Library=djvuviewpart 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.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.cpp b/kviewshell/plugins/djvu/libdjvu/Arrays.cpp index 5cb7b04c..5a877dd6 100644 --- a/kviewshell/plugins/djvu/libdjvu/Arrays.cpp +++ b/kviewshell/plugins/djvu/libdjvu/Arrays.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/Arrays.h b/kviewshell/plugins/djvu/libdjvu/Arrays.h index b2676d5a..2e16520c 100644 --- a/kviewshell/plugins/djvu/libdjvu/Arrays.h +++ b/kviewshell/plugins/djvu/libdjvu/Arrays.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/BSByteStream.cpp b/kviewshell/plugins/djvu/libdjvu/BSByteStream.cpp index 77334a45..62dfa440 100644 --- a/kviewshell/plugins/djvu/libdjvu/BSByteStream.cpp +++ b/kviewshell/plugins/djvu/libdjvu/BSByteStream.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/BSByteStream.h b/kviewshell/plugins/djvu/libdjvu/BSByteStream.h index 6a985cdf..be5735bd 100644 --- a/kviewshell/plugins/djvu/libdjvu/BSByteStream.h +++ b/kviewshell/plugins/djvu/libdjvu/BSByteStream.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/BSEncodeByteStream.cpp b/kviewshell/plugins/djvu/libdjvu/BSEncodeByteStream.cpp index 9d5b726d..6278c19a 100644 --- a/kviewshell/plugins/djvu/libdjvu/BSEncodeByteStream.cpp +++ b/kviewshell/plugins/djvu/libdjvu/BSEncodeByteStream.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/ByteStream.cpp b/kviewshell/plugins/djvu/libdjvu/ByteStream.cpp index 011b348d..ff04da3e 100644 --- a/kviewshell/plugins/djvu/libdjvu/ByteStream.cpp +++ b/kviewshell/plugins/djvu/libdjvu/ByteStream.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/ByteStream.h b/kviewshell/plugins/djvu/libdjvu/ByteStream.h index 7ecfd8b7..a92e8aa4 100644 --- a/kviewshell/plugins/djvu/libdjvu/ByteStream.h +++ b/kviewshell/plugins/djvu/libdjvu/ByteStream.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DataPool.cpp b/kviewshell/plugins/djvu/libdjvu/DataPool.cpp index 1190292e..ab738a56 100644 --- a/kviewshell/plugins/djvu/libdjvu/DataPool.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DataPool.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DataPool.h b/kviewshell/plugins/djvu/libdjvu/DataPool.h index fb4bea4e..ffd99ec5 100644 --- a/kviewshell/plugins/djvu/libdjvu/DataPool.h +++ b/kviewshell/plugins/djvu/libdjvu/DataPool.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVmDir.cpp b/kviewshell/plugins/djvu/libdjvu/DjVmDir.cpp index 83f9df78..5b78d6fd 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVmDir.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVmDir.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVmDir.h b/kviewshell/plugins/djvu/libdjvu/DjVmDir.h index 86b661e3..80a93b40 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVmDir.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVmDir.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVmDir0.cpp b/kviewshell/plugins/djvu/libdjvu/DjVmDir0.cpp index 62694098..4994d5e7 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVmDir0.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVmDir0.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVmDir0.h b/kviewshell/plugins/djvu/libdjvu/DjVmDir0.h index c17c795e..289a63c6 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVmDir0.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVmDir0.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVmDoc.cpp b/kviewshell/plugins/djvu/libdjvu/DjVmDoc.cpp index 5b851d6e..e6ba4a30 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVmDoc.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVmDoc.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVmDoc.h b/kviewshell/plugins/djvu/libdjvu/DjVmDoc.h index 637d0b78..794e9802 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVmDoc.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVmDoc.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVmNav.cpp b/kviewshell/plugins/djvu/libdjvu/DjVmNav.cpp index 9e8b5fd7..cab46992 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVmNav.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVmNav.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVmNav.h b/kviewshell/plugins/djvu/libdjvu/DjVmNav.h index 46c5d57f..746b6274 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVmNav.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVmNav.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuAnno.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuAnno.cpp index 7cece60b..1d42b737 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuAnno.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuAnno.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuAnno.h b/kviewshell/plugins/djvu/libdjvu/DjVuAnno.h index ed82f933..2fc77cbb 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuAnno.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuAnno.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -152,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 diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp index 542faa7a..1c6a3445 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.h b/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.h index 7bf6124a..c7474cb3 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp index 3b33d943..c7effd99 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDocument.h b/kviewshell/plugins/djvu/libdjvu/DjVuDocument.h index 418d0814..68376e39 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuDocument.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuDocument.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDumpHelper.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuDumpHelper.cpp index 2d977be1..6bc43ce7 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuDumpHelper.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuDumpHelper.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDumpHelper.h b/kviewshell/plugins/djvu/libdjvu/DjVuDumpHelper.h index 33be56c3..e0440344 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuDumpHelper.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuDumpHelper.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.cpp index e7c74b84..302c6a91 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.h b/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.h index 885e76aa..e4f38a0d 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp index 73e3a9c2..415992d4 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuFile.h b/kviewshell/plugins/djvu/libdjvu/DjVuFile.h index ea0e6db3..5648184e 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuFile.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuFile.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuFileCache.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuFileCache.cpp index 13220a96..b54d68b9 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuFileCache.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuFileCache.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuFileCache.h b/kviewshell/plugins/djvu/libdjvu/DjVuFileCache.h index 9898b8f3..c6b1b70b 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuFileCache.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuFileCache.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.cpp index b31b04bf..4caf68ba 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.h b/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.h index 3d26c8cf..665be768 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuGlobalMemory.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuGlobalMemory.cpp index 1c684336..94474127 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuGlobalMemory.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuGlobalMemory.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp index f384ce97..28d01b8c 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuImage.h b/kviewshell/plugins/djvu/libdjvu/DjVuImage.h index 57b40938..f898c5a6 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuImage.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuImage.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuInfo.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuInfo.cpp index 13ae6480..b77905f5 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuInfo.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuInfo.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuInfo.h b/kviewshell/plugins/djvu/libdjvu/DjVuInfo.h index 67a83be9..4e188cad 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuInfo.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuInfo.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuMessage.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuMessage.cpp index e92b7570..9bcf3011 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuMessage.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuMessage.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuMessage.h b/kviewshell/plugins/djvu/libdjvu/DjVuMessage.h index 2302be37..c9b598e7 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuMessage.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuMessage.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuMessageLite.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuMessageLite.cpp index 258b0649..a312677c 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuMessageLite.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuMessageLite.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuMessageLite.h b/kviewshell/plugins/djvu/libdjvu/DjVuMessageLite.h index f2e941cf..2f6cc93a 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuMessageLite.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuMessageLite.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuNavDir.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuNavDir.cpp index 615041b0..48fd4507 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuNavDir.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuNavDir.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuNavDir.h b/kviewshell/plugins/djvu/libdjvu/DjVuNavDir.h index 90b2b8db..d0bbb949 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuNavDir.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuNavDir.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuPalette.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuPalette.cpp index 0b8fa614..06e6e911 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuPalette.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuPalette.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuPalette.h b/kviewshell/plugins/djvu/libdjvu/DjVuPalette.h index 7f9884f1..93b7661e 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuPalette.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuPalette.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp index 5e8a25c9..97723221 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuPort.h b/kviewshell/plugins/djvu/libdjvu/DjVuPort.h index 99c165fb..d7700997 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuPort.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuPort.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp index 5be8cbe7..fc69e154 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -88,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 b06536c7..6f23c3b3 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuText.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuText.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -172,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.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuToPS.cpp index d18c7801..78490777 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuToPS.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuToPS.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002-2003 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuToPS.h b/kviewshell/plugins/djvu/libdjvu/DjVuToPS.h index 95d547bb..7c3efb2e 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuToPS.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuToPS.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002-2003 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GBitmap.cpp b/kviewshell/plugins/djvu/libdjvu/GBitmap.cpp index 696367e7..8af09e7c 100644 --- a/kviewshell/plugins/djvu/libdjvu/GBitmap.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GBitmap.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GBitmap.h b/kviewshell/plugins/djvu/libdjvu/GBitmap.h index 74669c05..fb255d44 100644 --- a/kviewshell/plugins/djvu/libdjvu/GBitmap.h +++ b/kviewshell/plugins/djvu/libdjvu/GBitmap.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -621,7 +620,7 @@ GBitmap::euclidian_ratio(int a, int b, int &q, int &r) inline int GBitmap::read_run(unsigned char *&data) { - register int z=*data++; + int z=*data++; return (z>=RUNOVERFLOWVALUE)? ((z&~RUNOVERFLOWVALUE)<<8)|(*data++):z; } @@ -629,7 +628,7 @@ GBitmap::read_run(unsigned char *&data) inline int GBitmap::read_run(const unsigned char *&data) { - register int z=*data++; + int z=*data++; return (z>=RUNOVERFLOWVALUE)? ((z&~RUNOVERFLOWVALUE)<<8)|(*data++):z; } diff --git a/kviewshell/plugins/djvu/libdjvu/GContainer.cpp b/kviewshell/plugins/djvu/libdjvu/GContainer.cpp index 2019439c..feeedd99 100644 --- a/kviewshell/plugins/djvu/libdjvu/GContainer.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GContainer.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GContainer.h b/kviewshell/plugins/djvu/libdjvu/GContainer.h index 61fabfaf..9a298b04 100644 --- a/kviewshell/plugins/djvu/libdjvu/GContainer.h +++ b/kviewshell/plugins/djvu/libdjvu/GContainer.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GException.cpp b/kviewshell/plugins/djvu/libdjvu/GException.cpp index f3f84dda..a04ef1b2 100644 --- a/kviewshell/plugins/djvu/libdjvu/GException.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GException.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GException.h b/kviewshell/plugins/djvu/libdjvu/GException.h index 97286987..822b668e 100644 --- a/kviewshell/plugins/djvu/libdjvu/GException.h +++ b/kviewshell/plugins/djvu/libdjvu/GException.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp b/kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp index 973c6cec..63ca548b 100644 --- a/kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GIFFManager.h b/kviewshell/plugins/djvu/libdjvu/GIFFManager.h index 722f592f..921a7c64 100644 --- a/kviewshell/plugins/djvu/libdjvu/GIFFManager.h +++ b/kviewshell/plugins/djvu/libdjvu/GIFFManager.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GMapAreas.cpp b/kviewshell/plugins/djvu/libdjvu/GMapAreas.cpp index 5a85e1fc..69c5b93f 100644 --- a/kviewshell/plugins/djvu/libdjvu/GMapAreas.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GMapAreas.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GMapAreas.h b/kviewshell/plugins/djvu/libdjvu/GMapAreas.h index 251427ed..46319147 100644 --- a/kviewshell/plugins/djvu/libdjvu/GMapAreas.h +++ b/kviewshell/plugins/djvu/libdjvu/GMapAreas.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GOS.cpp b/kviewshell/plugins/djvu/libdjvu/GOS.cpp index ebfaddfa..515c9e23 100644 --- a/kviewshell/plugins/djvu/libdjvu/GOS.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GOS.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GOS.h b/kviewshell/plugins/djvu/libdjvu/GOS.h index 3e57fb40..1201e564 100644 --- a/kviewshell/plugins/djvu/libdjvu/GOS.h +++ b/kviewshell/plugins/djvu/libdjvu/GOS.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GPixmap.cpp b/kviewshell/plugins/djvu/libdjvu/GPixmap.cpp index 81c1dd71..b9c15c72 100644 --- a/kviewshell/plugins/djvu/libdjvu/GPixmap.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GPixmap.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GPixmap.h b/kviewshell/plugins/djvu/libdjvu/GPixmap.h index 32d51c7e..023fc411 100644 --- a/kviewshell/plugins/djvu/libdjvu/GPixmap.h +++ b/kviewshell/plugins/djvu/libdjvu/GPixmap.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GRect.cpp b/kviewshell/plugins/djvu/libdjvu/GRect.cpp index 1ac0a87c..fe482368 100644 --- a/kviewshell/plugins/djvu/libdjvu/GRect.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GRect.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GRect.h b/kviewshell/plugins/djvu/libdjvu/GRect.h index 51770cbb..518691ea 100644 --- a/kviewshell/plugins/djvu/libdjvu/GRect.h +++ b/kviewshell/plugins/djvu/libdjvu/GRect.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -132,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 @@ -150,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/GScaler.cpp b/kviewshell/plugins/djvu/libdjvu/GScaler.cpp index 0eeb9ebf..2f381449 100644 --- a/kviewshell/plugins/djvu/libdjvu/GScaler.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GScaler.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GScaler.h b/kviewshell/plugins/djvu/libdjvu/GScaler.h index 4843f6d0..f2347a85 100644 --- a/kviewshell/plugins/djvu/libdjvu/GScaler.h +++ b/kviewshell/plugins/djvu/libdjvu/GScaler.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GSmartPointer.cpp b/kviewshell/plugins/djvu/libdjvu/GSmartPointer.cpp index 8c17755d..92608c16 100644 --- a/kviewshell/plugins/djvu/libdjvu/GSmartPointer.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GSmartPointer.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GSmartPointer.h b/kviewshell/plugins/djvu/libdjvu/GSmartPointer.h index 937a783d..422b6569 100644 --- a/kviewshell/plugins/djvu/libdjvu/GSmartPointer.h +++ b/kviewshell/plugins/djvu/libdjvu/GSmartPointer.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GString.cpp b/kviewshell/plugins/djvu/libdjvu/GString.cpp index a618055e..1b0deeae 100644 --- a/kviewshell/plugins/djvu/libdjvu/GString.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GString.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GString.h b/kviewshell/plugins/djvu/libdjvu/GString.h index 601db983..a605de1d 100644 --- a/kviewshell/plugins/djvu/libdjvu/GString.h +++ b/kviewshell/plugins/djvu/libdjvu/GString.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GThreads.cpp b/kviewshell/plugins/djvu/libdjvu/GThreads.cpp index ce88361e..2e96d887 100644 --- a/kviewshell/plugins/djvu/libdjvu/GThreads.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GThreads.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GThreads.h b/kviewshell/plugins/djvu/libdjvu/GThreads.h index 92691db4..1e43ea80 100644 --- a/kviewshell/plugins/djvu/libdjvu/GThreads.h +++ b/kviewshell/plugins/djvu/libdjvu/GThreads.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GURL.cpp b/kviewshell/plugins/djvu/libdjvu/GURL.cpp index 54b082ff..812f1d22 100644 --- a/kviewshell/plugins/djvu/libdjvu/GURL.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GURL.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GURL.h b/kviewshell/plugins/djvu/libdjvu/GURL.h index eb3ed4bc..077da24a 100644 --- a/kviewshell/plugins/djvu/libdjvu/GURL.h +++ b/kviewshell/plugins/djvu/libdjvu/GURL.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/GUnicode.cpp b/kviewshell/plugins/djvu/libdjvu/GUnicode.cpp index dbbefc5c..ea3aba52 100644 --- a/kviewshell/plugins/djvu/libdjvu/GUnicode.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GUnicode.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/IFFByteStream.cpp b/kviewshell/plugins/djvu/libdjvu/IFFByteStream.cpp index c8b79809..51a491ab 100644 --- a/kviewshell/plugins/djvu/libdjvu/IFFByteStream.cpp +++ b/kviewshell/plugins/djvu/libdjvu/IFFByteStream.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/IFFByteStream.h b/kviewshell/plugins/djvu/libdjvu/IFFByteStream.h index cb1fb616..291e86fe 100644 --- a/kviewshell/plugins/djvu/libdjvu/IFFByteStream.h +++ b/kviewshell/plugins/djvu/libdjvu/IFFByteStream.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/IW44EncodeCodec.cpp b/kviewshell/plugins/djvu/libdjvu/IW44EncodeCodec.cpp index c63eda7d..57b2a10a 100644 --- a/kviewshell/plugins/djvu/libdjvu/IW44EncodeCodec.cpp +++ b/kviewshell/plugins/djvu/libdjvu/IW44EncodeCodec.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/IW44Image.cpp b/kviewshell/plugins/djvu/libdjvu/IW44Image.cpp index 2cadf4f9..d2e94a1f 100644 --- a/kviewshell/plugins/djvu/libdjvu/IW44Image.cpp +++ b/kviewshell/plugins/djvu/libdjvu/IW44Image.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/IW44Image.h b/kviewshell/plugins/djvu/libdjvu/IW44Image.h index 56cf00fa..817c1e5d 100644 --- a/kviewshell/plugins/djvu/libdjvu/IW44Image.h +++ b/kviewshell/plugins/djvu/libdjvu/IW44Image.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp b/kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp index 5a8092a0..8491e760 100644 --- a/kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp +++ b/kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/JB2Image.cpp b/kviewshell/plugins/djvu/libdjvu/JB2Image.cpp index 7aad9261..2d1bd218 100644 --- a/kviewshell/plugins/djvu/libdjvu/JB2Image.cpp +++ b/kviewshell/plugins/djvu/libdjvu/JB2Image.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/JB2Image.h b/kviewshell/plugins/djvu/libdjvu/JB2Image.h index a8ea8aae..4619445e 100644 --- a/kviewshell/plugins/djvu/libdjvu/JB2Image.h +++ b/kviewshell/plugins/djvu/libdjvu/JB2Image.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -197,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/JPEGDecoder.cpp b/kviewshell/plugins/djvu/libdjvu/JPEGDecoder.cpp index 3f611965..82ec93f0 100644 --- a/kviewshell/plugins/djvu/libdjvu/JPEGDecoder.cpp +++ b/kviewshell/plugins/djvu/libdjvu/JPEGDecoder.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/JPEGDecoder.h b/kviewshell/plugins/djvu/libdjvu/JPEGDecoder.h index 8a0ace5d..8fcd737c 100644 --- a/kviewshell/plugins/djvu/libdjvu/JPEGDecoder.h +++ b/kviewshell/plugins/djvu/libdjvu/JPEGDecoder.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp b/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp index 64be7931..3dced77a 100644 --- a/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp +++ b/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -603,7 +602,7 @@ MMRDecoder::scanruns(const unsigned short **endptr) b1 += *pr++; break; } - /*Qt::Horizontal Mode */ + /* Horizontal Mode */ case H: { // First run @@ -617,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/MMRDecoder.h b/kviewshell/plugins/djvu/libdjvu/MMRDecoder.h index 6516b4cd..633c1258 100644 --- a/kviewshell/plugins/djvu/libdjvu/MMRDecoder.h +++ b/kviewshell/plugins/djvu/libdjvu/MMRDecoder.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/MMX.cpp b/kviewshell/plugins/djvu/libdjvu/MMX.cpp index 58b74177..e60ec1c9 100644 --- a/kviewshell/plugins/djvu/libdjvu/MMX.cpp +++ b/kviewshell/plugins/djvu/libdjvu/MMX.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/MMX.h b/kviewshell/plugins/djvu/libdjvu/MMX.h index 41ec002f..e6d17ba7 100644 --- a/kviewshell/plugins/djvu/libdjvu/MMX.h +++ b/kviewshell/plugins/djvu/libdjvu/MMX.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. @@ -174,9 +173,9 @@ class MMXControl #define MMXir(op,imm,dst) \ __asm { op dst,imm } #define MMXar(op,addr,dst) \ - { register __int64 var=*(__int64*)(addr); __asm { op dst,var } } + { __int64 var=*(__int64*)(addr); __asm { op dst,var } } #define MMXra(op,src,addr) \ - { register __int64 var; __asm { op [var],src }; *(__int64*)addr = var; } + { __int64 var; __asm { op [var],src }; *(__int64*)addr = var; } // Probably not as efficient as GCC macros #define MMX 1 #endif diff --git a/kviewshell/plugins/djvu/libdjvu/Template.h b/kviewshell/plugins/djvu/libdjvu/Template.h index c37935ce..73de046a 100644 --- a/kviewshell/plugins/djvu/libdjvu/Template.h +++ b/kviewshell/plugins/djvu/libdjvu/Template.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/UnicodeByteStream.cpp b/kviewshell/plugins/djvu/libdjvu/UnicodeByteStream.cpp index 8d4f0188..a2affc02 100644 --- a/kviewshell/plugins/djvu/libdjvu/UnicodeByteStream.cpp +++ b/kviewshell/plugins/djvu/libdjvu/UnicodeByteStream.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/UnicodeByteStream.h b/kviewshell/plugins/djvu/libdjvu/UnicodeByteStream.h index df678ffe..f4642067 100644 --- a/kviewshell/plugins/djvu/libdjvu/UnicodeByteStream.h +++ b/kviewshell/plugins/djvu/libdjvu/UnicodeByteStream.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/XMLParser.cpp b/kviewshell/plugins/djvu/libdjvu/XMLParser.cpp index b1d9f469..26910f34 100644 --- a/kviewshell/plugins/djvu/libdjvu/XMLParser.cpp +++ b/kviewshell/plugins/djvu/libdjvu/XMLParser.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/XMLParser.h b/kviewshell/plugins/djvu/libdjvu/XMLParser.h index 08b6d508..0afd1bb3 100644 --- a/kviewshell/plugins/djvu/libdjvu/XMLParser.h +++ b/kviewshell/plugins/djvu/libdjvu/XMLParser.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/XMLTags.cpp b/kviewshell/plugins/djvu/libdjvu/XMLTags.cpp index 2511a585..58acaf57 100644 --- a/kviewshell/plugins/djvu/libdjvu/XMLTags.cpp +++ b/kviewshell/plugins/djvu/libdjvu/XMLTags.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/XMLTags.h b/kviewshell/plugins/djvu/libdjvu/XMLTags.h index 027e629b..f217b8f3 100644 --- a/kviewshell/plugins/djvu/libdjvu/XMLTags.h +++ b/kviewshell/plugins/djvu/libdjvu/XMLTags.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/ZPCodec.cpp b/kviewshell/plugins/djvu/libdjvu/ZPCodec.cpp index 89461872..60b0ccf8 100644 --- a/kviewshell/plugins/djvu/libdjvu/ZPCodec.cpp +++ b/kviewshell/plugins/djvu/libdjvu/ZPCodec.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/ZPCodec.h b/kviewshell/plugins/djvu/libdjvu/ZPCodec.h index 4eba6901..bee55490 100644 --- a/kviewshell/plugins/djvu/libdjvu/ZPCodec.h +++ b/kviewshell/plugins/djvu/libdjvu/ZPCodec.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/configure.in.in b/kviewshell/plugins/djvu/libdjvu/configure.in.in index b3ebeec6..05cf6bc5 100644 --- a/kviewshell/plugins/djvu/libdjvu/configure.in.in +++ b/kviewshell/plugins/djvu/libdjvu/configure.in.in @@ -28,8 +28,8 @@ dnl ------------------------------------------------------- AC_DEFUN([AC_CHECK_CXX_OPT],[ opt="$1" AC_MSG_CHECKING([if $CXX accepts $opt]) - echo 'void f(){}' > conftest.cc - if test -z "`${CXX} ${CXXFLAGS} ${OPTS} $opt -c conftest.cc 2>&1`"; then + echo 'void f(){}' > conftest.cpp + if test -z "`${CXX} ${CXXFLAGS} ${OPTS} $opt -c conftest.cpp 2>&1`"; then AC_MSG_RESULT(yes) rm conftest.* $2 @@ -389,8 +389,8 @@ if test x$acx_cothread != xno ; then AC_MSG_RESULT($acx_cothread_patch) if test x$acx_cothread_patch = xno ; then AC_MSG_CHECKING([if the cothread patch is critical]) - echo 'void foo() { throw "Hello"; }' > conftest.cc - compile="$CXX $CXXFLAGS -c conftest.cc" + echo 'void foo() { throw "Hello"; }' > conftest.cpp + compile="$CXX $CXXFLAGS -c conftest.cpp" check="nm conftest.o | grep sjthrow | cat > conftest.out" acx_cothread_patch=yes if AC_TRY_EVAL(compile) && AC_TRY_EVAL(check) ; then diff --git a/kviewshell/plugins/djvu/libdjvu/debug.cpp b/kviewshell/plugins/djvu/libdjvu/debug.cpp index 20c93e50..40e57b70 100644 --- a/kviewshell/plugins/djvu/libdjvu/debug.cpp +++ b/kviewshell/plugins/djvu/libdjvu/debug.cpp @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. diff --git a/kviewshell/plugins/djvu/libdjvu/debug.h b/kviewshell/plugins/djvu/libdjvu/debug.h index c39390a2..0aa4945b 100644 --- a/kviewshell/plugins/djvu/libdjvu/debug.h +++ b/kviewshell/plugins/djvu/libdjvu/debug.h @@ -1,4 +1,3 @@ -//C- -*- C++ -*- //C- ------------------------------------------------------------------- //C- DjVuLibre-3.5 //C- Copyright (c) 2002 Leon Bottou and Yann Le Cun. 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 a266188a..18b67d07 100644 --- a/kviewshell/renderedDocumentPage.h +++ b/kviewshell/renderedDocumentPage.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // // Class: documentPage // @@ -66,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 2944075a..1fc497ec 100644 --- a/kviewshell/renderedDocumentPagePixmap.h +++ b/kviewshell/renderedDocumentPagePixmap.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // // Class: RenderedDocumentPagePixmap // @@ -21,7 +20,7 @@ // about a certain page. class RenderedDocumentPagePixmap: public RenderedDocumentPage, public TQPixmap { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/renderedDocumentPagePrinter.h b/kviewshell/renderedDocumentPagePrinter.h index f0b78f91..c9e644b5 100644 --- a/kviewshell/renderedDocumentPagePrinter.h +++ b/kviewshell/renderedDocumentPagePrinter.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // // Class: RenderedDocumentPagePrinter // 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 d4b09e4d..13c1590e 100644 --- a/kviewshell/searchWidget.h +++ b/kviewshell/searchWidget.h @@ -1,4 +1,3 @@ -// -*- C++ -*- /*************************************************************************** * Copyright (C) 2005 by Wilfried Huss * * Wilfried.Huss@gmx.at * @@ -33,7 +32,7 @@ class TQString; class SearchWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kviewshell/selection.h b/kviewshell/selection.h index 0f58fe5b..313b2815 100644 --- a/kviewshell/selection.h +++ b/kviewshell/selection.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // // selection.h // diff --git a/kviewshell/simplePageSize.h b/kviewshell/simplePageSize.h index 46972e88..1bd39166 100644 --- a/kviewshell/simplePageSize.h +++ b/kviewshell/simplePageSize.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // // simplePageSize.h // diff --git a/kviewshell/sizePreview.h b/kviewshell/sizePreview.h index 2d6e06fa..768306aa 100644 --- a/kviewshell/sizePreview.h +++ b/kviewshell/sizePreview.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // SizePreview.h // // Part of KVIEWSHELL - A framework for multipage text/gfx viewers @@ -18,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 d4f58c44..9eaeb610 100644 --- a/kviewshell/tableOfContents.h +++ b/kviewshell/tableOfContents.h @@ -1,4 +1,3 @@ -// -*- C++ -*- /*************************************************************************** * Copyright (C) 2005 by Wilfried Huss * * Wilfried.Huss@gmx.at * @@ -45,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..49294609 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&)) ); } } @@ -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())); } diff --git a/kviewshell/tdemultipage.desktop b/kviewshell/tdemultipage.desktop index 0ef915a9..5d1aee9e 100644 --- a/kviewshell/tdemultipage.desktop +++ b/kviewshell/tdemultipage.desktop @@ -2,34 +2,6 @@ Type=Service X-TDE-ServiceType=KViewShell/MultiPage Name=KViewShell MultiPage -Name[da]=KViewShell Multiside -Name[de]=KViewShell Mehrfachseiten -Name[el]=Πολλαπλή σελίδα KViewShell -Name[es]=Multipágina KViewShell -Name[fi]=KViewShell MoniSivu -Name[fr]=Multi-page KViewShell -Name[gl]=KViewShell Multipáxina -Name[hu]=KViewShell többoldalas -Name[it]=MultiPagina KViewShell -Name[kk]=Көпбетті KViewShell -Name[ms]=PelbagaiMuka KViewShell -Name[nb]=KViewShell Flerside -Name[nds]=KViewShell för Mehrfachsieden -Name[ne]=के दृश्य शेल बहुपृष्ठ -Name[nl]=KViewShell MultiPagina -Name[nn]=KViewShell-fleirside -Name[pl]=Wielostronicowe dla KViewShell -Name[pt]=KViewShell MultiPágina -Name[pt_BR]=KViewShell - Múltiplas Páginas -Name[ro]=KViewShell Pagini Multiple -Name[ru]=Компонент MultiPage -Name[sr]=KViewShell вишестрани -Name[sr@Latn]=KViewShell višestrani -Name[sv]=Kviewshell flera sidor -Name[ta]=கேகாட்சிஓடு பலபக்கம் -Name[tr]=KViewShell ÇokluSayfa -Name[zh_CN]=KViewShell 多页 -Name[zh_HK]=KViewShell 多頁 [PropertyDef::X-TDE-MimeTypes] Type=TQString diff --git a/kviewshell/tdemultipage.h b/kviewshell/tdemultipage.h index c1402809..e5363ef9 100644 --- a/kviewshell/tdemultipage.h +++ b/kviewshell/tdemultipage.h @@ -1,4 +1,3 @@ -// -*- C++ -*- #ifndef _TDEMULTIPAGE_H #define _TDEMULTIPAGE_H @@ -36,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/tdemultipageInterface.h b/kviewshell/tdemultipageInterface.h index f060a708..c1bbad90 100644 --- a/kviewshell/tdemultipageInterface.h +++ b/kviewshell/tdemultipageInterface.h @@ -1,4 +1,3 @@ -// -*- C++ -*- #ifndef TDEMULTIPAGEINTERFACE_H #define TDEMULTIPAGEINTERFACE_H diff --git a/kviewshell/textBox.h b/kviewshell/textBox.h index 682b5583..22e24848 100644 --- a/kviewshell/textBox.h +++ b/kviewshell/textBox.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // // Class: textBox // diff --git a/kviewshell/zoom.h b/kviewshell/zoom.h index 4a1b780a..a71b3430 100644 --- a/kviewshell/zoom.h +++ b/kviewshell/zoom.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // zoom.h // // Part of KVIEWSHELL - A framework for multipage text/gfx viewers @@ -17,7 +16,7 @@ class Zoom : public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/kviewshell/zoomlimits.h b/kviewshell/zoomlimits.h index 2458c488..e02641d6 100644 --- a/kviewshell/zoomlimits.h +++ b/kviewshell/zoomlimits.h @@ -1,4 +1,3 @@ -// -*- C++ -*- #ifndef ZOOMLIMITS_H #define ZOOMLIMITS_H |