diff options
Diffstat (limited to 'kooka')
37 files changed, 214 insertions, 274 deletions
diff --git a/kooka/CMakeL10n.txt b/kooka/CMakeL10n.txt index ab6ede2b..19ec78c2 100644 --- a/kooka/CMakeL10n.txt +++ b/kooka/CMakeL10n.txt @@ -1,3 +1,9 @@ ##### create translation templates ############## tde_l10n_create_template( "kooka" ) + +tde_l10n_create_template( + CATALOG "desktop_files/kooka.desktop/" + SOURCES kooka.desktop + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/kooka/CMakeLists.txt b/kooka/CMakeLists.txt index 24e3e091..e2fdcb00 100644 --- a/kooka/CMakeLists.txt +++ b/kooka/CMakeLists.txt @@ -28,7 +28,7 @@ link_directories( ##### other data ################################ -install( FILES kooka.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +tde_create_translated_desktop( kooka.desktop ) install( FILES kookarc DESTINATION ${CONFIG_INSTALL_DIR} ) install( FILES kookaui.rc DESTINATION ${DATA_INSTALL_DIR}/kooka ) diff --git a/kooka/README b/kooka/README index 8ae6fa54..1f5d6d10 100644 --- a/kooka/README +++ b/kooka/README @@ -55,7 +55,7 @@ support all, even not very common options, some scanners offer. Lets see what is necessary and makes sense for the purpose of Kooka. * Kooka does not yet have a strategy for very large images :(. It uses -the Qt QImage/QPixmap as is. On some displays, that causes problems. +the Qt TQImage/QPixmap as is. On some displays, that causes problems. * Automatic document feeder (ADF) support is not yet working correctly. diff --git a/kooka/dwmenuaction.cpp b/kooka/dwmenuaction.cpp index c8e75c00..4527e247 100644 --- a/kooka/dwmenuaction.cpp +++ b/kooka/dwmenuaction.cpp @@ -36,9 +36,9 @@ dwMenuAction::dwMenuAction( const TQString& text, const TDEShortcut& cut, KDockMainWindow *mw, const char* name ) :TDEToggleAction(text,cut,parent,name),m_dw(dw),m_mw(mw) { - connect(this,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotToggled(bool))); - connect(m_dw->dockManager(),TQT_SIGNAL(change()),this,TQT_SLOT(anDWChanged())); - connect(m_dw,TQT_SIGNAL(destroyed()),this,TQT_SLOT(slotWidgetDestroyed())); + connect(this,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotToggled(bool))); + connect(m_dw->dockManager(),TQ_SIGNAL(change()),this,TQ_SLOT(anDWChanged())); + connect(m_dw,TQ_SIGNAL(destroyed()),this,TQ_SLOT(slotWidgetDestroyed())); setChecked(m_dw->mayBeHide()); } diff --git a/kooka/dwmenuaction.h b/kooka/dwmenuaction.h index 130933a4..d8bedbb6 100644 --- a/kooka/dwmenuaction.h +++ b/kooka/dwmenuaction.h @@ -42,7 +42,7 @@ */ class dwMenuAction:public TDEToggleAction { - Q_OBJECT + TQ_OBJECT public: dwMenuAction( const TQString& text, diff --git a/kooka/imageselectline.cpp b/kooka/imageselectline.cpp index 4b83c5bc..61cefeb0 100644 --- a/kooka/imageselectline.cpp +++ b/kooka/imageselectline.cpp @@ -58,11 +58,11 @@ ImageSelectLine::ImageSelectLine( TQWidget *parent, const TQString& text ) m_urlCombo->setMaxItems(5); - connect( m_urlCombo, TQT_SIGNAL( urlActivated( const KURL& )), - this, TQT_SLOT( slUrlActivated( const KURL& ))); + connect( m_urlCombo, TQ_SIGNAL( urlActivated( const KURL& )), + this, TQ_SLOT( slUrlActivated( const KURL& ))); - connect( m_buttFileSelect, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slSelectFile())); + connect( m_buttFileSelect, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slSelectFile())); } void ImageSelectLine::slSelectFile() diff --git a/kooka/imageselectline.h b/kooka/imageselectline.h index d385965c..9fd8b9f9 100644 --- a/kooka/imageselectline.h +++ b/kooka/imageselectline.h @@ -42,7 +42,7 @@ class TQStringList; class ImageSelectLine:public TQHBox { - Q_OBJECT + TQ_OBJECT public: ImageSelectLine( TQWidget *parent, const TQString& text ); diff --git a/kooka/img_saver.cpp b/kooka/img_saver.cpp index 8eb12701..2b6f6037 100644 --- a/kooka/img_saver.cpp +++ b/kooka/img_saver.cpp @@ -108,8 +108,8 @@ FormatDialog::FormatDialog( TQWidget *parent, const TQString&, const char *name #endif kdDebug(28000) << "#### have " << fo.count() << " image types" << endl; lb_format->insertStringList( fo ); - connect( lb_format, TQT_SIGNAL( highlighted(const TQString&)), - TQT_SLOT( showHelp(const TQString&))); + connect( lb_format, TQ_SIGNAL( highlighted(const TQString&)), + TQ_SLOT( showHelp(const TQString&))); // Insert label for helptext l_help = new TQLabel( page ); diff --git a/kooka/img_saver.h b/kooka/img_saver.h index 47596472..79f47765 100644 --- a/kooka/img_saver.h +++ b/kooka/img_saver.h @@ -100,7 +100,7 @@ class KookaImage; class FormatDialog:public KDialogBase { - Q_OBJECT + TQ_OBJECT public: FormatDialog( TQWidget *parent, const TQString&, const char * ); @@ -144,7 +144,7 @@ private: **/ class ImgSaver:public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kooka/imgnamecombo.h b/kooka/imgnamecombo.h index 55d9d393..6d9b0b94 100644 --- a/kooka/imgnamecombo.h +++ b/kooka/imgnamecombo.h @@ -40,7 +40,7 @@ class KFileBranch; class ImageNameCombo: public KComboBox { - Q_OBJECT + TQ_OBJECT public: ImageNameCombo( TQWidget* ); diff --git a/kooka/imgprintdialog.cpp b/kooka/imgprintdialog.cpp index a0182457..1c25cc15 100644 --- a/kooka/imgprintdialog.cpp +++ b/kooka/imgprintdialog.cpp @@ -57,9 +57,9 @@ ImgPrintDialog::ImgPrintDialog( KookaImage *img, TQWidget *parent, const char* n // layout->setMargin( KDialog::marginHint() ); // layout->setSpacing( KDialog::spacingHint() ); - m_scaleRadios = new TQButtonGroup( 2, Qt::Vertical, i18n("Image Print Size"), this ); + m_scaleRadios = new TQButtonGroup( 2, TQt::Vertical, i18n("Image Print Size"), this ); m_scaleRadios->setRadioButtonExclusive(true); - connect( m_scaleRadios, TQT_SIGNAL(clicked(int)), TQT_SLOT(slScaleChanged(int))); + connect( m_scaleRadios, TQ_SIGNAL(clicked(int)), TQ_SLOT(slScaleChanged(int))); m_rbScreen = new TQRadioButton( i18n("Scale to same size as on screen"), m_scaleRadios ); @@ -116,11 +116,11 @@ ImgPrintDialog::ImgPrintDialog( KookaImage *img, TQWidget *parent, const char* n m_sizeW = new KIntNumInput( group ); m_sizeW->setLabel( i18n("Image width:"), AlignVCenter ); m_sizeW->setSuffix( i18n(" mm")); - connect( m_sizeW, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slCustomWidthChanged(int))); + connect( m_sizeW, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slCustomWidthChanged(int))); m_sizeH = new KIntNumInput( m_sizeW, AlignVCenter, group ); m_sizeH->setLabel( i18n("Image height:"), AlignVCenter); m_sizeH->setSuffix( i18n(" mm")); - connect( m_sizeH, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slCustomHeightChanged(int))); + connect( m_sizeH, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slCustomHeightChanged(int))); m_ratio = new TQCheckBox( i18n("Maintain aspect ratio"), group, "cbAspectRatio" ); m_ratio->setChecked(true); diff --git a/kooka/imgprintdialog.h b/kooka/imgprintdialog.h index d3d40ae2..7f39dd43 100644 --- a/kooka/imgprintdialog.h +++ b/kooka/imgprintdialog.h @@ -52,7 +52,7 @@ class TQCheckBox; class ImgPrintDialog: public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: ImgPrintDialog( KookaImage *img, TQWidget *parent=0L, const char* name=0L ); diff --git a/kooka/kadmosocr.h b/kooka/kadmosocr.h index 33656fd3..be525728 100644 --- a/kooka/kadmosocr.h +++ b/kooka/kadmosocr.h @@ -68,7 +68,7 @@ namespace Kadmos { /* ==== CRep ========================================= */ class CRep : public TQObject { - Q_OBJECT + TQ_OBJECT public: CRep(); diff --git a/kooka/kocrbase.cpp b/kooka/kocrbase.cpp index dc13655f..a6d5cebd 100644 --- a/kooka/kocrbase.cpp +++ b/kooka/kocrbase.cpp @@ -86,9 +86,9 @@ KOCRBase::KOCRBase( TQWidget *parent, KSpellConfig *spellConfig, m_userWantsSpellCheck = konf->readBoolEntry(CFG_WANT_TDESPELL, true); /* Connect signals which disable the fields and store the configuration */ - connect( this, TQT_SIGNAL( user1Clicked()), this, TQT_SLOT( writeConfig())); - connect( this, TQT_SIGNAL( user1Clicked()), this, TQT_SLOT( startOCR() )); - connect( this, TQT_SIGNAL( user2Clicked()), this, TQT_SLOT( stopOCR() )); + connect( this, TQ_SIGNAL( user1Clicked()), this, TQ_SLOT( writeConfig())); + connect( this, TQ_SIGNAL( user1Clicked()), this, TQ_SLOT( startOCR() )); + connect( this, TQ_SIGNAL( user2Clicked()), this, TQ_SLOT( stopOCR() )); m_previewSize.setWidth(200); m_previewSize.setHeight(300); @@ -178,11 +178,11 @@ void KOCRBase::spellCheckIntro() m_spellchkPage = addVBoxPage( i18n("Spell-checking") ); /* Want the spell checking at all? Checkbox here */ - TQGroupBox *gb1 = new TQGroupBox( 1, Qt::Horizontal, i18n("OCR Post Processing"), m_spellchkPage ); + TQGroupBox *gb1 = new TQGroupBox( 1, TQt::Horizontal, i18n("OCR Post Processing"), m_spellchkPage ); m_cbWantCheck = new TQCheckBox( i18n("Enable spell-checking for validation of the OCR result"), gb1 ); /* Spellcheck options */ - m_gbSpellOpts = new TQGroupBox( 1, Qt::Horizontal, i18n("Spell-Check Options"), + m_gbSpellOpts = new TQGroupBox( 1, TQt::Horizontal, i18n("Spell-Check Options"), m_spellchkPage ); KSpellConfig *sCfg = new KSpellConfig( m_gbSpellOpts, "SPELLCHK", m_spellConfig, false ); @@ -191,13 +191,13 @@ void KOCRBase::spellCheckIntro() spaceEater->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored )); /* connect toggle button */ - connect( m_cbWantCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slWantSpellcheck(bool))); + connect( m_cbWantCheck, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slWantSpellcheck(bool))); m_cbWantCheck->setChecked( m_userWantsSpellCheck ); m_gbSpellOpts->setEnabled( m_userWantsSpellCheck ); m_spellConfig = sCfg; - connect( sCfg, TQT_SIGNAL(configChanged()), - this, TQT_SLOT(slSpellConfigChanged())); + connect( sCfg, TQ_SIGNAL(configChanged()), + this, TQ_SLOT(slSpellConfigChanged())); } void KOCRBase::slSpellConfigChanged() @@ -242,10 +242,10 @@ void KOCRBase::introduceImage( KookaImage* img) if( m_job ) { - connect( m_job, TQT_SIGNAL( result( TDEIO::Job * )), - this, TQT_SLOT( slPreviewResult( TDEIO::Job * ))); - connect( m_job, TQT_SIGNAL( gotPreview( const KFileItem*, const TQPixmap& )), - TQT_SLOT( slGotPreview( const KFileItem*, const TQPixmap& ) )); + connect( m_job, TQ_SIGNAL( result( TDEIO::Job * )), + this, TQ_SLOT( slPreviewResult( TDEIO::Job * ))); + connect( m_job, TQ_SIGNAL( gotPreview( const KFileItem*, const TQPixmap& )), + TQ_SLOT( slGotPreview( const KFileItem*, const TQPixmap& ) )); /* TDEIO::Jo result is called in any way: Success, Failed, Error, * thus connecting the failed is not really necessary. */ diff --git a/kooka/kocrbase.h b/kooka/kocrbase.h index 615ef05f..d1c35ebc 100644 --- a/kooka/kocrbase.h +++ b/kooka/kocrbase.h @@ -53,7 +53,7 @@ class TQGroupBox; class KOCRBase: public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KOCRBase( TQWidget *, KSpellConfig *spellConfig, diff --git a/kooka/kocrgocr.h b/kooka/kocrgocr.h index cfc5663d..06ee0380 100644 --- a/kooka/kocrgocr.h +++ b/kooka/kocrgocr.h @@ -44,7 +44,7 @@ class KSpellConfig; class KGOCRDialog: public KOCRBase { - Q_OBJECT + TQ_OBJECT public: KGOCRDialog( TQWidget*, KSpellConfig* ); diff --git a/kooka/kocrkadmos.cpp b/kooka/kocrkadmos.cpp index 17ef016f..b5ef9da4 100644 --- a/kooka/kocrkadmos.cpp +++ b/kooka/kocrkadmos.cpp @@ -279,26 +279,26 @@ EngineError KadmosDialog::setupGui() (void) new TQLabel( i18n("Please classify the font type and language of the text on the image:"), page ); TQHBox *locBox = new TQHBox( page ); - m_bbFont = new TQButtonGroup(1, Qt::Horizontal, i18n("Font Type Selection"), locBox); + m_bbFont = new TQButtonGroup(1, TQt::Horizontal, i18n("Font Type Selection"), locBox); m_rbMachine = new TQRadioButton( i18n("Machine print"), m_bbFont ); m_rbHand = new TQRadioButton( i18n("Hand writing"), m_bbFont ); m_rbNorm = new TQRadioButton( i18n("Norm font"), m_bbFont ); - m_gbLang = new TQGroupBox(1, Qt::Horizontal, i18n("Country"), locBox); + m_gbLang = new TQGroupBox(1, TQt::Horizontal, i18n("Country"), locBox); m_cbLang = new TQComboBox( m_gbLang ); m_cbLang->setCurrentText( TDELocale::defaultCountry() ); - connect( m_bbFont, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slFontChanged(int) )); + connect( m_bbFont, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slFontChanged(int) )); m_rbMachine->setChecked(true); /* --- */ TQHBox *innerBox = new TQHBox( page ); innerBox->setSpacing( KDialog::spacingHint()); - TQButtonGroup *cbGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n("OCR Modifier"), innerBox ); + TQButtonGroup *cbGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("OCR Modifier"), innerBox ); TQ_CHECK_PTR(cbGroup); m_cbNoise = new TQCheckBox( i18n( "Enable automatic noise reduction" ), cbGroup ); diff --git a/kooka/kocrkadmos.h b/kooka/kocrkadmos.h index 4d6d5ce9..95b2c6f5 100644 --- a/kooka/kocrkadmos.h +++ b/kooka/kocrkadmos.h @@ -65,7 +65,7 @@ private: class KadmosDialog: public KOCRBase { - Q_OBJECT + TQ_OBJECT public: KadmosDialog( TQWidget *, KSpellConfig *spellConfig ); diff --git a/kooka/kocrocrad.cpp b/kooka/kocrocrad.cpp index 04440b2c..2627311b 100644 --- a/kooka/kocrocrad.cpp +++ b/kooka/kocrocrad.cpp @@ -213,8 +213,8 @@ void ocradDialog::version( const TQString& exe ) *m_proc << exe; *m_proc << TQString("-V"); - connect( m_proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )), - this, TQT_SLOT(slReceiveStdIn(TDEProcess *, char *, int ))); + connect( m_proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int )), + this, TQ_SLOT(slReceiveStdIn(TDEProcess *, char *, int ))); if( ! m_proc->start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ) ) { diff --git a/kooka/kocrocrad.h b/kooka/kocrocrad.h index 22b4fa1f..eeda40dc 100644 --- a/kooka/kocrocrad.h +++ b/kooka/kocrocrad.h @@ -54,7 +54,7 @@ class TQComboBox; class ocradDialog: public KOCRBase { - Q_OBJECT + TQ_OBJECT public: ocradDialog( TQWidget*, KSpellConfig* ); diff --git a/kooka/kooka.cpp b/kooka/kooka.cpp index 845df5fc..af8f5dd6 100644 --- a/kooka/kooka.cpp +++ b/kooka/kooka.cpp @@ -87,12 +87,12 @@ Kooka::Kooka( const TQCString& deviceToUse) statusBar()->show(); // allow the view to change the statusbar and caption - connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), - this, TQT_SLOT(changeStatusbar(const TQString&))); - connect(m_view, TQT_SIGNAL(signalCleanStatusbar(void)), - this, TQT_SLOT(cleanStatusbar())); - connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), - this, TQT_SLOT(changeCaption(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQ_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQ_SIGNAL(signalCleanStatusbar(void)), + this, TQ_SLOT(cleanStatusbar())); + connect(m_view, TQ_SIGNAL(signalChangeCaption(const TQString&)), + this, TQ_SLOT(changeCaption(const TQString&))); changeCaption( i18n( "TDE Scanning" )); @@ -125,39 +125,39 @@ void Kooka::startup( void ) void Kooka::setupActions() { - KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(filePrint()), actionCollection()); - KStdAction::quit(TQT_TQOBJECT(this) , TQT_SLOT(close()), actionCollection()); + KStdAction::print(this, TQ_SLOT(filePrint()), actionCollection()); + KStdAction::quit(this , TQ_SLOT(close()), actionCollection()); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); m_view->createDockMenu(actionCollection(), this, "settings_show_docks" ); /* Image Viewer action Toolbar - OCR, Scaling etc. */ (void) new TDEAction(i18n("&OCR Image..."), "ocr", CTRL+Key_O, - m_view, TQT_SLOT(doOCR()), + m_view, TQ_SLOT(doOCR()), actionCollection(), "ocrImage" ); (void) new TDEAction(i18n("O&CR on Selection..."), "ocr-select", CTRL+Key_C, - m_view, TQT_SLOT(doOCRonSelection()), + m_view, TQ_SLOT(doOCRonSelection()), actionCollection(), "ocrImageSelect" ); TDEAction *act; act = new TDEAction(i18n("Scale to W&idth"), "scaletowidth", CTRL+Key_I, - m_view, TQT_SLOT( slIVScaleToWidth()), + m_view, TQ_SLOT( slIVScaleToWidth()), actionCollection(), "scaleToWidth" ); m_view->connectViewerAction( act ); act = new TDEAction(i18n("Scale to &Height"), "scaletoheight", CTRL+Key_H, - m_view, TQT_SLOT( slIVScaleToHeight()), + m_view, TQ_SLOT( slIVScaleToHeight()), actionCollection(), "scaleToHeight" ); m_view->connectViewerAction( act ); act = new TDEAction(i18n("Original &Size"), "scaleorig", CTRL+Key_S, - m_view, TQT_SLOT( slIVScaleOriginal()), + m_view, TQ_SLOT( slIVScaleOriginal()), actionCollection(), "scaleOriginal" ); m_view->connectViewerAction( act ); @@ -173,100 +173,100 @@ actionCollection()); actionCollection(), "keepZoom" ); #endif - connect( act, TQT_SIGNAL( toggled( bool ) ), m_view->getImageViewer(), - TQT_SLOT(setKeepZoom(bool))); + connect( act, TQ_SIGNAL( toggled( bool ) ), m_view->getImageViewer(), + TQ_SLOT(setKeepZoom(bool))); m_view->connectViewerAction( act ); /* thumbview and gallery actions */ act = new TDEAction(i18n("Set Zoom..."), "viewmag", 0, - TQT_TQOBJECT(m_view), TQT_SLOT( slIVShowZoomDialog()), + m_view, TQ_SLOT( slIVShowZoomDialog()), actionCollection(), "showZoomDialog" ); m_view->connectViewerAction( act ); (void) new TDEAction(i18n("Create From Selectio&n"), "crop", CTRL+Key_N, - TQT_TQOBJECT(m_view), TQT_SLOT( slCreateNewImgFromSelection() ), + m_view, TQ_SLOT( slCreateNewImgFromSelection() ), actionCollection(), "createFromSelection" ); (void) new TDEAction(i18n("Mirror Image &Vertically"), "mirror-vert", CTRL+Key_V, - TQT_TQOBJECT(this), TQT_SLOT( slMirrorVertical() ), + this, TQ_SLOT( slMirrorVertical() ), actionCollection(), "mirrorVertical" ); (void) new TDEAction(i18n("&Mirror Image Horizontally"), "mirror-horiz", CTRL+Key_M, - TQT_TQOBJECT(this), TQT_SLOT( slMirrorHorizontal() ), + this, TQ_SLOT( slMirrorHorizontal() ), actionCollection(), "mirrorHorizontal" ); (void) new TDEAction(i18n("Mirror Image &Both Directions"), "mirror-both", CTRL+Key_B, - TQT_TQOBJECT(this), TQT_SLOT( slMirrorBoth() ), + this, TQ_SLOT( slMirrorBoth() ), actionCollection(), "mirrorBoth" ); (void) new TDEAction(i18n("Open Image in &Graphic Application..."), "document-open", CTRL+Key_G, - TQT_TQOBJECT(m_view), TQT_SLOT( slOpenCurrInGraphApp() ), + m_view, TQ_SLOT( slOpenCurrInGraphApp() ), actionCollection(), "openInGraphApp" ); act = new TDEAction(i18n("&Rotate Image Clockwise"), "object-rotate-right", CTRL+Key_R, - TQT_TQOBJECT(this), TQT_SLOT( slRotateClockWise() ), + this, TQ_SLOT( slRotateClockWise() ), actionCollection(), "rotateClockwise" ); m_view->connectViewerAction( act ); act = new TDEAction(i18n("Rotate Image Counter-Clock&wise"), "object-rotate-left", CTRL+Key_W, - TQT_TQOBJECT(this), TQT_SLOT( slRotateCounterClockWise() ), + this, TQ_SLOT( slRotateCounterClockWise() ), actionCollection(), "rotateCounterClockwise" ); m_view->connectViewerAction( act ); act = new TDEAction(i18n("Rotate Image 180 &Degrees"), "rotate", CTRL+Key_D, - TQT_TQOBJECT(this), TQT_SLOT( slRotate180() ), + this, TQ_SLOT( slRotate180() ), actionCollection(), "upsitedown" ); m_view->connectViewerAction( act ); /* Gallery actions */ act = new TDEAction(i18n("&Create Folder..."), "folder-new", 0, - TQT_TQOBJECT(m_view->gallery()),TQT_SLOT( slotCreateFolder() ), + m_view->gallery(),TQ_SLOT( slotCreateFolder() ), actionCollection(), "foldernew" ); m_view->connectGalleryAction( act ); act = new TDEAction(i18n("&Save Image..."), "document-save", 0, - TQT_TQOBJECT(m_view->gallery()),TQT_SLOT( slotExportFile() ), + m_view->gallery(),TQ_SLOT( slotExportFile() ), actionCollection(), "saveImage" ); m_view->connectGalleryAction( act ); act = new TDEAction(i18n("&Import Image..."), "inline_image", 0, - TQT_TQOBJECT(m_view->gallery()),TQT_SLOT( slotImportFile() ), + m_view->gallery(),TQ_SLOT( slotImportFile() ), actionCollection(), "importImage" ); m_view->connectGalleryAction( act ); act = new TDEAction(i18n("&Delete Image"), "edittrash", 0, - TQT_TQOBJECT(m_view->gallery()),TQT_SLOT( slotDeleteItems() ), + m_view->gallery(),TQ_SLOT( slotDeleteItems() ), actionCollection(), "deleteImage" ); m_view->connectGalleryAction( act ); act = new TDEAction(i18n("&Unload Image"), "window-close", 0, - TQT_TQOBJECT(m_view->gallery()),TQT_SLOT( slotUnloadItems() ), + m_view->gallery(),TQ_SLOT( slotUnloadItems() ), actionCollection(), "unloadImage" ); m_view->connectGalleryAction( act ); #if 0 /* not yet supported actions - coming post 3.1 */ (void) new TDEAction(i18n("&Load Scan Parameters"), "bookmark_add", CTRL+Key_L, - m_view, TQT_SLOT(slLoadScanParams()), + m_view, TQ_SLOT(slLoadScanParams()), actionCollection(), "loadscanparam" ); (void) new TDEAction(i18n("Save &Scan Parameters"), "bookmark_add", CTRL+Key_S, - m_view, TQT_SLOT(slSaveScanParams()), + m_view, TQ_SLOT(slSaveScanParams()), actionCollection(), "savescanparam" ); #endif (void) new TDEAction(i18n("Select Scan Device"), "scanner", 0, - TQT_TQOBJECT(m_view), TQT_SLOT( slSelectDevice()), + m_view, TQ_SLOT( slSelectDevice()), actionCollection(), "selectsource" ); (void) new TDEAction( i18n("Enable All Warnings && Messages"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slEnableWarnings()), + this, TQ_SLOT(slEnableWarnings()), actionCollection(), "enable_msgs"); m_saveOCRTextAction = new TDEAction( i18n("Save OCR Res&ult Text"), "document-save-as", CTRL+Key_U, - m_view, TQT_SLOT(slSaveOCRResult()), + m_view, TQ_SLOT(slSaveOCRResult()), actionCollection(), "saveOCRResult"); } @@ -387,7 +387,7 @@ void Kooka::optionsConfigureToolbars() // use the standard toolbar editor saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(newToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), TQ_SLOT(newToolbarConfig())); dlg.exec(); } @@ -402,7 +402,7 @@ void Kooka::optionsPreferences() // popup some sort of preference dialog, here KookaPreferences dlg; dlg.showPage( m_prefDialogIndex ); - connect( &dlg, TQT_SIGNAL( dataSaved() ), m_view, TQT_SLOT(slFreshUpThumbView())); + connect( &dlg, TQ_SIGNAL( dataSaved() ), m_view, TQ_SLOT(slFreshUpThumbView())); if (dlg.exec()) { diff --git a/kooka/kooka.desktop b/kooka/kooka.desktop index 24552df2..dcb82d0a 100644 --- a/kooka/kooka.desktop +++ b/kooka/kooka.desktop @@ -6,73 +6,7 @@ Path= Terminal=false X-DocPath=kooka/index.html GenericName=Scan & OCR Program -GenericName[af]=Skandeer & Optiese karakter herkenning Program -GenericName[ar]=برنامج للمسح الضوئي -GenericName[bg]=Сканиране -GenericName[bs]=Program za skeniranje i OCR -GenericName[ca]=Programa d'escaneig i OCR -GenericName[cs]=Program pro skenování a OCR -GenericName[cy]=Rhaglen Sganio ac OCR -GenericName[da]=Skanne- & OCR-program -GenericName[de]=Scan- und OCR-Programm -GenericName[el]=Πρόγραμμα Σάρωσης & OCR -GenericName[eo]=Bildbitiga programo kaj tekstrekono -GenericName[es]=OCR y explorador con un escáner -GenericName[et]=Skaneerimise ja OMT rakendus -GenericName[eu]=Eskaneatzeko eta OCR programa -GenericName[fa]=پویش و برنامۀ OCR -GenericName[fi]=Skannaus- ja tekstintunnistusohjelma -GenericName[fr]=Numérisation et reconnaissance de caractères -GenericName[gl]=Programa para escanear e facer OCR -GenericName[he]=תוכנית סריקה וזיהוי תווים אופטי -GenericName[hi]=स्कैन व ऑप्टिकल कैरेक्टर रिकॉग्नीशन प्रोग्राम (OCR) -GenericName[hr]=Program za skaniranje i OCR -GenericName[hu]=Lapolvasó -GenericName[is]=Forrit til að skanna inn myndir -GenericName[it]=Programma di scansione e OCR -GenericName[ja]=スキャン & OCR プログラム -GenericName[kk]=Сканерге түсіру және танып-талдау -GenericName[km]=កម្មវិធីស្កេន & OCR -GenericName[lt]=Skanavimo ir teksto atpažinimo programa -GenericName[lv]=Skanēšanas un OCR Programma -GenericName[ms]=Program Imbas & OCR -GenericName[nb]=Et skanne-og OCR-program -GenericName[nds]=Inlees- un OTR-Programm -GenericName[ne]=स्क्यान र OCR कार्यक्रम -GenericName[nl]=Scan- en OCR-programma -GenericName[nn]=Skanne- og tekstattkjenningsprogram -GenericName[pl]=Program do skanowania i rozpoznawania pisma -GenericName[pt]=Programa de Digitalização e OCR -GenericName[pt_BR]=Um programa de Digitalização & OCR -GenericName[ro]=Scanare imagini şi OCR -GenericName[ru]=Сканирование и распознавание текста -GenericName[sk]=Skenovací program s OCR -GenericName[sl]=Program za skeniranje in prepoznavanje znakov -GenericName[sr]=Програм за скенирање и препознавање текста -GenericName[sr@Latn]=Program za skeniranje i prepoznavanje teksta -GenericName[sv]=Bildläsar- och OCR-program -GenericName[ta]=வருடு & OCR நிரலி -GenericName[tg]=Барномаи сканеронӣ ва шиносоии матн -GenericName[th]=โปรแกรมสแกนภาพและ OCR -GenericName[tr]=Tarayıcı ve karakter tanıma programı -GenericName[uk]=Програма сканування та розпізнавання символів -GenericName[ven]=U nanga & Mbekanyamushumo ya OCR -GenericName[wa]=Programe di scanaedje eyet di ricnoxhance di tecse -GenericName[xh]=Udweliso Lwenkqubo Yemita Yovavanyo -GenericName[zh_CN]=扫描和文字识别程序 -GenericName[zh_HK]=掃描和文字辦識程式 -GenericName[zh_TW]=掃描和文字辦識程式 -GenericName[zu]=Scan & OCR Iprogremu Name=Kooka -Name[ar]=برنامج Kooka -Name[eo]=Kokao -Name[hi]=कूका -Name[is]=Skanni -Name[ko]=쿠카 -Name[ne]=कोओका -Name[pa]=ਕੋਕਾ -Name[ta]=கூக்கா -Name[zh_TW]=Kooka 掃描器 X-DCOP-ServiceType=Multi Categories=Qt;TDE;Graphics; diff --git a/kooka/kooka.h b/kooka/kooka.h index 7c44f748..780e360c 100644 --- a/kooka/kooka.h +++ b/kooka/kooka.h @@ -54,7 +54,7 @@ class KookaView; */ class Kooka : public KParts::DockMainWindow { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kooka/kookaimage.cpp b/kooka/kookaimage.cpp index 14e6ef83..b12adcf4 100644 --- a/kooka/kookaimage.cpp +++ b/kooka/kookaimage.cpp @@ -300,7 +300,7 @@ bool KookaImage::loadTiffDir( const TQString& filename, int no ) float yScalefactor = xReso / yReso; kdDebug(28000) << "Different resolution x/y, rescaling with factor " << yScalefactor << endl; /* rescale the image */ - *this = smoothScale( imgWidth, int(imgHeight*yScalefactor), TQ_ScaleFree ); + *this = smoothScale( imgWidth, int(imgHeight*yScalefactor), TQImage::ScaleFree ); } else { @@ -308,7 +308,7 @@ bool KookaImage::loadTiffDir( const TQString& filename, int no ) float scalefactor = yReso / xReso; kdDebug(28000) << "Different resolution x/y, rescaling x with factor " << scalefactor << endl; /* rescale the image */ - *this = smoothScale( int(imgWidth*scalefactor), imgHeight, TQ_ScaleFree ); + *this = smoothScale( int(imgWidth*scalefactor), imgHeight, TQImage::ScaleFree ); } } diff --git a/kooka/kookapref.cpp b/kooka/kookapref.cpp index 1cb421a9..e8900668 100644 --- a/kooka/kookapref.cpp +++ b/kooka/kookapref.cpp @@ -86,7 +86,7 @@ void KookaPreferences::setupOCRPage() /* * Switch ocr engines */ - TQButtonGroup *engGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n("OCR Engine to Use"), page ); + TQButtonGroup *engGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("OCR Engine to Use"), page ); m_gocrBut = new TQRadioButton( i18n("GOCR engine") , engGroup ); m_kadmosBut = new TQRadioButton( i18n("KADMOS engine"), engGroup ); m_ocradBut = new TQRadioButton( i18n("OCRAD engine"), engGroup ); @@ -100,8 +100,8 @@ void KookaPreferences::setupOCRPage() */ TQVGroupBox *gp = new TQVGroupBox( i18n("GOCR OCR"), page ); m_urlReqGocr = binaryCheckBox( gp, "gocr" ); - connect( m_urlReqGocr, TQT_SIGNAL( textChanged( const TQString& )), - this, TQT_SLOT( slCheckOnGOCR( const TQString& ))); + connect( m_urlReqGocr, TQ_SIGNAL( textChanged( const TQString& )), + this, TQ_SLOT( slCheckOnGOCR( const TQString& ))); TQString cmdGocr = tryFindBinary( "gocr", CFG_GOCR_BINARY ); kdDebug(28000) << "Found gocr command: " << cmdGocr << endl; m_gocrBut->setEnabled(false); @@ -119,8 +119,8 @@ void KookaPreferences::setupOCRPage() */ gp = new TQVGroupBox( i18n("OCRAD OCR"), page ); m_urlReqOcrad = binaryCheckBox( gp, "ocrad" ); - connect( m_urlReqOcrad, TQT_SIGNAL( textChanged( const TQString& )), - this, TQT_SLOT( slCheckOnOCRAD( const TQString& ))); + connect( m_urlReqOcrad, TQ_SIGNAL( textChanged( const TQString& )), + this, TQ_SLOT( slCheckOnOCRAD( const TQString& ))); TQString cmdOcrad = tryFindBinary( "ocrad", CFG_OCRAD_BINARY ); kdDebug(28000) << "Found ocrad command: " << cmdOcrad << endl; m_ocradBut->setEnabled(false); diff --git a/kooka/kookapref.h b/kooka/kookapref.h index be7954c1..35f59acd 100644 --- a/kooka/kookapref.h +++ b/kooka/kookapref.h @@ -46,7 +46,7 @@ class TQCheckBox; class KookaPreferences : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KookaPreferences(); diff --git a/kooka/kookaprint.cpp b/kooka/kookaprint.cpp index 2a8cdfba..84f7faed 100644 --- a/kooka/kookaprint.cpp +++ b/kooka/kookaprint.cpp @@ -112,7 +112,7 @@ bool KookaPrint::printImage( KookaImage *img ) kdDebug(28000) << "Scaling to printer size " << newWidth << " x " << newHeight << endl; - tmpImg = img->smoothScale(newWidth, newHeight, TQ_ScaleFree); + tmpImg = img->smoothScale(newWidth, newHeight, TQImage::ScaleFree); TQSize sz = tmpImg.size(); // the current image size TQSize maxOnPage = maxPageSize(); // the maximum space on one side @@ -177,7 +177,7 @@ void KookaPrint::printFittingToPage(KookaImage *img) newHeight = int( double( img->height() ) * hAspect ); } - tmpImg = img->smoothScale(newWidth, newHeight, TQ_ScaleFree); + tmpImg = img->smoothScale(newWidth, newHeight, TQImage::ScaleFree); m_painter->drawImage( 0,0, tmpImg ); diff --git a/kooka/kookaprint.h b/kooka/kookaprint.h index 9336a3d0..85f35078 100644 --- a/kooka/kookaprint.h +++ b/kooka/kookaprint.h @@ -54,7 +54,7 @@ private: class KookaPrint:public TQObject { - Q_OBJECT + TQ_OBJECT public: KookaPrint(KPrinter*); diff --git a/kooka/kookaview.cpp b/kooka/kookaview.cpp index 8cca60ad..108b887f 100644 --- a/kooka/kookaview.cpp +++ b/kooka/kookaview.cpp @@ -112,8 +112,8 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU img_canvas = new ImageCanvas( m_mainDock ); img_canvas->setMinimumSize(100,200); img_canvas->enableContextMenu(true); - connect( img_canvas, TQT_SIGNAL( imageReadOnly(bool)), - this, TQT_SLOT(slViewerReadOnly(bool))); + connect( img_canvas, TQ_SIGNAL( imageReadOnly(bool)), + this, TQ_SLOT(slViewerReadOnly(bool))); TDEPopupMenu *ctxtmenu = static_cast<TDEPopupMenu*>(img_canvas->contextMenu()); if( ctxtmenu ) @@ -147,10 +147,10 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU 30 ); // relation target/this (in percent) - connect( packager, TQT_SIGNAL(showThumbnails( KFileTreeViewItem* )), - this, TQT_SLOT( slShowThumbnails( KFileTreeViewItem* ))); - connect( m_thumbview, TQT_SIGNAL( selectFromThumbnail( const KURL& )), - packager, TQT_SLOT( slSelectImage(const KURL&))); + connect( packager, TQ_SIGNAL(showThumbnails( KFileTreeViewItem* )), + this, TQ_SLOT( slShowThumbnails( KFileTreeViewItem* ))); + connect( m_thumbview, TQ_SIGNAL( selectFromThumbnail( const KURL& )), + packager, TQ_SLOT( slSelectImage(const KURL&))); /* * Create a Kombobox that holds the last folders visible even on the preview page @@ -174,14 +174,14 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU - connect( packager, TQT_SIGNAL( galleryPathSelected( KFileTreeBranch*, const TQString&)), - recentFolder, TQT_SLOT( slotGalleryPathChanged( KFileTreeBranch*, const TQString& ))); + connect( packager, TQ_SIGNAL( galleryPathSelected( KFileTreeBranch*, const TQString&)), + recentFolder, TQ_SLOT( slotGalleryPathChanged( KFileTreeBranch*, const TQString& ))); - connect( packager, TQT_SIGNAL( directoryToRemove( KFileTreeBranch*, const TQString&)), - recentFolder, TQT_SLOT( slotPathRemove( KFileTreeBranch*, const TQString& ))); + connect( packager, TQ_SIGNAL( directoryToRemove( KFileTreeBranch*, const TQString&)), + recentFolder, TQ_SLOT( slotPathRemove( KFileTreeBranch*, const TQString& ))); - connect( recentFolder, TQT_SIGNAL(activated( const TQString& )), - packager, TQT_SLOT(slotSelectDirectory( const TQString& ))); + connect( recentFolder, TQ_SIGNAL(activated( const TQString& )), + packager, TQ_SLOT(slotSelectDirectory( const TQString& ))); /* the object from the kscan lib to handle low level scanning */ m_dockScanParam = parent->createDockWidget( "Scan Parameter", @@ -191,7 +191,7 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU m_dockScanParam->setDockSite(KDockWidget::DockFullSite); m_dockScanParam->setWidget( 0 ); // later - sane = new KScanDevice( TQT_TQOBJECT(m_dockScanParam) ); + sane = new KScanDevice( m_dockScanParam ); TQ_CHECK_PTR(sane); m_dockScanParam->manualDock( m_dockRecent, // dock target @@ -246,33 +246,33 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU } /* New image created after scanning */ - connect(sane, TQT_SIGNAL(sigNewImage(TQImage*,ImgScanInfo*)), this, TQT_SLOT(slNewImageScanned(TQImage*,ImgScanInfo*))); + connect(sane, TQ_SIGNAL(sigNewImage(TQImage*,ImgScanInfo*)), this, TQ_SLOT(slNewImageScanned(TQImage*,ImgScanInfo*))); /* New preview image */ - connect(sane, TQT_SIGNAL(sigNewPreview(TQImage*,ImgScanInfo *)), this, TQT_SLOT( slNewPreview(TQImage*,ImgScanInfo *))); + connect(sane, TQ_SIGNAL(sigNewPreview(TQImage*,ImgScanInfo *)), this, TQ_SLOT( slNewPreview(TQImage*,ImgScanInfo *))); - connect( sane, TQT_SIGNAL( sigScanStart() ), this, TQT_SLOT( slScanStart())); - connect( sane, TQT_SIGNAL( sigScanFinished(KScanStat)), this, TQT_SLOT(slScanFinished(KScanStat))); - connect( sane, TQT_SIGNAL( sigAcquireStart()), this, TQT_SLOT( slAcquireStart())); + connect( sane, TQ_SIGNAL( sigScanStart() ), this, TQ_SLOT( slScanStart())); + connect( sane, TQ_SIGNAL( sigScanFinished(KScanStat)), this, TQ_SLOT(slScanFinished(KScanStat))); + connect( sane, TQ_SIGNAL( sigAcquireStart()), this, TQ_SLOT( slAcquireStart())); /* Image canvas should show a new document */ - connect( packager, TQT_SIGNAL( showImage( KookaImage* )), - this, TQT_SLOT( slShowAImage( KookaImage*))); + connect( packager, TQ_SIGNAL( showImage( KookaImage* )), + this, TQ_SLOT( slShowAImage( KookaImage*))); - connect( packager, TQT_SIGNAL( aboutToShowImage(const KURL&)), - this, TQT_SLOT( slStartLoading( const KURL& ))); + connect( packager, TQ_SIGNAL( aboutToShowImage(const KURL&)), + this, TQ_SLOT( slStartLoading( const KURL& ))); /* Packager unloads the image */ - connect( packager, TQT_SIGNAL( unloadImage( KookaImage* )), - this, TQT_SLOT( slUnloadAImage( KookaImage*))); + connect( packager, TQ_SIGNAL( unloadImage( KookaImage* )), + this, TQ_SLOT( slUnloadAImage( KookaImage*))); /* a image changed mostly through a image manipulation method like rotate */ - connect( packager, TQT_SIGNAL( fileChanged( KFileItem* )), - m_thumbview, TQT_SLOT( slImageChanged( KFileItem* ))); + connect( packager, TQ_SIGNAL( fileChanged( KFileItem* )), + m_thumbview, TQ_SLOT( slImageChanged( KFileItem* ))); - connect( packager, TQT_SIGNAL( fileRenamed( KFileItem*, const KURL& )), - m_thumbview, TQT_SLOT( slImageRenamed( KFileItem*, const KURL& ))); + connect( packager, TQ_SIGNAL( fileRenamed( KFileItem*, const KURL& )), + m_thumbview, TQ_SLOT( slImageRenamed( KFileItem*, const KURL& ))); - connect( packager, TQT_SIGNAL( fileDeleted( KFileItem* )), - m_thumbview, TQT_SLOT( slImageDeleted( KFileItem* ))); + connect( packager, TQ_SIGNAL( fileDeleted( KFileItem* )), + m_thumbview, TQ_SLOT( slImageDeleted( KFileItem* ))); packager->openRoots(); @@ -346,8 +346,8 @@ bool KookaView::slSelectDevice( const TQCString& useDevice ) if( sane->openDevice( selDevice ) == KSCAN_OK ) { - connect( scan_params, TQT_SIGNAL( scanResolutionChanged( int, int )), - preview_canvas, TQT_SLOT( slNewScanResolutions( int, int ))); + connect( scan_params, TQ_SIGNAL( scanResolutionChanged( int, int )), + preview_canvas, TQ_SLOT( slNewScanResolutions( int, int ))); if( ! scan_params->connectDevice( sane ) ) { @@ -360,12 +360,12 @@ bool KookaView::slSelectDevice( const TQCString& useDevice ) /* New Rectangle selection in the preview, now scanimge exists */ ImageCanvas *previewCanvas = preview_canvas->getImageCanvas(); - connect( previewCanvas , TQT_SIGNAL( newRect(TQRect)), - scan_params, TQT_SLOT(slCustomScanSize(TQRect))); - connect( previewCanvas, TQT_SIGNAL( noRect()), - scan_params, TQT_SLOT(slMaximalScanSize())); - // connect( scan_params, TQT_SIGNAL( scanResolutionChanged( int, int )), - // preview_canvas, TQT_SLOT( slNewScanResolutions( int, int ))); + connect( previewCanvas , TQ_SIGNAL( newRect(TQRect)), + scan_params, TQ_SLOT(slCustomScanSize(TQRect))); + connect( previewCanvas, TQ_SIGNAL( noRect()), + scan_params, TQ_SLOT(slMaximalScanSize())); + // connect( scan_params, TQ_SIGNAL( scanResolutionChanged( int, int )), + // preview_canvas, TQ_SLOT( slNewScanResolutions( int, int ))); /* load the preview image */ if( preview_canvas ) { @@ -558,32 +558,32 @@ void KookaView::startOCR( KookaImage *img ) ocrFabric = new KSANEOCR( m_mainDock, TDEGlobal::config() ); ocrFabric->setImageCanvas( img_canvas ); - connect( ocrFabric, TQT_SIGNAL( newOCRResultText( const TQString& )), - m_ocrResEdit, TQT_SLOT(setText( const TQString& ))); + connect( ocrFabric, TQ_SIGNAL( newOCRResultText( const TQString& )), + m_ocrResEdit, TQ_SLOT(setText( const TQString& ))); - connect( ocrFabric, TQT_SIGNAL( newOCRResultText( const TQString& )), - m_dockOCRText, TQT_SLOT( show() )); + connect( ocrFabric, TQ_SIGNAL( newOCRResultText( const TQString& )), + m_dockOCRText, TQ_SLOT( show() )); - connect( ocrFabric, TQT_SIGNAL( repaintOCRResImage( )), - img_canvas, TQT_SLOT(repaint())); + connect( ocrFabric, TQ_SIGNAL( repaintOCRResImage( )), + img_canvas, TQ_SLOT(repaint())); - connect( ocrFabric, TQT_SIGNAL( clearOCRResultText()), - m_ocrResEdit, TQT_SLOT(clear())); + connect( ocrFabric, TQ_SIGNAL( clearOCRResultText()), + m_ocrResEdit, TQ_SLOT(clear())); - connect( ocrFabric, TQT_SIGNAL( updateWord(int, const TQString&, const TQString& )), - m_ocrResEdit, TQT_SLOT( slUpdateOCRResult( int, const TQString&, const TQString& ))); + connect( ocrFabric, TQ_SIGNAL( updateWord(int, const TQString&, const TQString& )), + m_ocrResEdit, TQ_SLOT( slUpdateOCRResult( int, const TQString&, const TQString& ))); - connect( ocrFabric, TQT_SIGNAL( ignoreWord(int, const ocrWord&)), - m_ocrResEdit, TQT_SLOT( slIgnoreWrongWord( int, const ocrWord& ))); + connect( ocrFabric, TQ_SIGNAL( ignoreWord(int, const ocrWord&)), + m_ocrResEdit, TQ_SLOT( slIgnoreWrongWord( int, const ocrWord& ))); - connect( ocrFabric, TQT_SIGNAL( markWordWrong(int, const ocrWord& )), - m_ocrResEdit, TQT_SLOT( slMarkWordWrong( int, const ocrWord& ))); + connect( ocrFabric, TQ_SIGNAL( markWordWrong(int, const ocrWord& )), + m_ocrResEdit, TQ_SLOT( slMarkWordWrong( int, const ocrWord& ))); - connect( ocrFabric, TQT_SIGNAL( readOnlyEditor( bool )), - m_ocrResEdit, TQT_SLOT( setReadOnly( bool ))); + connect( ocrFabric, TQ_SIGNAL( readOnlyEditor( bool )), + m_ocrResEdit, TQ_SLOT( setReadOnly( bool ))); - connect( ocrFabric, TQT_SIGNAL( selectWord( int, const ocrWord& )), - m_ocrResEdit, TQT_SLOT( slSelectWord( int, const ocrWord& ))); + connect( ocrFabric, TQ_SIGNAL( selectWord( int, const ocrWord& )), + m_ocrResEdit, TQ_SLOT( slSelectWord( int, const ocrWord& ))); } diff --git a/kooka/kookaview.h b/kooka/kookaview.h index f084e057..90160cbf 100644 --- a/kooka/kookaview.h +++ b/kooka/kookaview.h @@ -68,7 +68,7 @@ class ocrResEdit; */ class KookaView : public TQObject { - Q_OBJECT + TQ_OBJECT public: typedef enum { MirrorVertical, MirrorHorizontal, MirrorBoth } MirrorType; diff --git a/kooka/ksaneocr.cpp b/kooka/ksaneocr.cpp index 89660b53..774c66b2 100644 --- a/kooka/ksaneocr.cpp +++ b/kooka/ksaneocr.cpp @@ -224,9 +224,9 @@ bool KSANEOCR::startOCRVisible( TQWidget *parent ) m_ocrProcessDia->introduceImage( m_img ); visibleOCRRunning = true; - connect( m_ocrProcessDia, TQT_SIGNAL( user1Clicked()), this, TQT_SLOT( startOCRProcess() )); - connect( m_ocrProcessDia, TQT_SIGNAL( closeClicked()), this, TQT_SLOT( slotClose() )); - connect( m_ocrProcessDia, TQT_SIGNAL( user2Clicked()), this, TQT_SLOT( slotStopOCR() )); + connect( m_ocrProcessDia, TQ_SIGNAL( user1Clicked()), this, TQ_SLOT( startOCRProcess() )); + connect( m_ocrProcessDia, TQ_SIGNAL( closeClicked()), this, TQ_SLOT( slotClose() )); + connect( m_ocrProcessDia, TQ_SIGNAL( user2Clicked()), this, TQ_SLOT( slotStopOCR() )); m_ocrProcessDia->show(); } @@ -279,9 +279,9 @@ void KSANEOCR::finishedOCRVisible( bool success ) */ connect( new KSpell( m_parent, i18n("Kooka OCR Dictionary Check"), - this, TQT_SLOT( slSpellReady(KSpell*)), + this, TQ_SLOT( slSpellReady(KSpell*)), m_ocrProcessDia->spellConfig() ), - TQT_SIGNAL( death()), this, TQT_SLOT(slSpellDead())); + TQ_SIGNAL( death()), this, TQ_SLOT(slSpellDead())); } delete m_ocrProcessDia; @@ -425,12 +425,12 @@ void KSANEOCR::startOCRAD( ) m_ocrResultText = ""; - connect(daemon, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT( ocradExited(TDEProcess*))); - connect(daemon, TQT_SIGNAL(receivedStdout(TDEProcess *, char*, int)), - this, TQT_SLOT( ocradStdIn(TDEProcess*, char*, int))); - connect(daemon, TQT_SIGNAL(receivedStderr(TDEProcess *, char*, int)), - this, TQT_SLOT( ocradStdErr(TDEProcess*, char*, int))); + connect(daemon, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT( ocradExited(TDEProcess*))); + connect(daemon, TQ_SIGNAL(receivedStdout(TDEProcess *, char*, int)), + this, TQ_SLOT( ocradStdIn(TDEProcess*, char*, int))); + connect(daemon, TQ_SIGNAL(receivedStderr(TDEProcess *, char*, int)), + this, TQ_SLOT( ocradStdErr(TDEProcess*, char*, int))); if (!daemon->start(TDEProcess::NotifyOnExit, TDEProcess::All)) { @@ -535,12 +535,12 @@ void KSANEOCR::startOCRProcess( void ) TQ_CHECK_PTR(daemon); m_ocrResultText = ""; - connect(daemon, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT( gocrExited(TDEProcess*))); - connect(daemon, TQT_SIGNAL(receivedStdout(TDEProcess *, char*, int)), - this, TQT_SLOT( gocrStdIn(TDEProcess*, char*, int))); - connect(daemon, TQT_SIGNAL(receivedStderr(TDEProcess *, char*, int)), - this, TQT_SLOT( gocrStdErr(TDEProcess*, char*, int))); + connect(daemon, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT( gocrExited(TDEProcess*))); + connect(daemon, TQ_SIGNAL(receivedStdout(TDEProcess *, char*, int)), + this, TQ_SLOT( gocrStdIn(TDEProcess*, char*, int))); + connect(daemon, TQ_SIGNAL(receivedStderr(TDEProcess *, char*, int)), + this, TQ_SLOT( gocrStdErr(TDEProcess*, char*, int))); TQString opt; *daemon << TQFile::encodeName(cmd).data(); @@ -649,7 +649,7 @@ void KSANEOCR::startOCRProcess( void ) } #ifdef TQT_THREAD_SUPPORT /* start a timer and wait until it fires. */ - TQTimer::singleShot( 500, this, TQT_SLOT( slotKadmosResult() )); + TQTimer::singleShot( 500, this, TQ_SLOT( slotKadmosResult() )); #else slotKadmosResult(); #endif @@ -703,7 +703,7 @@ void KSANEOCR::slotKadmosResult() else { /* recognition thread is not yet finished. Wait another half a second. */ - TQTimer::singleShot( 500, this, TQT_SLOT( slotKadmosResult() )); + TQTimer::singleShot( 500, this, TQ_SLOT( slotKadmosResult() )); /* Never comes here if no threads exist on the system */ } #endif /* HAVE_KADMOS */ @@ -1127,7 +1127,7 @@ bool KSANEOCR::eventFilter( TQObject *object, TQEvent *event ) { if( event->type() == TQEvent::MouseButtonDblClick ) { - TQMouseEvent *mev = TQT_TQMOUSEEVENT(event); + TQMouseEvent *mev = static_cast<TQMouseEvent*>(event); int x = mev->x(); int y = mev->y(); @@ -1313,7 +1313,7 @@ void KSANEOCR::slMisspelling( const TQString& originalword, const TQStringList& { TQBrush brush; brush.setColor( TQColor(red)); // , "Dense4Pattern" ); - brush.setStyle( Qt::Dense4Pattern ); + brush.setStyle( TQt::Dense4Pattern ); TQPen pen( red, 2 ); TQRect r = resWord.rect(); @@ -1347,18 +1347,18 @@ void KSANEOCR::slMisspelling( const TQString& originalword, const TQStringList& void KSANEOCR::slSpellReady( KSpell *spell ) { m_spell = spell; - connect ( m_spell, TQT_SIGNAL( misspelling( const TQString&, const TQStringList&, + connect ( m_spell, TQ_SIGNAL( misspelling( const TQString&, const TQStringList&, unsigned int )), - this, TQT_SLOT( slMisspelling(const TQString& , + this, TQ_SLOT( slMisspelling(const TQString& , const TQStringList& , unsigned int ))); - connect( m_spell, TQT_SIGNAL( corrected ( const TQString&, const TQString&, unsigned int )), - this, TQT_SLOT( slSpellCorrected( const TQString&, const TQString&, unsigned int ))); + connect( m_spell, TQ_SIGNAL( corrected ( const TQString&, const TQString&, unsigned int )), + this, TQ_SLOT( slSpellCorrected( const TQString&, const TQString&, unsigned int ))); - connect( m_spell, TQT_SIGNAL( ignoreword( const TQString& )), - this, TQT_SLOT( slSpellIgnoreWord( const TQString& ))); + connect( m_spell, TQ_SIGNAL( ignoreword( const TQString& )), + this, TQ_SLOT( slSpellIgnoreWord( const TQString& ))); - connect( m_spell, TQT_SIGNAL( done(bool)), this, TQT_SLOT(slCheckListDone(bool))); + connect( m_spell, TQ_SIGNAL( done(bool)), this, TQ_SLOT(slCheckListDone(bool))); kdDebug(28000) << "Spellcheck available" << endl; diff --git a/kooka/ksaneocr.h b/kooka/ksaneocr.h index 6b995ad4..253aeb57 100644 --- a/kooka/ksaneocr.h +++ b/kooka/ksaneocr.h @@ -74,7 +74,7 @@ typedef enum{ ENG_ERROR, ENG_OK, ENG_DATA_MISSING, ENG_BAD_SETUP } EngineError; class KSANEOCR : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum OCREngines{ GOCR, OCRAD, KADMOS }; diff --git a/kooka/ocrresedit.h b/kooka/ocrresedit.h index c71d4e1d..26a280a8 100644 --- a/kooka/ocrresedit.h +++ b/kooka/ocrresedit.h @@ -35,7 +35,7 @@ class ocrWord; class ocrResEdit : public TQTextEdit { - Q_OBJECT + TQ_OBJECT public: ocrResEdit( TQWidget *parent ); diff --git a/kooka/scanpackager.cpp b/kooka/scanpackager.cpp index c4c03b1e..3d47221c 100644 --- a/kooka/scanpackager.cpp +++ b/kooka/scanpackager.cpp @@ -90,8 +90,8 @@ ScanPackager::ScanPackager( TQWidget *parent ) : KFileTreeView( parent ) setDropVisualizer(true); setAcceptDrops(true); - connect( this, TQT_SIGNAL(dropped( TQWidget*, TQDropEvent*, KURL::List&, KURL& )), - this, TQT_SLOT( slotUrlsDropped( TQWidget*, TQDropEvent*, KURL::List&, KURL& ))); + connect( this, TQ_SIGNAL(dropped( TQWidget*, TQDropEvent*, KURL::List&, KURL& )), + this, TQ_SLOT( slotUrlsDropped( TQWidget*, TQDropEvent*, KURL::List&, KURL& ))); kdDebug(28000) << "connected Drop-Signal" << endl; setRenameable ( 0, true ); @@ -101,14 +101,14 @@ ScanPackager::ScanPackager( TQWidget *parent ) : KFileTreeView( parent ) setRootIsDecorated( false ); - connect( this, TQT_SIGNAL( clicked( TQListViewItem*)), - TQT_SLOT( slClicked(TQListViewItem*))); + connect( this, TQ_SIGNAL( clicked( TQListViewItem*)), + TQ_SLOT( slClicked(TQListViewItem*))); - connect( this, TQT_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint &, int )), - TQT_SLOT( slShowContextMenue(TQListViewItem *, const TQPoint &, int ))); + connect( this, TQ_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint &, int )), + TQ_SLOT( slShowContextMenue(TQListViewItem *, const TQPoint &, int ))); - connect( this, TQT_SIGNAL(itemRenamed (TQListViewItem*, const TQString &, int ) ), this, - TQT_SLOT(slFileRename( TQListViewItem*, const TQString&, int))); + connect( this, TQ_SIGNAL(itemRenamed (TQListViewItem*, const TQString &, int ) ), this, + TQ_SLOT(slFileRename( TQListViewItem*, const TQString&, int))); img_counter = 1; @@ -158,17 +158,17 @@ KFileTreeBranch* ScanPackager::openRoot( const KURL& root, bool ) setDirOnlyMode( m_defaultBranch, false ); m_defaultBranch->setShowExtensions( true ); // false ); - connect( m_defaultBranch, TQT_SIGNAL( newTreeViewItems( KFileTreeBranch*, const KFileTreeViewItemList& )), - this, TQT_SLOT( slotDecorate(KFileTreeBranch*, const KFileTreeViewItemList& ))); + connect( m_defaultBranch, TQ_SIGNAL( newTreeViewItems( KFileTreeBranch*, const KFileTreeViewItemList& )), + this, TQ_SLOT( slotDecorate(KFileTreeBranch*, const KFileTreeViewItemList& ))); - connect( m_defaultBranch, TQT_SIGNAL( directoryChildCount( KFileTreeViewItem* , int )), - this, TQT_SLOT( slotDirCount( KFileTreeViewItem *, int ))); + connect( m_defaultBranch, TQ_SIGNAL( directoryChildCount( KFileTreeViewItem* , int )), + this, TQ_SLOT( slotDirCount( KFileTreeViewItem *, int ))); - connect( m_defaultBranch, TQT_SIGNAL( deleteItem( KFileItem* )), - this, TQT_SLOT( slotDeleteFromBranch(KFileItem*))); + connect( m_defaultBranch, TQ_SIGNAL( deleteItem( KFileItem* )), + this, TQ_SLOT( slotDeleteFromBranch(KFileItem*))); - connect( m_defaultBranch, TQT_SIGNAL( populateFinished( KFileTreeViewItem * )), - this, TQT_SLOT( slotStartupFinished( KFileTreeViewItem * ))); + connect( m_defaultBranch, TQ_SIGNAL( populateFinished( KFileTreeViewItem * )), + this, TQ_SLOT( slotStartupFinished( KFileTreeViewItem * ))); return( m_defaultBranch ); diff --git a/kooka/scanpackager.h b/kooka/scanpackager.h index fdae6495..8916121e 100644 --- a/kooka/scanpackager.h +++ b/kooka/scanpackager.h @@ -73,7 +73,7 @@ private: class ScanPackager : public KFileTreeView { - Q_OBJECT + TQ_OBJECT public: ScanPackager( TQWidget *parent); diff --git a/kooka/thumbview.cpp b/kooka/thumbview.cpp index 4f5c1d7a..08c11534 100644 --- a/kooka/thumbview.cpp +++ b/kooka/thumbview.cpp @@ -73,8 +73,8 @@ ThumbView::ThumbView( TQWidget *parent, const char *name ) slSetBackGround(); - connect( m_iconView, TQT_SIGNAL( executed( TQIconViewItem* )), - this, TQT_SLOT( slDoubleClicked( TQIconViewItem* ))); + connect( m_iconView, TQ_SIGNAL( executed( TQIconViewItem* )), + this, TQ_SLOT( slDoubleClicked( TQIconViewItem* ))); m_pendingJobs.setAutoDelete(false); } @@ -389,18 +389,18 @@ void ThumbView::slNewFileItems( const KFileItemList& items ) if( m_job ) { - connect( m_job, TQT_SIGNAL( result( TDEIO::Job * )), - this, TQT_SLOT( slPreviewResult( TDEIO::Job * ))); - connect( m_job, TQT_SIGNAL( gotPreview( const KFileItem*, const TQPixmap& )), - TQT_SLOT( slGotPreview( const KFileItem*, const TQPixmap& ) )); + connect( m_job, TQ_SIGNAL( result( TDEIO::Job * )), + this, TQ_SLOT( slPreviewResult( TDEIO::Job * ))); + connect( m_job, TQ_SIGNAL( gotPreview( const KFileItem*, const TQPixmap& )), + TQ_SLOT( slGotPreview( const KFileItem*, const TQPixmap& ) )); m_pendingJobs.clear(); /* TDEIO::Jo result is called in any way: Success, Failed, Error, * thus connecting the failed is not really necessary. */ - // connect( job, TQT_SIGNAL( failed( const KFileItem* )), - // this, TQT_SLOT( slotFailed( const KFileItem* ) )); + // connect( job, TQ_SIGNAL( failed( const KFileItem* )), + // this, TQ_SLOT( slotFailed( const KFileItem* ) )); } } diff --git a/kooka/thumbview.h b/kooka/thumbview.h index fc7a3843..a3a1ce14 100644 --- a/kooka/thumbview.h +++ b/kooka/thumbview.h @@ -60,7 +60,7 @@ namespace TDEIO { class ThumbView: public TQVBox /* TDEIconView */ { - Q_OBJECT + TQ_OBJECT public: |