diff options
Diffstat (limited to 'kompare')
26 files changed, 166 insertions, 166 deletions
diff --git a/kompare/kompare_shell.cpp b/kompare/kompare_shell.cpp index bb1c71a9..43814746 100644 --- a/kompare/kompare_shell.cpp +++ b/kompare/kompare_shell.cpp @@ -258,7 +258,7 @@ void KompareShell::setupStatusBar() m_generalLabel = new KSqueezedTextLabel( "", 0, "general_statusbar_label" ); statusBar()->addWidget( m_generalLabel, 1, false ); - m_generalLabel->tqsetAlignment( TQt::AlignLeft ); + m_generalLabel->setAlignment( TQt::AlignLeft ); } void KompareShell::slotUpdateStatusBar( int modelIndex, int differenceIndex, int modelCount, int differenceCount, int appliedCount ) @@ -269,13 +269,13 @@ void KompareShell::slotUpdateStatusBar( int modelIndex, int differenceIndex, int TQString diffStr; if ( modelIndex >= 0 ) - fileStr = i18n( " %1 of %n file ", " %1 of %n files ", modelCount ).tqarg( modelIndex + 1 ); + fileStr = i18n( " %1 of %n file ", " %1 of %n files ", modelCount ).arg( modelIndex + 1 ); else fileStr = i18n( " %n file ", " %n files ", modelCount ); if ( differenceIndex >= 0 ) diffStr = i18n( " %1 of %n difference, %2 applied ", " %1 of %n differences, %2 applied ", differenceCount ) - .tqarg( differenceIndex + 1 ).tqarg( appliedCount ); + .arg( differenceIndex + 1 ).arg( appliedCount ); else diffStr = i18n( " %n difference ", " %n differences ", differenceCount ); @@ -438,7 +438,7 @@ void KompareShell::slotShowTextView() // FIXME: proper error checking m_textViewWidget = createDockWidget( i18n("Text View"), SmallIcon( "text") ); m_textViewPart = KParts::ComponentFactory::createPartInstanceFromQuery<KTextEditor::Document>( - TQString::tqfromLatin1("KTextEditor/Document"), + TQString::fromLatin1("KTextEditor/Document"), TQString(), TQT_TQWIDGET(this), 0, TQT_TQOBJECT(this), 0, TQStringList(), &errCode ); if ( m_textViewPart ) { diff --git a/kompare/komparenavtreepart/komparenavtreepart.cpp b/kompare/komparenavtreepart/komparenavtreepart.cpp index 1a402260..9f9d775e 100644 --- a/kompare/komparenavtreepart/komparenavtreepart.cpp +++ b/kompare/komparenavtreepart/komparenavtreepart.cpp @@ -582,7 +582,7 @@ KDirLVI* KDirLVI::findChild( TQString dir ) // kdDebug(8105) << "KDirLVI::findChild called with dir = " << dir << endl; KDirLVI* child; if ( ( child = static_cast<KDirLVI*>(this->firstChild()) ) != 0L ) - { // has tqchildren, check if dir already exists, if so addModel + { // has children, check if dir already exists, if so addModel do { if ( dir == child->dirName() ) return child; diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp index 3c110857..c11bbe8e 100644 --- a/kompare/komparepart/kompare_part.cpp +++ b/kompare/komparepart/kompare_part.cpp @@ -21,7 +21,7 @@ #include "kompare_qsplitter.h" // make sure we get there first -#include <tqlayout.h> +#include <layout.h> #include <tqwidget.h> #include <kaction.h> @@ -266,7 +266,7 @@ const TQString KomparePart::fetchURL( const KURL& url ) { if ( ! KIO::NetAccess::download( url, tempFileName, widget() ) ) { - slotShowError( i18n( "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" ).tqarg( url.prettyURL() ) ); + slotShowError( i18n( "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" ).arg( url.prettyURL() ) ); tempFileName = ""; } return tempFileName; @@ -278,7 +278,7 @@ const TQString KomparePart::fetchURL( const KURL& url ) return url.path(); else { - slotShowError( i18n( "<qt>The URL <b>%1</b> does not exist on your system.</qt>" ).tqarg( url.prettyURL() ) ); + slotShowError( i18n( "<qt>The URL <b>%1</b> does not exist on your system.</qt>" ).arg( url.prettyURL() ) ); return tempFileName; } } @@ -543,26 +543,26 @@ void KomparePart::updateStatus() { case Kompare::ComparingFiles : text = i18n( "Comparing file %1 with file %2" ) - .tqarg( source ) - .tqarg( destination ); + .arg( source ) + .arg( destination ); break; case Kompare::ComparingDirs : text = i18n( "Comparing files in %1 with files in %2" ) - .tqarg( source ) - .tqarg( destination ); + .arg( source ) + .arg( destination ); break; case Kompare::ShowingDiff : - text = i18n( "Viewing diff output from %1" ).tqarg( source ); + text = i18n( "Viewing diff output from %1" ).arg( source ); break; case Kompare::BlendingFile : text = i18n( "Blending diff output from %1 into file %2" ) - .tqarg( source ) - .tqarg( destination ); + .arg( source ) + .arg( destination ); break; case Kompare::BlendingDir : text = i18n( "Blending diff output from %1 into folder %2" ) - .tqarg( m_info.source.prettyURL() ) - .tqarg( m_info.destination.prettyURL() ); + .arg( m_info.source.prettyURL() ) + .arg( m_info.destination.prettyURL() ); break; default: break; @@ -678,8 +678,8 @@ void KomparePart::slotShowDiffstats( void ) "Format: %3\n" "Number of hunks: %4\n" "Number of differences: %5") - .tqarg(oldFile).tqarg(newFile).tqarg(diffFormat) - .tqarg(noOfHunks).tqarg(noOfDiffs), + .arg(oldFile).arg(newFile).arg(diffFormat) + .arg(noOfHunks).arg(noOfDiffs), i18n("Diff Statistics"), TQString(), false ); } else { // more than 1 file in diff, or 2 directories compared KMessageBox::information( 0L, i18n( @@ -693,8 +693,8 @@ void KomparePart::slotShowDiffstats( void ) "\n" "Number of hunks: %5\n" "Number of differences: %6") - .tqarg(filesInDiff).tqarg(diffFormat).tqarg(oldFile) - .tqarg(newFile).tqarg(noOfHunks).tqarg(noOfDiffs), + .arg(filesInDiff).arg(diffFormat).arg(oldFile) + .arg(newFile).arg(noOfHunks).arg(noOfDiffs), i18n("Diff Statistics"), TQString(), false ); } } diff --git a/kompare/komparepart/kompareconnectwidget.cpp b/kompare/komparepart/kompareconnectwidget.cpp index 4d7bd603..2bccc48b 100644 --- a/kompare/komparepart/kompareconnectwidget.cpp +++ b/kompare/komparepart/kompareconnectwidget.cpp @@ -46,14 +46,14 @@ KompareConnectWidgetFrame::KompareConnectWidgetFrame( KompareListView* left, m_label ( "", this ), m_layout ( this ) { - tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Ignored) ); - m_wid.tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored) ); - m_label.tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) ); + setSizePolicy ( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Ignored) ); + m_wid.setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored) ); + m_label.setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) ); m_label.setMargin(3); TQFrame* bottomLine = new TQFrame(this); bottomLine->setFrameShape(TQFrame::HLine); bottomLine->setFrameShadow ( TQFrame::Plain ); - bottomLine->tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) ); + bottomLine->setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) ); bottomLine->setFixedHeight(1); m_layout.setSpacing(0); m_layout.setMargin(0); @@ -66,9 +66,9 @@ KompareConnectWidgetFrame::~KompareConnectWidgetFrame() { } -TQSize KompareConnectWidgetFrame::tqsizeHint() const +TQSize KompareConnectWidgetFrame::sizeHint() const { - return TQSize(50, tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent ) ); + return TQSize(50, tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent ) ); } static int kMouseOffset; @@ -111,7 +111,7 @@ KompareConnectWidget::KompareConnectWidget( KompareListView* left, KompareListVi { // connect( m_settings, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT( slotDelayedRepaint() ) ); setBackgroundMode( NoBackground ); - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) ); setFocusProxy( parent->parentWidget() ); } @@ -139,7 +139,7 @@ void KompareConnectWidget::slotSetSelection( const DiffModel* model, const Diffe void KompareConnectWidget::slotDelayedRepaint() { - TQTimer::singleShot( 0, this, TQT_SLOT( tqrepaint() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( repaint() ) ); } void KompareConnectWidget::slotSetSelection( const Difference* diff ) @@ -190,13 +190,13 @@ void KompareConnectWidget::paintEvent( TQPaintEvent* /* e */ ) if ( TQApplication::reverseLayout() ) { - leftRect = m_rightView->tqitemRect( i ); - rightRect = m_leftView->tqitemRect( i ); + leftRect = m_rightView->itemRect( i ); + rightRect = m_leftView->itemRect( i ); } else { - leftRect = m_leftView->tqitemRect( i ); - rightRect = m_rightView->tqitemRect( i ); + leftRect = m_leftView->itemRect( i ); + rightRect = m_rightView->itemRect( i ); } int tl = leftRect.top(); diff --git a/kompare/komparepart/kompareconnectwidget.h b/kompare/komparepart/kompareconnectwidget.h index cc22ed86..ec48ff61 100644 --- a/kompare/komparepart/kompareconnectwidget.h +++ b/kompare/komparepart/kompareconnectwidget.h @@ -76,7 +76,7 @@ public: ViewSettings* settings, KompareSplitter* parent, const char* name = 0 ); ~KompareConnectWidgetFrame(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; KompareConnectWidget* wid() { return &m_wid; } diff --git a/kompare/komparepart/komparelistview.cpp b/kompare/komparepart/komparelistview.cpp index f8779fa9..30e65d87 100644 --- a/kompare/komparepart/komparelistview.cpp +++ b/kompare/komparepart/komparelistview.cpp @@ -54,12 +54,12 @@ KompareListViewFrame::KompareListViewFrame( bool isSource, m_label ( isSource?"Source":"Dest", this ), m_layout ( this ) { - tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored) ); - m_label.tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) ); + setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored) ); + m_label.setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) ); TQFrame *bottomLine = new TQFrame(this); bottomLine->setFrameShape(TQFrame::HLine); bottomLine->setFrameShadow ( TQFrame::Plain ); - bottomLine->tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) ); + bottomLine->setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) ); bottomLine->setFixedHeight(1); m_label.setMargin(3); m_layout.setSpacing(0); @@ -182,7 +182,7 @@ int KompareListView::lastVisibleDifference() return -1; } -TQRect KompareListView::tqitemRect( int i ) +TQRect KompareListView::itemRect( int i ) { TQListViewItem* item = itemAtIndex( i ); int x = 0; @@ -390,7 +390,7 @@ void KompareListView::slotApplyAllDifferences( bool apply ) TQPtrDictIterator<KompareListViewDiffItem> it ( m_itemDict ); for( ; it.current(); ++it ) it.current()->applyDifference( apply ); - tqrepaint(); + repaint(); } void KompareListView::slotApplyDifference( const Difference* diff, bool apply ) @@ -500,7 +500,7 @@ void KompareListViewDiffItem::applyDifference( bool apply ) kdDebug(8104) << "KompareListViewDiffItem::applyDifference( " << apply << " )" << endl; setVisibility(); setup(); - tqrepaint(); + repaint(); } int KompareListViewDiffItem::maxHeight() @@ -520,7 +520,7 @@ void KompareListViewDiffItem::setSelected( bool b ) m_sourceItem->firstChild() : m_destItem->firstChild(); while( item && item->isVisible() ) { - item->tqrepaint(); + item->repaint(); item = item->nextSibling(); } } diff --git a/kompare/komparepart/komparelistview.h b/kompare/komparepart/komparelistview.h index b5de7661..0cbbefd7 100644 --- a/kompare/komparepart/komparelistview.h +++ b/kompare/komparepart/komparelistview.h @@ -25,7 +25,7 @@ #include <tqptrlist.h> #include <tqptrdict.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <klistview.h> @@ -55,7 +55,7 @@ public: KompareListViewItem* itemAtIndex( int i ); int firstVisibleDifference(); int lastVisibleDifference(); - TQRect tqitemRect( int i ); + TQRect itemRect( int i ); int minScrollId(); int maxScrollId(); int contentsWidth(); diff --git a/kompare/komparepart/komparesaveoptionsbase.ui b/kompare/komparepart/komparesaveoptionsbase.ui index 7636a27f..47cfc893 100644 --- a/kompare/komparepart/komparesaveoptionsbase.ui +++ b/kompare/komparepart/komparesaveoptionsbase.ui @@ -83,7 +83,7 @@ <property name="title"> <string>Command Line</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="hAlign" stdset="0"> diff --git a/kompare/komparepart/komparesplitter.cpp b/kompare/komparepart/komparesplitter.cpp index 5e30652c..7087ca4d 100644 --- a/kompare/komparepart/komparesplitter.cpp +++ b/kompare/komparepart/komparesplitter.cpp @@ -44,25 +44,25 @@ KompareSplitter::KompareSplitter( ViewSettings *settings, TQWidget * parent, // Set up the scrollFrame scrollFrame->setFrameStyle( TQFrame::NoFrame | TQFrame::Plain ); - scrollFrame->setLineWidth(scrollFrame->tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth)); - TQGridLayout *pairtqlayout = new TQGridLayout(scrollFrame, 2, 2, 0); + scrollFrame->setLineWidth(scrollFrame->tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth)); + TQGridLayout *pairlayout = new TQGridLayout(scrollFrame, 2, 2, 0); m_vScroll = new TQScrollBar( Qt::Vertical, scrollFrame ); - pairtqlayout->addWidget( m_vScroll, 0, 1 ); + pairlayout->addWidget( m_vScroll, 0, 1 ); m_hScroll = new TQScrollBar( Qt::Horizontal, scrollFrame ); - pairtqlayout->addWidget( m_hScroll, 1, 0 ); + pairlayout->addWidget( m_hScroll, 1, 0 ); new KompareListViewFrame(true, m_settings, this, "source"); new KompareListViewFrame(false, m_settings, this, "destination"); - pairtqlayout->addWidget( this, 0, 0 ); + pairlayout->addWidget( this, 0, 0 ); // set up our looks setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); - setLineWidth( tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) ); + setLineWidth( tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) ); setHandleWidth(50); setChildrenCollapsible( false ); setFrameStyle( TQFrame::NoFrame ); - tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Ignored, TQSizePolicy::Ignored )); + setSizePolicy( TQSizePolicy (TQSizePolicy::Ignored, TQSizePolicy::Ignored )); setOpaqueResize( true ); setFocusPolicy( TQ_WheelFocus ); @@ -121,7 +121,7 @@ TQSplitterLayoutStruct *KompareSplitter::addWidget( KompareListViewFrame *w, boo s->wid = newHandle; newHandle->setId( d->list.count() ); s->isHandle = TRUE; - s->sizer = pick( newHandle->tqsizeHint() ); + s->sizer = pick( newHandle->sizeHint() ); if ( prepend ) d->list.prepend( s ); else @@ -184,7 +184,7 @@ void KompareSplitter::childEvent( TQChildEvent *c ) } } -// This is from a private qt header (kernel/qtqlayoutengine_p.h). sorry. +// This is from a private qt header (kernel/qlayoutengine_p.h). sorry. TQSize qSmartMinSize( TQWidget *w ); static TQPoint toggle( TQWidget *w, TQPoint pos ) @@ -212,7 +212,7 @@ static TQPoint bottomRight( TQWidget *w ) if ( isCollapsed(w) ) { return toggle( w, w->pos() ) - TQPoint( 1, 1 ); } else { - return w->tqgeometry().bottomRight(); + return w->geometry().bottomRight(); } } @@ -279,7 +279,7 @@ void KompareSplitter::doMove( bool backwards, int pos, int id, int delta, : pick( bottomRight(w) ) - pos + 1; if ( dd > 0 || (!isCollapsed(w) && !mayCollapse) ) { dd = TQMAX( pick(qSmartMinSize(w)), - TQMIN(dd, pick(w->tqmaximumSize())) ); + TQMIN(dd, pick(w->maximumSize())) ); } else { dd = 0; } @@ -396,7 +396,7 @@ void KompareSplitter::repaintHandles() TQSplitterLayoutStruct *curr; for ( curr = d->list.first(); curr; curr = d->list.next() ) if ( curr->isHandle ) - ((KompareConnectWidgetFrame*)curr->wid)->wid()->tqrepaint(); + ((KompareConnectWidgetFrame*)curr->wid)->wid()->repaint(); } // Scrolling stuff diff --git a/kompare/libdialogpages/diffpage.cpp b/kompare/libdialogpages/diffpage.cpp index 8e6d55e5..e8ad94fe 100644 --- a/kompare/libdialogpages/diffpage.cpp +++ b/kompare/libdialogpages/diffpage.cpp @@ -18,7 +18,7 @@ #include <tqcheckbox.h> #include <tqhgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include <tqspinbox.h> #include <tqtooltip.h> @@ -203,19 +203,19 @@ void DiffPage::slotExcludeFileToggled( bool on ) void DiffPage::addDiffTab() { TQWidget* page = new TQWidget( this ); - TQVBoxLayout* tqlayout = new TQVBoxLayout( page ); - tqlayout->setSpacing( KDialog::spacingHint() ); - tqlayout->setMargin( KDialog::marginHint() ); + TQVBoxLayout* layout = new TQVBoxLayout( page ); + layout->setSpacing( KDialog::spacingHint() ); + layout->setMargin( KDialog::marginHint() ); // add diff program selector m_diffProgramGroup = new TQVButtonGroup( i18n( "Diff Program" ), page ); - tqlayout->addWidget( m_diffProgramGroup ); + layout->addWidget( m_diffProgramGroup ); m_diffProgramGroup->setMargin( KDialog::marginHint() ); m_diffURLRequester = new KURLRequester( m_diffProgramGroup, "diffURLRequester" ); TQWhatsThis::add( m_diffURLRequester, i18n( "You can select a different diff program here. On Solaris the standard diff program does not support all the options that the GNU version does. This way you can select that version." ) ); - tqlayout->addStretch( 1 ); + layout->addStretch( 1 ); page->setMinimumSize( sizeHintForWidget( page ) ); addTab( page, i18n( "&Diff" ) ); @@ -224,14 +224,14 @@ void DiffPage::addDiffTab() void DiffPage::addFormatTab() { TQWidget* page = new TQWidget( this ); - TQVBoxLayout* tqlayout = new TQVBoxLayout( page ); - tqlayout->setSpacing( KDialog::spacingHint() ); - tqlayout->setMargin( KDialog::marginHint() ); + TQVBoxLayout* layout = new TQVBoxLayout( page ); + layout->setSpacing( KDialog::spacingHint() ); + layout->setMargin( KDialog::marginHint() ); // add diff modes m_modeButtonGroup = new TQVButtonGroup( i18n( "Output Format" ), page ); TQWhatsThis::add( m_modeButtonGroup, i18n( "Select the format of the output generated by diff. Unified is the one that is used most frequently because it is very readable. The KDE developers like this format the best so use it for sending patches." ) ); - tqlayout->addWidget( m_modeButtonGroup ); + layout->addWidget( m_modeButtonGroup ); m_modeButtonGroup->setMargin( KDialog::marginHint() ); TQRadioButton* radioButton; @@ -245,7 +245,7 @@ void DiffPage::addFormatTab() // #lines of context (loc) TQHGroupBox* groupBox = new TQHGroupBox( i18n( "Lines of Context" ), page ); - tqlayout->addWidget( groupBox ); + layout->addWidget( groupBox ); groupBox->setMargin( KDialog::marginHint() ); TQLabel* label = new TQLabel( i18n( "Number of context lines:" ), groupBox ); @@ -253,7 +253,7 @@ void DiffPage::addFormatTab() TQWhatsThis::add( m_locSpinBox, i18n( "The number of context lines is normally 2 or 3. This makes the diff readable and applicable in most cases. More than 3 lines will only bloat the diff unnecessarily." ) ); label->setBuddy( m_locSpinBox ); - tqlayout->addStretch( 1 ); + layout->addStretch( 1 ); page->setMinimumSize( sizeHintForWidget( page ) ); addTab( page, i18n( "&Format" ) ); @@ -262,13 +262,13 @@ void DiffPage::addFormatTab() void DiffPage::addOptionsTab() { TQWidget* page = new TQWidget( this ); - TQVBoxLayout* tqlayout = new TQVBoxLayout( page ); - tqlayout->setSpacing( KDialog::spacingHint() ); - tqlayout->setMargin( KDialog::marginHint() ); + TQVBoxLayout* layout = new TQVBoxLayout( page ); + layout->setSpacing( KDialog::spacingHint() ); + layout->setMargin( KDialog::marginHint() ); // add diff options TQVButtonGroup* optionButtonGroup = new TQVButtonGroup( i18n( "General" ), page ); - tqlayout->addWidget( optionButtonGroup ); + layout->addWidget( optionButtonGroup ); optionButtonGroup->setMargin( KDialog::marginHint() ); m_smallerCheckBox = new TQCheckBox( i18n( "&Look for smaller changes" ), optionButtonGroup ); @@ -278,7 +278,7 @@ void DiffPage::addOptionsTab() m_caseCheckBox = new TQCheckBox( i18n( "&Ignore changes in case" ), optionButtonGroup ); TQToolTip::add( m_caseCheckBox, i18n( "This corresponds to the -i diff option." ) ); - TQHBoxLayout* groupLayout = new TQHBoxLayout( tqlayout, -1, "regexp_horizontal_layout" ); + TQHBoxLayout* groupLayout = new TQHBoxLayout( layout, -1, "regexp_horizontal_layout" ); groupLayout->setMargin( KDialog::marginHint() ); m_ignoreRegExpCheckBox = new TQCheckBox( i18n( "Ignore regexp:" ), page ); @@ -298,7 +298,7 @@ void DiffPage::addOptionsTab() } TQVButtonGroup* moreOptionButtonGroup = new TQVButtonGroup( i18n( "Whitespace" ), page ); - tqlayout->addWidget( moreOptionButtonGroup ); + layout->addWidget( moreOptionButtonGroup ); moreOptionButtonGroup->setMargin( KDialog::marginHint() ); m_tabsCheckBox = new TQCheckBox( i18n( "E&xpand tabs to spaces in output" ), moreOptionButtonGroup ); @@ -312,7 +312,7 @@ void DiffPage::addOptionsTab() m_ignoreTabExpansionCheckBox = new TQCheckBox( i18n( "Igno&re changes due to tab expansion" ), moreOptionButtonGroup ); TQToolTip::add( m_ignoreTabExpansionCheckBox, i18n( "This option corresponds to the -E diff option." ) ); - tqlayout->addStretch( 1 ); + layout->addStretch( 1 ); page->setMinimumSize( sizeHintForWidget( page ) ); addTab( page, i18n( "O&ptions" ) ); @@ -321,16 +321,16 @@ void DiffPage::addOptionsTab() void DiffPage::addExcludeTab() { TQWidget* page = new TQWidget( this ); - TQVBoxLayout* tqlayout = new TQVBoxLayout( page ); - tqlayout->setSpacing( KDialog::spacingHint() ); - tqlayout->setMargin( KDialog::marginHint() ); + TQVBoxLayout* layout = new TQVBoxLayout( page ); + layout->setSpacing( KDialog::spacingHint() ); + layout->setMargin( KDialog::marginHint() ); TQHGroupBox* excludeFilePatternGroupBox = new TQHGroupBox( i18n( "File Pattern to Exclude" ), page ); m_excludeFilePatternCheckBox = new TQCheckBox( "", excludeFilePatternGroupBox ); TQToolTip::add( m_excludeFilePatternCheckBox, i18n( "If this is checked you can enter a shell pattern in the text box on the right or select entries from the list." ) ); m_excludeFilePatternEditListBox = new KEditListBox( excludeFilePatternGroupBox, "exclude_file_pattern_editlistbox", false, KEditListBox::Add|KEditListBox::Remove ); TQToolTip::add( m_excludeFilePatternEditListBox, i18n( "Here you can enter or remove a shell pattern or select one or more entries from the list." ) ); - tqlayout->addWidget( excludeFilePatternGroupBox ); + layout->addWidget( excludeFilePatternGroupBox ); connect( m_excludeFilePatternCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotExcludeFilePatternToggled(bool))); @@ -342,11 +342,11 @@ void DiffPage::addExcludeTab() TQToolTip::add( m_excludeFileURLComboBox, i18n( "Here you can enter the URL of a file with shell patterns to ignore during the comparison of the folders." ) ); m_excludeFileURLRequester = new KURLRequester( m_excludeFileURLComboBox, excludeFileNameGroupBox, "exclude_file_name_urlrequester" ); TQToolTip::add( m_excludeFileURLRequester, i18n( "Any file you select in the dialog that pops up when you click it will be put in the dialog to the left of this button." ) ); - tqlayout->addWidget( excludeFileNameGroupBox ); + layout->addWidget( excludeFileNameGroupBox ); connect( m_excludeFileCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotExcludeFileToggled(bool))); - tqlayout->addStretch( 1 ); + layout->addStretch( 1 ); page->setMinimumSize( sizeHintForWidget( page ) ); addTab( page, i18n( "&Exclude" ) ); diff --git a/kompare/libdialogpages/filespage.cpp b/kompare/libdialogpages/filespage.cpp index 0bbc87fe..82276439 100644 --- a/kompare/libdialogpages/filespage.cpp +++ b/kompare/libdialogpages/filespage.cpp @@ -16,7 +16,7 @@ ** ***************************************************************************/ -#include <tqlayout.h> +#include <layout.h> #include <tqgroupbox.h> #include <kapplication.h> @@ -34,9 +34,9 @@ FilesPage::FilesPage( TQWidget* parent ) : PageBase( parent ), m_URLChanged( false ) { TQWidget* page = new TQWidget( this ); - TQVBoxLayout* tqlayout = new TQVBoxLayout( page ); - tqlayout->setSpacing( KDialog::spacingHint() ); - tqlayout->setMargin( KDialog::marginHint() ); + TQVBoxLayout* layout = new TQVBoxLayout( page ); + layout->setSpacing( KDialog::spacingHint() ); + layout->setMargin( KDialog::marginHint() ); m_firstGB = new TQGroupBox( 1, Qt::Vertical, "You have to set this moron :)", page ); m_firstURLComboBox = new KURLComboBox( KURLComboBox::Both, true, m_firstGB, "SourceURLComboBox" ); @@ -54,11 +54,11 @@ FilesPage::FilesPage( TQWidget* parent ) : PageBase( parent ), m_URLChanged( fal m_encodingComboBox = new TQComboBox( false, m_thirdGB, "encoding_combobox" ); m_encodingComboBox->insertStringList( KGlobal::charsets()->availableEncodingNames() ); - tqlayout->addWidget( m_firstGB ); - tqlayout->addWidget( m_secondGB ); - tqlayout->addWidget( m_thirdGB ); + layout->addWidget( m_firstGB ); + layout->addWidget( m_secondGB ); + layout->addWidget( m_thirdGB ); - tqlayout->addStretch( 1 ); + layout->addStretch( 1 ); page->setMinimumSize( sizeHintForWidget( page ) ); addTab( page, i18n( "&Files" ) ); diff --git a/kompare/libdialogpages/pagebase.cpp b/kompare/libdialogpages/pagebase.cpp index 33c45dba..3a35e479 100644 --- a/kompare/libdialogpages/pagebase.cpp +++ b/kompare/libdialogpages/pagebase.cpp @@ -17,7 +17,7 @@ ** ***************************************************************************/ -#include <tqlayout.h> +#include <layout.h> #include <tqobjectlist.h> #include "pagebase.h" @@ -36,9 +36,9 @@ PageBase::~PageBase() TQSize PageBase::sizeHintForWidget( TQWidget* widget ) { // - // The size is computed by adding the tqsizeHint().height() of all - // widget tqchildren and taking the width of the widest child and adding - // tqlayout()->margin() and tqlayout()->spacing() + // The size is computed by adding the sizeHint().height() of all + // widget children and taking the width of the widest child and adding + // layout()->margin() and layout()->spacing() // // this code in this method has been ripped out of a file in kbabel @@ -57,7 +57,7 @@ TQSize PageBase::sizeHintForWidget( TQWidget* widget ) numChild += 1; TQWidget *w=((TQWidget*)o); - TQSize s = w->tqsizeHint(); + TQSize s = w->sizeHint(); if( s.isEmpty() == true ) { s = TQSize( 50, 100 ); // Default size @@ -72,8 +72,8 @@ TQSize PageBase::sizeHintForWidget( TQWidget* widget ) if( numChild > 0 ) { - size.setHeight( size.height() + widget->tqlayout()->spacing()*(numChild-1) ); - size += TQSize( widget->tqlayout()->margin()*2, widget->tqlayout()->margin()*2 + 1 ); + size.setHeight( size.height() + widget->layout()->spacing()*(numChild-1) ); + size += TQSize( widget->layout()->margin()*2, widget->layout()->margin()*2 + 1 ); } else { diff --git a/kompare/libdialogpages/viewpage.cpp b/kompare/libdialogpages/viewpage.cpp index 827e8a4d..ab80506c 100644 --- a/kompare/libdialogpages/viewpage.cpp +++ b/kompare/libdialogpages/viewpage.cpp @@ -21,7 +21,7 @@ #include <tqgroupbox.h> #include <tqhgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqspinbox.h> #include <kapplication.h> @@ -36,45 +36,45 @@ ViewPage::ViewPage( TQWidget* parent ) : PageBase( parent ) { TQWidget* page; - TQVBoxLayout* tqlayout; - TQGroupBox* tqcolorGroupBox; + TQVBoxLayout* layout; + TQGroupBox* colorGroupBox; TQHGroupBox* snolGroupBox; TQHGroupBox* tabGroupBox; TQLabel* label; page = new TQWidget( this ); - tqlayout = new TQVBoxLayout( page ); - tqlayout->setSpacing( KDialog::spacingHint() ); - tqlayout->setMargin( KDialog::marginHint() ); + layout = new TQVBoxLayout( page ); + layout->setSpacing( KDialog::spacingHint() ); + layout->setMargin( KDialog::marginHint() ); // add a groupbox - tqcolorGroupBox = new TQGroupBox( 2, Qt::Horizontal, i18n( "Colors" ), page ); - tqlayout->addWidget( tqcolorGroupBox ); - tqcolorGroupBox->setMargin( KDialog::marginHint() ); + colorGroupBox = new TQGroupBox( 2, Qt::Horizontal, i18n( "Colors" ), page ); + layout->addWidget( colorGroupBox ); + colorGroupBox->setMargin( KDialog::marginHint() ); // add the removeColor - label = new TQLabel( i18n( "Removed color:" ), tqcolorGroupBox ); - m_removedColorButton = new KColorButton( tqcolorGroupBox ); + label = new TQLabel( i18n( "Removed color:" ), colorGroupBox ); + m_removedColorButton = new KColorButton( colorGroupBox ); label->setBuddy( m_removedColorButton ); // add the changeColor - label = new TQLabel( i18n( "Changed color:" ), tqcolorGroupBox ); - m_changedColorButton = new KColorButton( tqcolorGroupBox ); + label = new TQLabel( i18n( "Changed color:" ), colorGroupBox ); + m_changedColorButton = new KColorButton( colorGroupBox ); label->setBuddy( m_changedColorButton ); // add the addColor - label = new TQLabel( i18n( "Added color:" ), tqcolorGroupBox ); - m_addedColorButton = new KColorButton( tqcolorGroupBox ); + label = new TQLabel( i18n( "Added color:" ), colorGroupBox ); + m_addedColorButton = new KColorButton( colorGroupBox ); label->setBuddy( m_addedColorButton ); // add the appliedColor - label = new TQLabel( i18n( "Applied color:" ), tqcolorGroupBox ); - m_appliedColorButton = new KColorButton( tqcolorGroupBox ); + label = new TQLabel( i18n( "Applied color:" ), colorGroupBox ); + m_appliedColorButton = new KColorButton( colorGroupBox ); label->setBuddy( m_appliedColorButton ); // scroll number of lines (snol) snolGroupBox = new TQHGroupBox( i18n( "Mouse Wheel" ), page ); - tqlayout->addWidget( snolGroupBox ); + layout->addWidget( snolGroupBox ); snolGroupBox->setMargin( KDialog::marginHint() ); label = new TQLabel( i18n( "Number of lines:" ), snolGroupBox ); @@ -84,25 +84,25 @@ ViewPage::ViewPage( TQWidget* parent ) : PageBase( parent ) // Temporarily here for testing... // number of spaces for a tab character stuff tabGroupBox = new TQHGroupBox( i18n( "Tabs to Spaces" ), page ); - tqlayout->addWidget( tabGroupBox ); + layout->addWidget( tabGroupBox ); tabGroupBox->setMargin( KDialog::marginHint() ); label = new TQLabel( i18n( "Number of spaces to convert a tab character to:" ), tabGroupBox ); m_tabSpinBox = new TQSpinBox( 1, 16, 1, tabGroupBox ); label->setBuddy( m_tabSpinBox ); - tqlayout->addStretch( 1 ); + layout->addStretch( 1 ); page->setMinimumSize( sizeHintForWidget( page ) ); addTab( page, i18n( "A&ppearance" ) ); page = new TQWidget( this ); - tqlayout = new TQVBoxLayout( page ); - tqlayout->setSpacing( KDialog::spacingHint() ); - tqlayout->setMargin( KDialog::marginHint() ); + layout = new TQVBoxLayout( page ); + layout->setSpacing( KDialog::spacingHint() ); + layout->setMargin( KDialog::marginHint() ); TQHGroupBox* gb = new TQHGroupBox( i18n( "Text Font" ), page ); - tqlayout->addWidget( gb ); + layout->addWidget( gb ); gb->setMargin( KDialog::marginHint() ); label = new TQLabel( i18n( "Font:" ), gb ); @@ -113,7 +113,7 @@ ViewPage::ViewPage( TQWidget* parent ) : PageBase( parent ) m_fontSizeSpinBox = new TQSpinBox( 6, 24, 1, gb, "fontsize" ); label->setBuddy( m_fontSizeSpinBox ); - tqlayout->addStretch( 1 ); + layout->addStretch( 1 ); page->setMinimumSize( sizeHintForWidget( page ) ); addTab( page, i18n( "&Fonts" ) ); diff --git a/kompare/libdiff2/difference.h b/kompare/libdiff2/difference.h index 4e440222..87b8f556 100644 --- a/kompare/libdiff2/difference.h +++ b/kompare/libdiff2/difference.h @@ -130,7 +130,7 @@ public: protected: void calculateHash() { - unsigned short const* str = reinterpret_cast<unsigned short const*>( m_string.tqunicode() ); + unsigned short const* str = reinterpret_cast<unsigned short const*>( m_string.unicode() ); const unsigned int len = m_string.length(); m_hash = 1315423911; diff --git a/kompare/libdiff2/diffhunk.cpp b/kompare/libdiff2/diffhunk.cpp index efa7e12d..3b48d796 100644 --- a/kompare/libdiff2/diffhunk.cpp +++ b/kompare/libdiff2/diffhunk.cpp @@ -97,16 +97,16 @@ TQString DiffHunk::recreateHunk() const } // recreate header - hunk += TQString::tqfromLatin1( "@@ -%1,%3 +%2,%4 @@" ) - .tqarg( m_sourceLine ) - .tqarg( m_destinationLine ) - .tqarg( slc ) - .tqarg( dlc ); + hunk += TQString::fromLatin1( "@@ -%1,%3 +%2,%4 @@" ) + .arg( m_sourceLine ) + .arg( m_destinationLine ) + .arg( slc ) + .arg( dlc ); if ( !m_function.isEmpty() ) hunk += " " + m_function; - hunk += TQString::tqfromLatin1( "\n" ); + hunk += TQString::fromLatin1( "\n" ); hunk += differences; diff --git a/kompare/libdiff2/diffmodel.cpp b/kompare/libdiff2/diffmodel.cpp index cd348dfc..1b3822b0 100644 --- a/kompare/libdiff2/diffmodel.cpp +++ b/kompare/libdiff2/diffmodel.cpp @@ -152,13 +152,13 @@ TQString DiffModel::recreateDiff() const TQString diff; // recreate header - TQString tab = TQString::tqfromLatin1( "\t" ); - TQString nl = TQString::tqfromLatin1( "\n" ); - diff += TQString::tqfromLatin1( "--- %1\t%2" ).tqarg( m_source ).tqarg( m_sourceTimestamp ); + TQString tab = TQString::fromLatin1( "\t" ); + TQString nl = TQString::fromLatin1( "\n" ); + diff += TQString::fromLatin1( "--- %1\t%2" ).arg( m_source ).arg( m_sourceTimestamp ); if ( !m_sourceRevision.isEmpty() ) diff += tab + m_sourceRevision; diff += nl; - diff += TQString::tqfromLatin1( "+++ %1\t%2" ).tqarg( m_destination ).tqarg( m_destinationTimestamp ); + diff += TQString::fromLatin1( "+++ %1\t%2" ).arg( m_destination ).arg( m_destinationTimestamp ); if ( !m_destinationRevision.isEmpty() ) diff += tab + m_destinationRevision; diff += nl; diff --git a/kompare/libdiff2/komparemodellist.cpp b/kompare/libdiff2/komparemodellist.cpp index 89912eac..fc27fb56 100644 --- a/kompare/libdiff2/komparemodellist.cpp +++ b/kompare/libdiff2/komparemodellist.cpp @@ -22,7 +22,7 @@ #include <tqfile.h> #include <tqdir.h> #include <tqregexp.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqvaluelist.h> #include <kaction.h> @@ -235,7 +235,7 @@ bool KompareModelList::openFileAndDiff( const TQString& file, const TQString& di if ( parseDiffOutput( readFile( diff ) ) != 0 ) { - emit error( i18n( "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff file.</qt>" ).tqarg( diff ) ); + emit error( i18n( "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff file.</qt>" ).arg( diff ) ); return false; } @@ -243,7 +243,7 @@ bool KompareModelList::openFileAndDiff( const TQString& file, const TQString& di if ( !blendOriginalIntoModelList( file ) ) { kdDebug(8101) << "Oops cant blend original file into modellist : " << file << endl; - emit( i18n( "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>" ).tqarg( diff ).tqarg( file ) ); + emit( i18n( "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>" ).arg( diff ).arg( file ) ); return false; } @@ -259,7 +259,7 @@ bool KompareModelList::openDirAndDiff( const TQString& dir, const TQString& diff if ( parseDiffOutput( readFile( diff ) ) != 0 ) { - emit error( i18n( "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff file.</qt>" ).tqarg( diff ) ); + emit error( i18n( "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff file.</qt>" ).arg( diff ) ); return false; } @@ -268,7 +268,7 @@ bool KompareModelList::openDirAndDiff( const TQString& dir, const TQString& diff { // Trouble blending the original into the model kdDebug(8101) << "Oops cant blend original dir into modellist : " << dir << endl; - emit error( i18n( "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>.</qt>" ).tqarg( diff ).tqarg( dir ) ); + emit error( i18n( "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>.</qt>" ).arg( diff ).arg( dir ) ); return false; } @@ -347,7 +347,7 @@ bool KompareModelList::saveDestination( DiffModel* model ) temp->close(); if( temp->status() != 0 ) { - emit error( i18n( "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" ).tqarg( temp->name() ) ); + emit error( i18n( "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" ).arg( temp->name() ) ); temp->unlink(); delete temp; return false; @@ -380,7 +380,7 @@ bool KompareModelList::saveDestination( DiffModel* model ) if ( !result ) { - emit error( i18n( "<qt>Could not upload the temporary file to the destination location <b>%1</b>. The temporary file is still available under: <b>%2</b>. You can manually copy it to the right place.</qt>" ).tqarg( m_destination ).tqarg( temp->name() ) ); + emit error( i18n( "<qt>Could not upload the temporary file to the destination location <b>%1</b>. The temporary file is still available under: <b>%2</b>. You can manually copy it to the right place.</qt>" ).arg( m_destination ).arg( temp->name() ) ); } else { diff --git a/kompare/libdiff2/kompareprocess.cpp b/kompare/libdiff2/kompareprocess.cpp index db165ae5..df1c5b14 100644 --- a/kompare/libdiff2/kompareprocess.cpp +++ b/kompare/libdiff2/kompareprocess.cpp @@ -21,7 +21,7 @@ #include <tqdir.h> #include <tqstringlist.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <kcharsets.h> #include <kdebug.h> diff --git a/kompare/libdiff2/levenshteintable.cpp b/kompare/libdiff2/levenshteintable.cpp index c031ee61..7e4ddbbe 100644 --- a/kompare/libdiff2/levenshteintable.cpp +++ b/kompare/libdiff2/levenshteintable.cpp @@ -113,8 +113,8 @@ unsigned int LevenshteinTable::createTable( DifferenceString* source, Difference unsigned int m = s.length(); unsigned int n = d.length(); - const TQChar* sq = s.tqunicode(); - const TQChar* dq = d.tqunicode(); + const TQChar* sq = s.unicode(); + const TQChar* dq = d.unicode(); if ( m == 1 ) return --n; diff --git a/kompare/libdiff2/perforceparser.cpp b/kompare/libdiff2/perforceparser.cpp index b0d54157..0e0a2aef 100644 --- a/kompare/libdiff2/perforceparser.cpp +++ b/kompare/libdiff2/perforceparser.cpp @@ -103,8 +103,8 @@ bool PerforceParser::parseContextDiffHeader() destinationFileRE.exactMatch( m_contextDiffHeader1.cap( 2 ) ); kdDebug(8101) << "Matched length = " << sourceFileRE.matchedLength() << endl; kdDebug(8101) << "Matched length = " << destinationFileRE.matchedLength() << endl; - kdDebug(8101) << "Captured texts = " << sourceFileRE.tqcapturedTexts() << endl; - kdDebug(8101) << "Captured texts = " << destinationFileRE.tqcapturedTexts() << endl; + kdDebug(8101) << "Captured texts = " << sourceFileRE.capturedTexts() << endl; + kdDebug(8101) << "Captured texts = " << destinationFileRE.capturedTexts() << endl; kdDebug(8101) << "Source File : " << sourceFileRE.cap( 1 ) << endl; kdDebug(8101) << "Destination File : " << destinationFileRE.cap( 1 ) << endl; m_currentModel->setSourceFile ( sourceFileRE.cap( 1 ) ); @@ -117,7 +117,7 @@ bool PerforceParser::parseContextDiffHeader() else { kdDebug(8101) << "Matched length = " << m_contextDiffHeader1.matchedLength() << endl; - kdDebug(8101) << "Captured texts = " << m_contextDiffHeader1.tqcapturedTexts() << endl; + kdDebug(8101) << "Captured texts = " << m_contextDiffHeader1.capturedTexts() << endl; } } @@ -149,8 +149,8 @@ bool PerforceParser::parseNormalDiffHeader() destinationFileRE.exactMatch( m_normalDiffHeader.cap( 2 ) ); kdDebug(8101) << "Matched length = " << sourceFileRE.matchedLength() << endl; kdDebug(8101) << "Matched length = " << destinationFileRE.matchedLength() << endl; - kdDebug(8101) << "Captured texts = " << sourceFileRE.tqcapturedTexts() << endl; - kdDebug(8101) << "Captured texts = " << destinationFileRE.tqcapturedTexts() << endl; + kdDebug(8101) << "Captured texts = " << sourceFileRE.capturedTexts() << endl; + kdDebug(8101) << "Captured texts = " << destinationFileRE.capturedTexts() << endl; kdDebug(8101) << "Source File : " << sourceFileRE.cap( 1 ) << endl; kdDebug(8101) << "Destination File : " << destinationFileRE.cap( 1 ) << endl; m_currentModel->setSourceFile ( sourceFileRE.cap( 1 ) ); @@ -163,7 +163,7 @@ bool PerforceParser::parseNormalDiffHeader() else { kdDebug(8101) << "Matched length = " << m_normalDiffHeader.matchedLength() << endl; - kdDebug(8101) << "Captured texts = " << m_normalDiffHeader.tqcapturedTexts() << endl; + kdDebug(8101) << "Captured texts = " << m_normalDiffHeader.capturedTexts() << endl; } } @@ -200,8 +200,8 @@ bool PerforceParser::parseUnifiedDiffHeader() destinationFileRE.exactMatch( m_unifiedDiffHeader1.cap( 2 ) ); // kdDebug(8101) << "Matched length = " << sourceFileRE.matchedLength() << endl; // kdDebug(8101) << "Matched length = " << destinationFileRE.matchedLength() << endl; -// kdDebug(8101) << "Captured texts = " << sourceFileRE.tqcapturedTexts() << endl; -// kdDebug(8101) << "Captured texts = " << destinationFileRE.tqcapturedTexts() << endl; +// kdDebug(8101) << "Captured texts = " << sourceFileRE.capturedTexts() << endl; +// kdDebug(8101) << "Captured texts = " << destinationFileRE.capturedTexts() << endl; // kdDebug(8101) << "Source File : " << sourceFileRE.cap( 1 ) << endl; // kdDebug(8101) << "Destination File : " << destinationFileRE.cap( 1 ) << endl; m_currentModel->setSourceFile ( sourceFileRE.cap( 1 ) ); @@ -214,7 +214,7 @@ bool PerforceParser::parseUnifiedDiffHeader() else { // kdDebug(8101) << "Matched length = " << m_unifiedDiffHeader1.matchedLength() << endl; -// kdDebug(8101) << "Captured texts = " << m_unifiedDiffHeader1.tqcapturedTexts() << endl; +// kdDebug(8101) << "Captured texts = " << m_unifiedDiffHeader1.capturedTexts() << endl; } } diff --git a/kompare/tests/cvsdiff/context.diff b/kompare/tests/cvsdiff/context.diff index 1d6eaac3..cef4f0cf 100644 --- a/kompare/tests/cvsdiff/context.diff +++ b/kompare/tests/cvsdiff/context.diff @@ -12,7 +12,7 @@ diff -c -r1.2 dcopfind.cpp ! bool findObject( const char* app, const char* obj, const char* func, int argc, char** args ) { - QString f = func; // Qt is better with tqunicode strings, so use one. + QString f = func; // Qt is better with unicode strings, so use one. int left = f.find( '(' ); --- 36,42 ---- static bool bAppIdOnly = 0; @@ -20,7 +20,7 @@ diff -c -r1.2 dcopfind.cpp ! bool findObject( const char* app, const char* obj, const char* func, QCStringList args ) { - QString f = func; // Qt is better with tqunicode strings, so use one. + QString f = func; // Qt is better with unicode strings, so use one. int left = f.find( '(' ); *************** *** 118,124 **** diff --git a/kompare/tests/cvsdiff/contextm.diff b/kompare/tests/cvsdiff/contextm.diff index 6877889c..1da3a860 100644 --- a/kompare/tests/cvsdiff/contextm.diff +++ b/kompare/tests/cvsdiff/contextm.diff @@ -82,7 +82,7 @@ diff -c -r1.26 dcop.cpp ! void callFunction( const char* app, const char* obj, const char* func, int argc, char** args ) { - - QString f = func; // Qt is better with tqunicode strings, so use one. + QString f = func; // Qt is better with unicode strings, so use one. int left = f.find( '(' ); int right = f.find( ')' ); --- 146,153 ---- @@ -91,7 +91,7 @@ diff -c -r1.26 dcop.cpp ! void callFunction( const char* app, const char* obj, const char* func, const QCStringList args ) { - QString f = func; // Qt is better with tqunicode strings, so use one. + QString f = func; // Qt is better with unicode strings, so use one. int left = f.find( '(' ); int right = f.find( ')' ); *************** @@ -747,7 +747,7 @@ diff -c -r1.2 dcopfind.cpp ! bool findObject( const char* app, const char* obj, const char* func, int argc, char** args ) { - QString f = func; // Qt is better with tqunicode strings, so use one. + QString f = func; // Qt is better with unicode strings, so use one. int left = f.find( '(' ); --- 36,42 ---- static bool bAppIdOnly = 0; @@ -755,7 +755,7 @@ diff -c -r1.2 dcopfind.cpp ! bool findObject( const char* app, const char* obj, const char* func, QCStringList args ) { - QString f = func; // Qt is better with tqunicode strings, so use one. + QString f = func; // Qt is better with unicode strings, so use one. int left = f.find( '(' ); *************** *** 118,124 **** diff --git a/kompare/tests/cvsdiff/unified.diff b/kompare/tests/cvsdiff/unified.diff index 63dbb88a..0c8a20fb 100644 --- a/kompare/tests/cvsdiff/unified.diff +++ b/kompare/tests/cvsdiff/unified.diff @@ -12,7 +12,7 @@ diff -u -r1.2 dcopfind.cpp -bool findObject( const char* app, const char* obj, const char* func, int argc, char** args ) +bool findObject( const char* app, const char* obj, const char* func, QCStringList args ) { - QString f = func; // Qt is better with tqunicode strings, so use one. + QString f = func; // Qt is better with unicode strings, so use one. int left = f.find( '(' ); @@ -118,7 +118,7 @@ f = fc; diff --git a/kompare/tests/cvsdiff/unifiedm.diff b/kompare/tests/cvsdiff/unifiedm.diff index 788b469d..e6a6e040 100644 --- a/kompare/tests/cvsdiff/unifiedm.diff +++ b/kompare/tests/cvsdiff/unifiedm.diff @@ -66,7 +66,7 @@ diff -u -r1.26 dcop.cpp +void callFunction( const char* app, const char* obj, const char* func, const QCStringList args ) { - - QString f = func; // Qt is better with tqunicode strings, so use one. + QString f = func; // Qt is better with unicode strings, so use one. int left = f.find( '(' ); int right = f.find( ')' ); @@ -136,7 +163,7 @@ @@ -668,7 +668,7 @@ diff -u -r1.2 dcopfind.cpp -bool findObject( const char* app, const char* obj, const char* func, int argc, char** args ) +bool findObject( const char* app, const char* obj, const char* func, QCStringList args ) { - QString f = func; // Qt is better with tqunicode strings, so use one. + QString f = func; // Qt is better with unicode strings, so use one. int left = f.find( '(' ); @@ -118,7 +118,7 @@ f = fc; diff --git a/kompare/tests/diff/contextm.diff b/kompare/tests/diff/contextm.diff index 76c3f974..38db371e 100644 --- a/kompare/tests/diff/contextm.diff +++ b/kompare/tests/diff/contextm.diff @@ -78,7 +78,7 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp ! void callFunction( const char* app, const char* obj, const char* func, int argc, char** args ) { - - QString f = func; // Qt is better with tqunicode strings, so use one. + QString f = func; // Qt is better with unicode strings, so use one. int left = f.find( '(' ); int right = f.find( ')' ); --- 146,153 ---- @@ -87,7 +87,7 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp ! void callFunction( const char* app, const char* obj, const char* func, const QCStringList args ) { - QString f = func; // Qt is better with tqunicode strings, so use one. + QString f = func; // Qt is better with unicode strings, so use one. int left = f.find( '(' ); int right = f.find( ')' ); *************** @@ -737,7 +737,7 @@ diff -cr dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp ! bool findObject( const char* app, const char* obj, const char* func, int argc, char** args ) { - QString f = func; // Qt is better with tqunicode strings, so use one. + QString f = func; // Qt is better with unicode strings, so use one. int left = f.find( '(' ); --- 36,42 ---- static bool bAppIdOnly = 0; @@ -745,7 +745,7 @@ diff -cr dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp ! bool findObject( const char* app, const char* obj, const char* func, QCStringList args ) { - QString f = func; // Qt is better with tqunicode strings, so use one. + QString f = func; // Qt is better with unicode strings, so use one. int left = f.find( '(' ); *************** *** 118,124 **** diff --git a/kompare/tests/diff/unifiedm.diff b/kompare/tests/diff/unifiedm.diff index 4296e44f..7763ce5e 100644 --- a/kompare/tests/diff/unifiedm.diff +++ b/kompare/tests/diff/unifiedm.diff @@ -62,7 +62,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp +void callFunction( const char* app, const char* obj, const char* func, const QCStringList args ) { - - QString f = func; // Qt is better with tqunicode strings, so use one. + QString f = func; // Qt is better with unicode strings, so use one. int left = f.find( '(' ); int right = f.find( ')' ); @@ -136,7 +163,7 @@ @@ -659,7 +659,7 @@ diff -aur dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp -bool findObject( const char* app, const char* obj, const char* func, int argc, char** args ) +bool findObject( const char* app, const char* obj, const char* func, QCStringList args ) { - QString f = func; // Qt is better with tqunicode strings, so use one. + QString f = func; // Qt is better with unicode strings, so use one. int left = f.find( '(' ); @@ -118,7 +118,7 @@ f = fc; |