summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xkdiff3plugin/kdiff3plugin.cpp2
-rw-r--r--src/diff.h2
-rw-r--r--src/directorymergewindow.cpp16
-rw-r--r--src/fileaccess.cpp6
-rw-r--r--src/kdiff3.cpp2
-rw-r--r--src/kdiff3_part.cpp10
-rw-r--r--src/kdiff3_part.h4
-rw-r--r--src/kreplacements/kreplacements.h2
-rw-r--r--src/mergeresultwindow.cpp14
-rw-r--r--src/optiondialog.cpp4
-rw-r--r--src/smalldialogs.cpp8
11 files changed, 35 insertions, 35 deletions
diff --git a/kdiff3plugin/kdiff3plugin.cpp b/kdiff3plugin/kdiff3plugin.cpp
index 08a3cbe..3cc6cea 100755
--- a/kdiff3plugin/kdiff3plugin.cpp
+++ b/kdiff3plugin/kdiff3plugin.cpp
@@ -70,7 +70,7 @@ KDiff3Plugin::KDiff3Plugin( KonqPopupMenu* pPopupmenu, const char *name, const T
if (KStandardDirs::findExe ("kdiff3").isNull ())
return;
- m_pParentWidget = pPopupmenu->tqparentWidget();
+ m_pParentWidget = pPopupmenu->parentWidget();
KGlobal::locale()->insertCatalogue("kdiff3_plugin");
diff --git a/src/diff.h b/src/diff.h
index adb43b8..ee3076e 100644
--- a/src/diff.h
+++ b/src/diff.h
@@ -456,7 +456,7 @@ enum e_CoordType { eFileCoords, eD3LLineCoords, eWrapCoords };
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 );
#endif
diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp
index f232f61..4d2481d 100644
--- a/src/directorymergewindow.cpp
+++ b/src/directorymergewindow.cpp
@@ -676,7 +676,7 @@ bool DirectoryMergeWindow::init
TQDir::setCurrent(origCurrentDirectory);
// Try to improve the view a little bit.
- TQWidget* pParent = tqparentWidget();
+ TQWidget* pParent = parentWidget();
TQSplitter* pSplitter = static_cast<TQSplitter*>(pParent);
if (pSplitter!=0)
{
@@ -1274,7 +1274,7 @@ void DirectoryMergeWindow::prepareListView( ProgressProxy& pp )
new DirMergeItem( dirMfi.m_pDMI, filePart, &mfi );
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;
while(p!=0)
@@ -2484,8 +2484,8 @@ bool DirectoryMergeWindow::mergeFLD( const TQString& nameA,const TQString& nameB
int pos=nameDest.tqfindRev('/');
if ( pos>0 )
{
- TQString tqparentName = nameDest.left(pos);
- bool bSuccess = makeDir(tqparentName, true /*quiet*/);
+ TQString parentName = nameDest.left(pos);
+ bool bSuccess = makeDir(parentName, true /*quiet*/);
if (!bSuccess)
return false;
}
@@ -2557,8 +2557,8 @@ bool DirectoryMergeWindow::copyFLD( const TQString& srcName, const TQString& des
int pos=destName.tqfindRev('/');
if ( pos>0 )
{
- TQString tqparentName = destName.left(pos);
- bool bSuccess = makeDir(tqparentName, true /*quiet*/);
+ TQString parentName = destName.left(pos);
+ bool bSuccess = makeDir(parentName, true /*quiet*/);
if (!bSuccess)
return false;
}
@@ -2631,8 +2631,8 @@ bool DirectoryMergeWindow::makeDir( const TQString& name, bool bQuiet )
int pos=name.tqfindRev('/');
if ( pos>0 )
{
- TQString tqparentName = name.left(pos);
- bool bSuccess = makeDir(tqparentName,true);
+ TQString parentName = name.left(pos);
+ bool bSuccess = makeDir(parentName,true);
if (!bSuccess)
return false;
}
diff --git a/src/fileaccess.cpp b/src/fileaccess.cpp
index 6c58569..70855c0 100644
--- a/src/fileaccess.cpp
+++ b/src/fileaccess.cpp
@@ -1420,7 +1420,7 @@ bool FileAccessJobHandler::listDir( t_DirectoryList* pDirList, bool bRecursive,
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;
for ( i=l.begin(); i!=l.end(); ++i )
@@ -1431,7 +1431,7 @@ void FileAccessJobHandler::slotListDirProcessNewEntries( KIO::Job *, const KIO::
if ( fa.filePath() != "." && fa.filePath() != ".." )
{
- fa.m_url = tqparentUrl;
+ fa.m_url = parentUrl;
fa.m_url.addPath( fa.filePath() );
fa.m_absFilePath = fa.m_url.url();
m_pDirList->push_back( fa );
@@ -1671,7 +1671,7 @@ void ProgressDialog::show()
{
killTimer( m_progressDelayTimer );
m_progressDelayTimer = 0;
- if ( !isVisible() && (tqparentWidget()==0 || tqparentWidget()->isVisible()) )
+ if ( !isVisible() && (parentWidget()==0 || parentWidget()->isVisible()) )
{
TQDialog::show();
}
diff --git a/src/kdiff3.cpp b/src/kdiff3.cpp
index 6c5a300..a10415c 100644
--- a/src/kdiff3.cpp
+++ b/src/kdiff3.cpp
@@ -786,7 +786,7 @@ void KDiff3App::slotFilePrint()
int charactersPerLine = columnWidth / fm.width("W");
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 );
}
diff --git a/src/kdiff3_part.cpp b/src/kdiff3_part.cpp
index 4e0a9c3..f512dae 100644
--- a/src/kdiff3_part.cpp
+++ b/src/kdiff3_part.cpp
@@ -35,7 +35,7 @@
#include "version.h"
-KDiff3Part::KDiff3Part( TQWidget *tqparentWidget, const char *widgetName,
+KDiff3Part::KDiff3Part( TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name )
: KParts::ReadOnlyPart(tqparent, name)
{
@@ -43,10 +43,10 @@ KDiff3Part::KDiff3Part( TQWidget *tqparentWidget, const char *widgetName,
setInstance( KDiff3PartFactory::instance() );
// 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.
- 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
setWidget(m_widget);
@@ -270,12 +270,12 @@ KDiff3PartFactory::~KDiff3PartFactory()
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,
const char *classname, const TQStringList&/*args*/ )
{
// 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
if (TQCString(classname) == "KParts::ReadOnlyPart")
diff --git a/src/kdiff3_part.h b/src/kdiff3_part.h
index b88d304..0d9c7b7 100644
--- a/src/kdiff3_part.h
+++ b/src/kdiff3_part.h
@@ -43,7 +43,7 @@ public:
/**
* Default constructor
*/
- KDiff3Part(TQWidget *tqparentWidget, const char *widgetName,
+ KDiff3Part(TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name);
/**
@@ -89,7 +89,7 @@ class KDiff3PartFactory : public KParts::Factory
public:
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,
const char *classname, const TQStringList &args );
static KInstance* instance();
diff --git a/src/kreplacements/kreplacements.h b/src/kreplacements/kreplacements.h
index 8ae77d3..be7f126 100644
--- a/src/kreplacements/kreplacements.h
+++ b/src/kreplacements/kreplacements.h
@@ -502,7 +502,7 @@ namespace KParts
Q_OBJECT
TQ_OBJECT
public:
- virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName,
+ virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name,
const char *classname, const TQStringList &args )=0;
};
diff --git a/src/mergeresultwindow.cpp b/src/mergeresultwindow.cpp
index c0a3a8a..ac377d6 100644
--- a/src/mergeresultwindow.cpp
+++ b/src/mergeresultwindow.cpp
@@ -1067,10 +1067,10 @@ bool findParenthesesGroups( const TQString& s, TQStringList& sl )
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 );
TQString key;
@@ -1080,7 +1080,7 @@ TQString calcHistorySortKey( const TQString& keyOrder, TQRegExp& matchedRegExpr,
continue;
bool bOk=false;
int groupIdx = (*keyIt).toInt(&bOk);
- if (!bOk || groupIdx<0 || groupIdx >(int)tqparenthesesGroupList.size() )
+ if (!bOk || groupIdx<0 || groupIdx >(int)parenthesesGroupList.size() )
continue;
TQString s = matchedRegExpr.cap( groupIdx );
if ( groupIdx == 0 )
@@ -1089,7 +1089,7 @@ TQString calcHistorySortKey( const TQString& keyOrder, TQRegExp& matchedRegExpr,
continue;
}
- TQString groupRegExp = tqparenthesesGroupList[groupIdx-1];
+ TQString groupRegExp = parenthesesGroupList[groupIdx-1];
if( groupRegExp.tqfind('|')<0 || groupRegExp.tqfind('(')>=0 )
{
bool bOk = false;
@@ -1137,8 +1137,8 @@ void MergeResultWindow::collectHistoryInformation(
TQRegExp historyStart = m_pOptionDialog->m_historyStartRegExp;
++id3l; // Skip line with "$Log ... $"
TQRegExp newHistoryEntry = m_pOptionDialog->m_historyEntryStartRegExp;
- TQStringList tqparenthesesGroups;
- findParenthesesGroups( m_pOptionDialog->m_historyEntryStartRegExp, tqparenthesesGroups );
+ TQStringList parenthesesGroups;
+ findParenthesesGroups( m_pOptionDialog->m_historyEntryStartRegExp, parenthesesGroups );
TQString key;
MergeEditLineList melList;
bool bPrevLineIsEmpty = true;
@@ -1171,7 +1171,7 @@ void MergeResultWindow::collectHistoryInformation(
if ( ! bUseRegExp )
key = sLine;
else
- key = calcHistorySortKey(m_pOptionDialog->m_historyEntryStartSortKeyOrder,newHistoryEntry,tqparenthesesGroups);
+ key = calcHistorySortKey(m_pOptionDialog->m_historyEntryStartSortKeyOrder,newHistoryEntry,parenthesesGroups);
melList.clear();
melList.push_back( MergeEditLine(id3l,src) );
diff --git a/src/optiondialog.cpp b/src/optiondialog.cpp
index 445fbb0..9fc20ff 100644
--- a/src/optiondialog.cpp
+++ b/src/optiondialog.cpp
@@ -906,7 +906,7 @@ void OptionDialog::setupMergePage( void )
gbox->addWidget( m_pHistoryEntryStartRegExpLineEdit, line, 1 );
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"
- "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"
"See the documentation for details.");
TQToolTip::add( label, s_historyEntryStartRegExpToolTip );
@@ -928,7 +928,7 @@ void OptionDialog::setupMergePage( void )
gbox->addWidget( label, line, 0 );
m_pHistorySortKeyOrderLineEdit = new OptionLineEdit( defaultSortKeyOrder, "HistoryEntryStartSortKeyOrder", &m_historyEntryStartSortKeyOrder, page, this );
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"
"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"
diff --git a/src/smalldialogs.cpp b/src/smalldialogs.cpp
index 006ffcf..b4436ae 100644
--- a/src/smalldialogs.cpp
+++ b/src/smalldialogs.cpp
@@ -552,11 +552,11 @@ void RegExpTester::slotRecalc()
}
- TQStringList tqparenthesesGroups;
- bool bSuccess = findParenthesesGroups( m_pHistoryEntryStartRegExpEdit->text(), tqparenthesesGroups );
+ TQStringList parenthesesGroups;
+ bool bSuccess = findParenthesesGroups( m_pHistoryEntryStartRegExpEdit->text(), parenthesesGroups );
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("") );
return;
}
@@ -566,7 +566,7 @@ void RegExpTester::slotRecalc()
if ( historyEntryStartRegExp.exactMatch( s ) )
{
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);
}
else
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-18 08:01:51 +0000