TDE
/
kdiff3
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kdiff3
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove the tq in front of these incorrectly TQt4-converted methods/data members:

Browse Source 
tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent e239d13ed0
commit 3d7cc5d294
11 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File

2
kdiff3plugin/kdiff3plugin.cpp
Unescape View File

@ -70,7 +70,7 @@ KDiff3Plugin::KDiff3Plugin( KonqPopupMenu* pPopupmenu, const char *name, const T
if (KStandardDirs::findExe ("kdiff3").isNull ()) if (KStandardDirs::findExe ("kdiff3").isNull ())
return; return;
m_pParentWidget = pPopupmenu->tqparentWidget(); m_pParentWidget = pPopupmenu->parentWidget();
KGlobal::locale()->insertCatalogue("kdiff3_plugin"); KGlobal::locale()->insertCatalogue("kdiff3_plugin");

2
src/diff.h
Unescape View File

@ -456,7 +456,7 @@ enum e_CoordType { eFileCoords, eD3LLineCoords, eWrapCoords };
void calcTokenPos( const TQString&, int posOnScreen, int& pos1, int& pos2, int tabSize ); void calcTokenPos( const TQString&, int posOnScreen, int& pos1, int& pos2, int tabSize );
TQString calcHistorySortKey( const TQString& keyOrder, TQRegExp& matchedRegExpr, const TQStringList& tqparenthesesGroupList ); TQString calcHistorySortKey( const TQString& keyOrder, TQRegExp& matchedRegExpr, const TQStringList& parenthesesGroupList );
bool findParenthesesGroups( const TQString& s, TQStringList& sl ); bool findParenthesesGroups( const TQString& s, TQStringList& sl );
#endif #endif

16
src/directorymergewindow.cpp
Unescape View File

@ -676,7 +676,7 @@ bool DirectoryMergeWindow::init
TQDir::setCurrent(origCurrentDirectory); TQDir::setCurrent(origCurrentDirectory);
// Try to improve the view a little bit. // Try to improve the view a little bit.
TQWidget* pParent = tqparentWidget(); TQWidget* pParent = parentWidget();
TQSplitter* pSplitter = static_cast<TQSplitter*>(pParent); TQSplitter* pSplitter = static_cast<TQSplitter*>(pParent);
if (pSplitter!=0) if (pSplitter!=0)
{ {
@ -1274,7 +1274,7 @@ void DirectoryMergeWindow::prepareListView( ProgressProxy& pp )
new DirMergeItem( dirMfi.m_pDMI, filePart, &mfi ); new DirMergeItem( dirMfi.m_pDMI, filePart, &mfi );
mfi.m_pParent = &dirMfi; mfi.m_pParent = &dirMfi;
if ( !bEqual ) // Set all tqparents to "not equal" if ( !bEqual ) // Set all parents to "not equal"
{ {
MergeFileInfos* p = mfi.m_pParent; MergeFileInfos* p = mfi.m_pParent;
while(p!=0) while(p!=0)
@ -2484,8 +2484,8 @@ bool DirectoryMergeWindow::mergeFLD( const TQString& nameA,const TQString& nameB
int pos=nameDest.tqfindRev('/'); int pos=nameDest.tqfindRev('/');
if ( pos>0 ) if ( pos>0 )
{ {
TQString tqparentName = nameDest.left(pos); TQString parentName = nameDest.left(pos);
bool bSuccess = makeDir(tqparentName, true /*quiet*/); bool bSuccess = makeDir(parentName, true /*quiet*/);
if (!bSuccess) if (!bSuccess)
return false; return false;
} }
@ -2557,8 +2557,8 @@ bool DirectoryMergeWindow::copyFLD( const TQString& srcName, const TQString& des
int pos=destName.tqfindRev('/'); int pos=destName.tqfindRev('/');
if ( pos>0 ) if ( pos>0 )
{ {
TQString tqparentName = destName.left(pos); TQString parentName = destName.left(pos);
bool bSuccess = makeDir(tqparentName, true /*quiet*/); bool bSuccess = makeDir(parentName, true /*quiet*/);
if (!bSuccess) if (!bSuccess)
return false; return false;
} }
@ -2631,8 +2631,8 @@ bool DirectoryMergeWindow::makeDir( const TQString& name, bool bQuiet )
int pos=name.tqfindRev('/'); int pos=name.tqfindRev('/');
if ( pos>0 ) if ( pos>0 )
{ {
TQString tqparentName = name.left(pos); TQString parentName = name.left(pos);
bool bSuccess = makeDir(tqparentName,true); bool bSuccess = makeDir(parentName,true);
if (!bSuccess) if (!bSuccess)
return false; return false;
} }

6
src/fileaccess.cpp
Unescape View File

@ -1420,7 +1420,7 @@ bool FileAccessJobHandler::listDir( t_DirectoryList* pDirList, bool bRecursive,
void FileAccessJobHandler::slotListDirProcessNewEntries( KIO::Job *, const KIO::UDSEntryList& l ) void FileAccessJobHandler::slotListDirProcessNewEntries( KIO::Job *, const KIO::UDSEntryList& l )
{ {
KURL tqparentUrl( m_pFileAccess->m_absFilePath ); KURL parentUrl( m_pFileAccess->m_absFilePath );
KIO::UDSEntryList::ConstIterator i; KIO::UDSEntryList::ConstIterator i;
for ( i=l.begin(); i!=l.end(); ++i ) for ( i=l.begin(); i!=l.end(); ++i )
@ -1431,7 +1431,7 @@ void FileAccessJobHandler::slotListDirProcessNewEntries( KIO::Job *, const KIO::
if ( fa.filePath() != "." && fa.filePath() != ".." ) if ( fa.filePath() != "." && fa.filePath() != ".." )
{ {
fa.m_url = tqparentUrl; fa.m_url = parentUrl;
fa.m_url.addPath( fa.filePath() ); fa.m_url.addPath( fa.filePath() );
fa.m_absFilePath = fa.m_url.url(); fa.m_absFilePath = fa.m_url.url();
m_pDirList->push_back( fa ); m_pDirList->push_back( fa );
@ -1671,7 +1671,7 @@ void ProgressDialog::show()
{ {
killTimer( m_progressDelayTimer ); killTimer( m_progressDelayTimer );
m_progressDelayTimer = 0; m_progressDelayTimer = 0;
if ( !isVisible() && (tqparentWidget()==0 || tqparentWidget()->isVisible()) ) if ( !isVisible() && (parentWidget()==0 || parentWidget()->isVisible()) )
{ {
TQDialog::show(); TQDialog::show();
} }

2
src/kdiff3.cpp
Unescape View File

@ -786,7 +786,7 @@ void KDiff3App::slotFilePrint()
int charactersPerLine = columnWidth / fm.width("W"); int charactersPerLine = columnWidth / fm.width("W");
if ( m_pOptionDialog->m_bWordWrap ) if ( m_pOptionDialog->m_bWordWrap )
{ {
// For printing the lines are wrapped differently (this tqinvalidates the first line) // For printing the lines are wrapped differently (this invalidates the first line)
recalcWordWrap( charactersPerLine ); recalcWordWrap( charactersPerLine );
} }

10
src/kdiff3_part.cpp
Unescape View File

@ -35,7 +35,7 @@
#include "version.h" #include "version.h"
KDiff3Part::KDiff3Part( TQWidget *tqparentWidget, const char *widgetName, KDiff3Part::KDiff3Part( TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name ) TQObject *tqparent, const char *name )
: KParts::ReadOnlyPart(tqparent, name) : KParts::ReadOnlyPart(tqparent, name)
{ {
@ -43,10 +43,10 @@ KDiff3Part::KDiff3Part( TQWidget *tqparentWidget, const char *widgetName,
setInstance( KDiff3PartFactory::instance() ); setInstance( KDiff3PartFactory::instance() );
// this should be your custom internal widget // this should be your custom internal widget
m_widget = new KDiff3App( tqparentWidget, widgetName, this ); m_widget = new KDiff3App( parentWidget, widgetName, this );
// This hack is necessary to avoid a crash when the program terminates. // This hack is necessary to avoid a crash when the program terminates.
m_bIsShell = dynamic_cast<KParts::MainWindow*>(tqparentWidget)!=0; m_bIsShell = dynamic_cast<KParts::MainWindow*>(parentWidget)!=0;
// notify the part that this is our internal widget // notify the part that this is our internal widget
setWidget(m_widget); setWidget(m_widget);
@ -270,12 +270,12 @@ KDiff3PartFactory::~KDiff3PartFactory()
s_instance = 0L; s_instance = 0L;
} }
KParts::Part* KDiff3PartFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, KParts::Part* KDiff3PartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name, TQObject *tqparent, const char *name,
const char *classname, const TQStringList&/*args*/ ) const char *classname, const TQStringList&/*args*/ )
{ {
// Create an instance of our Part // Create an instance of our Part
KDiff3Part* obj = new KDiff3Part( tqparentWidget, widgetName, tqparent, name ); KDiff3Part* obj = new KDiff3Part( parentWidget, widgetName, tqparent, name );
// See if we are to be read-write or not // See if we are to be read-write or not
if (TQCString(classname) == "KParts::ReadOnlyPart") if (TQCString(classname) == "KParts::ReadOnlyPart")

4
src/kdiff3_part.h
Unescape View File

@ -43,7 +43,7 @@ public:
/** /**
* Default constructor * Default constructor
*/ */
KDiff3Part(TQWidget *tqparentWidget, const char *widgetName, KDiff3Part(TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name); TQObject *tqparent, const char *name);
/** /**
@ -89,7 +89,7 @@ class KDiff3PartFactory : public KParts::Factory
public: public:
KDiff3PartFactory(); KDiff3PartFactory();
virtual ~KDiff3PartFactory(); virtual ~KDiff3PartFactory();
virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName, virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name, TQObject *tqparent, const char *name,
const char *classname, const TQStringList &args ); const char *classname, const TQStringList &args );
static KInstance* instance(); static KInstance* instance();

2
src/kreplacements/kreplacements.h
Unescape View File

@ -502,7 +502,7 @@ namespace KParts
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName, virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name, TQObject *tqparent, const char *name,
const char *classname, const TQStringList &args )=0; const char *classname, const TQStringList &args )=0;
}; };

14
src/mergeresultwindow.cpp
Unescape View File

@ -1067,10 +1067,10 @@ bool findParenthesesGroups( const TQString& s, TQStringList& sl )
sl.push_back( s.mid( startPos+1, i-startPos-1 ) ); sl.push_back( s.mid( startPos+1, i-startPos-1 ) );
} }
} }
return startPosStack.empty(); // false if tqparentheses don't match return startPosStack.empty(); // false if parentheses don't match
} }
TQString calcHistorySortKey( const TQString& keyOrder, TQRegExp& matchedRegExpr, const TQStringList& tqparenthesesGroupList ) TQString calcHistorySortKey( const TQString& keyOrder, TQRegExp& matchedRegExpr, const TQStringList& parenthesesGroupList )
{ {
TQStringList keyOrderList = TQStringList::split(',', keyOrder ); TQStringList keyOrderList = TQStringList::split(',', keyOrder );
TQString key; TQString key;
@ -1080,7 +1080,7 @@ TQString calcHistorySortKey( const TQString& keyOrder, TQRegExp& matchedRegExpr,
continue; continue;
bool bOk=false; bool bOk=false;
int groupIdx = (*keyIt).toInt(&bOk); int groupIdx = (*keyIt).toInt(&bOk);
if (!bOk || groupIdx<0 || groupIdx >(int)tqparenthesesGroupList.size() ) if (!bOk || groupIdx<0 || groupIdx >(int)parenthesesGroupList.size() )
continue; continue;
TQString s = matchedRegExpr.cap( groupIdx ); TQString s = matchedRegExpr.cap( groupIdx );
if ( groupIdx == 0 ) if ( groupIdx == 0 )
@ -1089,7 +1089,7 @@ TQString calcHistorySortKey( const TQString& keyOrder, TQRegExp& matchedRegExpr,
continue; continue;
} }
TQString groupRegExp = tqparenthesesGroupList[groupIdx-1]; TQString groupRegExp = parenthesesGroupList[groupIdx-1];
if( groupRegExp.tqfind('|')<0 || groupRegExp.tqfind('(')>=0 ) if( groupRegExp.tqfind('|')<0 || groupRegExp.tqfind('(')>=0 )
{ {
bool bOk = false; bool bOk = false;
@ -1137,8 +1137,8 @@ void MergeResultWindow::collectHistoryInformation(
TQRegExp historyStart = m_pOptionDialog->m_historyStartRegExp; TQRegExp historyStart = m_pOptionDialog->m_historyStartRegExp;
++id3l; // Skip line with "$Log ... $" ++id3l; // Skip line with "$Log ... $"
TQRegExp newHistoryEntry = m_pOptionDialog->m_historyEntryStartRegExp; TQRegExp newHistoryEntry = m_pOptionDialog->m_historyEntryStartRegExp;
TQStringList tqparenthesesGroups; TQStringList parenthesesGroups;
findParenthesesGroups( m_pOptionDialog->m_historyEntryStartRegExp, tqparenthesesGroups ); findParenthesesGroups( m_pOptionDialog->m_historyEntryStartRegExp, parenthesesGroups );
TQString key; TQString key;
MergeEditLineList melList; MergeEditLineList melList;
bool bPrevLineIsEmpty = true; bool bPrevLineIsEmpty = true;
@ -1171,7 +1171,7 @@ void MergeResultWindow::collectHistoryInformation(
if ( ! bUseRegExp ) if ( ! bUseRegExp )
key = sLine; key = sLine;
else else
key = calcHistorySortKey(m_pOptionDialog->m_historyEntryStartSortKeyOrder,newHistoryEntry,tqparenthesesGroups); key = calcHistorySortKey(m_pOptionDialog->m_historyEntryStartSortKeyOrder,newHistoryEntry,parenthesesGroups);
melList.clear(); melList.clear();
melList.push_back( MergeEditLine(id3l,src) ); melList.push_back( MergeEditLine(id3l,src) );

4
src/optiondialog.cpp
Unescape View File

@ -906,7 +906,7 @@ void OptionDialog::setupMergePage( void )
gbox->addWidget( m_pHistoryEntryStartRegExpLineEdit, line, 1 ); gbox->addWidget( m_pHistoryEntryStartRegExpLineEdit, line, 1 );
s_historyEntryStartRegExpToolTip = i18n("A version control history entry consists of several lines.\n" s_historyEntryStartRegExpToolTip = i18n("A version control history entry consists of several lines.\n"
"Specify the regular expression to detect the first line (without the leading comment).\n" "Specify the regular expression to detect the first line (without the leading comment).\n"
"Use tqparentheses to group the keys you want to use for sorting.\n" "Use parentheses to group the keys you want to use for sorting.\n"
"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" "If left empty, then KDiff3 assumes that empty lines separate history entries.\n"
"See the documentation for details."); "See the documentation for details.");
TQToolTip::add( label, s_historyEntryStartRegExpToolTip ); TQToolTip::add( label, s_historyEntryStartRegExpToolTip );
@ -928,7 +928,7 @@ void OptionDialog::setupMergePage( void )
gbox->addWidget( label, line, 0 ); gbox->addWidget( label, line, 0 );
m_pHistorySortKeyOrderLineEdit = new OptionLineEdit( defaultSortKeyOrder, "HistoryEntryStartSortKeyOrder", &m_historyEntryStartSortKeyOrder, page, this ); m_pHistorySortKeyOrderLineEdit = new OptionLineEdit( defaultSortKeyOrder, "HistoryEntryStartSortKeyOrder", &m_historyEntryStartSortKeyOrder, page, this );
gbox->addWidget( m_pHistorySortKeyOrderLineEdit, line, 1 ); gbox->addWidget( m_pHistorySortKeyOrderLineEdit, line, 1 );
s_historyEntryStartSortKeyOrderToolTip = i18n("Each tqparentheses used in the regular expression for the history start entry\n" s_historyEntryStartSortKeyOrderToolTip = i18n("Each parentheses used in the regular expression for the history start entry\n"
"groups a key that can be used for sorting.\n" "groups a key that can be used for sorting.\n"
"Specify the list of keys (that are numbered in order of occurrence\n" "Specify the list of keys (that are numbered in order of occurrence\n"
"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n" "starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n"

8
src/smalldialogs.cpp
Unescape View File

@ -552,11 +552,11 @@ void RegExpTester::slotRecalc()
} }
TQStringList tqparenthesesGroups; TQStringList parenthesesGroups;
bool bSuccess = findParenthesesGroups( m_pHistoryEntryStartRegExpEdit->text(), tqparenthesesGroups ); bool bSuccess = findParenthesesGroups( m_pHistoryEntryStartRegExpEdit->text(), parenthesesGroups );
if ( ! bSuccess ) if ( ! bSuccess )
{ {
m_pHistoryEntryStartMatchResult->setText( i18n("Opening and closing tqparentheses don't match in regular expression.") ); m_pHistoryEntryStartMatchResult->setText( i18n("Opening and closing parentheses don't match in regular expression.") );
m_pHistorySortKeyResult->setText( i18n("") ); m_pHistorySortKeyResult->setText( i18n("") );
return; return;
} }
@ -566,7 +566,7 @@ void RegExpTester::slotRecalc()
if ( historyEntryStartRegExp.exactMatch( s ) ) if ( historyEntryStartRegExp.exactMatch( s ) )
{ {
m_pHistoryEntryStartMatchResult->setText( i18n("Match success.") ); m_pHistoryEntryStartMatchResult->setText( i18n("Match success.") );
TQString key = calcHistorySortKey( m_pHistorySortKeyOrderEdit->text(),historyEntryStartRegExp,tqparenthesesGroups); TQString key = calcHistorySortKey( m_pHistorySortKeyOrderEdit->text(),historyEntryStartRegExp,parenthesesGroups);
m_pHistorySortKeyResult->setText(key); m_pHistorySortKeyResult->setText(key);
} }
else else

Write Preview
Loading…
Cancel
Save