From 45f529de247fc4b3662f6b474abe03fe904306ec Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:31:39 -0600 Subject: Rename old tq methods that no longer need a unique name --- kooka/img_saver.cpp | 12 ++++++------ kooka/imgnamecombo.cpp | 4 ++-- kooka/imgprintdialog.cpp | 2 +- kooka/kocrbase.cpp | 8 ++++---- kooka/kooka.cpp | 2 +- kooka/kookapref.cpp | 12 ++++++------ kooka/kookaview.cpp | 6 +++--- kooka/scanpackager.cpp | 2 +- kooka/thumbview.cpp | 4 ++-- 9 files changed, 26 insertions(+), 26 deletions(-) (limited to 'kooka') diff --git a/kooka/img_saver.cpp b/kooka/img_saver.cpp index 847023d1..dee577b4 100644 --- a/kooka/img_saver.cpp +++ b/kooka/img_saver.cpp @@ -116,7 +116,7 @@ FormatDialog::FormatDialog( TQWidget *parent, const TQString&, const char *name Q_CHECK_PTR(l_help); l_help->setFrameStyle( TQFrame::Panel|TQFrame::Sunken ); l_help->setText( i18n("-No format selected-" )); - l_help->tqsetAlignment( AlignVCenter | AlignHCenter ); + l_help->setAlignment( AlignVCenter | AlignHCenter ); l_help->setMinimumWidth(230); // Insert Selbox for subformat @@ -208,11 +208,11 @@ TQCString FormatDialog::getSubFormat( ) const #include "formathelp.h" void FormatDialog::buildHelp( void ) { - format_help.insert( TQString::tqfromLatin1("BMP"), HELP_BMP ); - format_help.insert( TQString::tqfromLatin1("PNM"), HELP_PNM ); - format_help.insert( TQString::tqfromLatin1("JPEG"), HELP_JPG ); - format_help.insert( TQString::tqfromLatin1("JPG"), HELP_JPG ); - format_help.insert( TQString::tqfromLatin1("EPS"), HELP_EPS ); + format_help.insert( TQString::fromLatin1("BMP"), HELP_BMP ); + format_help.insert( TQString::fromLatin1("PNM"), HELP_PNM ); + format_help.insert( TQString::fromLatin1("JPEG"), HELP_JPG ); + format_help.insert( TQString::fromLatin1("JPG"), HELP_JPG ); + format_help.insert( TQString::fromLatin1("EPS"), HELP_EPS ); } diff --git a/kooka/imgnamecombo.cpp b/kooka/imgnamecombo.cpp index 8190d5bc..9364bef3 100644 --- a/kooka/imgnamecombo.cpp +++ b/kooka/imgnamecombo.cpp @@ -51,7 +51,7 @@ ImageNameCombo::~ImageNameCombo() void ImageNameCombo::slotPathRemove( KFileTreeBranch *branch, const TQString& relPath ) { - TQString path = branch->name() + TQString::tqfromLatin1(" - ") + relPath; + TQString path = branch->name() + TQString::fromLatin1(" - ") + relPath; kdDebug(28000) << "ImageNameCombo: Removing " << path << endl; TQString select = currentText(); @@ -82,7 +82,7 @@ void ImageNameCombo::slotGalleryPathChanged( KFileTreeBranch* branch, const TQSt { TQString newPath; - newPath = branch->name() + TQString::tqfromLatin1(" - ") + relativPath; + newPath = branch->name() + TQString::fromLatin1(" - ") + relativPath; kdDebug( 28000) << "Inserting " << newPath << " to combobox" << endl; diff --git a/kooka/imgprintdialog.cpp b/kooka/imgprintdialog.cpp index e79c92df..f96a47c9 100644 --- a/kooka/imgprintdialog.cpp +++ b/kooka/imgprintdialog.cpp @@ -127,7 +127,7 @@ ImgPrintDialog::ImgPrintDialog( KookaImage *img, TQWidget *parent, const char* n TQWidget *spaceEater = new TQWidget( this ); - spaceEater->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored )); + spaceEater->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored )); tqlayout->addWidget( spaceEater ); /* Set start values */ diff --git a/kooka/kocrbase.cpp b/kooka/kocrbase.cpp index 2cd5d20b..0de5c88c 100644 --- a/kooka/kocrbase.cpp +++ b/kooka/kocrbase.cpp @@ -129,7 +129,7 @@ void KOCRBase::imgIntro() m_previewPix = new TQLabel( m_imgHBox ); m_previewPix->setPixmap(TQPixmap()); m_previewPix->setFixedSize(m_previewSize); - m_previewPix->tqsetAlignment( TQt::AlignCenter ); + m_previewPix->setAlignment( TQt::AlignCenter ); m_previewPix->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); // m_previewPix->resize(m_previewSize); @@ -164,7 +164,7 @@ void KOCRBase::ocrIntro( ) hb_cap->setSpacing( KDialog::spacingHint()); TQLabel *imgLab = new TQLabel( hb_cap ); - imgLab->tqsetAlignment( TQt::AlignHCenter | TQt::AlignTop ); + imgLab->setAlignment( TQt::AlignHCenter | TQt::AlignTop ); imgLab->setPixmap( pix ); pa = hb_cap; } @@ -188,7 +188,7 @@ void KOCRBase::spellCheckIntro() KSpellConfig *sCfg = new KSpellConfig( m_gbSpellOpts, "SPELLCHK", m_spellConfig, false ); /* A space eater */ TQWidget *spaceEater = new TQWidget(m_spellchkPage); - spaceEater->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored )); + spaceEater->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored )); /* connect toggle button */ connect( m_cbWantCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slWantSpellcheck(bool))); @@ -285,7 +285,7 @@ void KOCRBase::introduceImage( KookaImage* img) } } TQWidget *spaceEater = new TQWidget( m_metaBox ); - spaceEater->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored )); + spaceEater->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored )); m_metaBox->show(); } diff --git a/kooka/kooka.cpp b/kooka/kooka.cpp index dc05a622..4750bf07 100644 --- a/kooka/kooka.cpp +++ b/kooka/kooka.cpp @@ -96,7 +96,7 @@ Kooka::Kooka( const TQCString& deviceToUse) changeCaption( i18n( "KDE Scanning" )); - setAutoSaveSettings( TQString::tqfromLatin1("General Options"), + setAutoSaveSettings( TQString::fromLatin1("General Options"), true ); } diff --git a/kooka/kookapref.cpp b/kooka/kookapref.cpp index bebd60fa..45d0ee01 100644 --- a/kooka/kookapref.cpp +++ b/kooka/kookapref.cpp @@ -149,7 +149,7 @@ void KookaPreferences::setupOCRPage() #endif top->addWidget( kgp ); TQWidget *spaceEater = new TQWidget( page ); - spaceEater->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored )); + spaceEater->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored )); top->addWidget( spaceEater ); /* @@ -418,8 +418,8 @@ void KookaPreferences::setupThumbnailPage() /* Frame Stuff */ int frameWidth = konf->readNumEntry( THUMB_MARGIN, 3 ); - TQColor col1 = konf->readColorEntry( MARGIN_COLOR1, &(tqcolorGroup().base())); - TQColor col2 = konf->readColorEntry( MARGIN_COLOR2, &(tqcolorGroup().foreground())); + TQColor col1 = konf->readColorEntry( MARGIN_COLOR1, &(colorGroup().base())); + TQColor col2 = konf->readColorEntry( MARGIN_COLOR2, &(colorGroup().foreground())); TQGrid *fGrid = new TQGrid( 2, hgb3 ); fGrid->setSpacing( 2 ); @@ -457,7 +457,7 @@ void KookaPreferences::slotApply( void ) /* ** startup options ** */ /** write the global one, to read from libkscan also */ - konf->setGroup(TQString::tqfromLatin1(GROUP_STARTUP)); + konf->setGroup(TQString::fromLatin1(GROUP_STARTUP)); bool cbVal = !(cbShowScannerSelection->isChecked()); kdDebug(28000) << "Writing for " << STARTUP_SKIP_ASK << ": " << cbVal << endl; konf->writeEntry( STARTUP_SKIP_ASK, cbVal, true, true ); /* global flag goes to kdeglobals */ @@ -532,8 +532,8 @@ void KookaPreferences::slotDefault( void ) m_tileSelector->setURL( KURL(bgImg) ); m_thumbWidth->setValue( 100 ); m_thumbHeight->setValue( 120 ); - TQColor col1 = TQColor( tqcolorGroup().base()); - TQColor col2 = TQColor( tqcolorGroup().foreground()); + TQColor col1 = TQColor( colorGroup().base()); + TQColor col2 = TQColor( colorGroup().foreground()); m_frameWidth->setValue( 3 ); m_colButt1->setColor( col1 ); diff --git a/kooka/kookaview.cpp b/kooka/kookaview.cpp index 5586ee43..e177df5c 100644 --- a/kooka/kookaview.cpp +++ b/kooka/kookaview.cpp @@ -164,7 +164,7 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU TQHBox *recentBox = new TQHBox( m_dockRecent ); recentBox->setMargin(KDialog::marginHint()); TQLabel *lab = new TQLabel( i18n("Gallery:"), recentBox ); - lab->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed) ); + lab->setSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed) ); recentFolder = new ImageNameCombo( recentBox ); m_dockRecent->setWidget( recentBox ); @@ -277,7 +277,7 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU packager->openRoots(); - /* tqStatus Bar */ + /* Status Bar */ KStatusBar *statBar = m_mainWindow->statusBar(); // statBar->insertItem(TQString("1"), SBAR_ZOOM, 0, true ); @@ -842,7 +842,7 @@ void KookaView::slShowAImage( KookaImage *img ) ocrFabric->slSetImage( img ); } - /* tqStatus Bar */ + /* Status Bar */ KStatusBar *statBar = m_mainWindow->statusBar(); if( img_canvas ) statBar->changeItem( img_canvas->imageInfoString(), StatusImage ); diff --git a/kooka/scanpackager.cpp b/kooka/scanpackager.cpp index 9a8c9d3a..c553a7ae 100644 --- a/kooka/scanpackager.cpp +++ b/kooka/scanpackager.cpp @@ -463,7 +463,7 @@ void ScanPackager::slotSelectDirectory( const TQString & dirString ) { kdDebug(28000) << "Trying to decode directory string " << dirString << endl; - TQString searchFor = TQString::tqfromLatin1(" - "); + TQString searchFor = TQString::fromLatin1(" - "); int pos = dirString.find( searchFor ); if( pos > -1 ) diff --git a/kooka/thumbview.cpp b/kooka/thumbview.cpp index a431f1ea..570459f4 100644 --- a/kooka/thumbview.cpp +++ b/kooka/thumbview.cpp @@ -91,14 +91,14 @@ bool ThumbView::readSettings() bool dirty = false; TQColor color; - color = cfg->readColorEntry( MARGIN_COLOR1, &(tqcolorGroup().base())); + color = cfg->readColorEntry( MARGIN_COLOR1, &(colorGroup().base())); if( color != m_marginColor1 ) { dirty = true; m_marginColor1 = color; } - color = cfg->readColorEntry( MARGIN_COLOR2, &(tqcolorGroup().foreground())); + color = cfg->readColorEntry( MARGIN_COLOR2, &(colorGroup().foreground())); if( color != m_marginColor2 ) { dirty = true; -- cgit v1.2.1