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

rename the following methods:

Browse Source 
tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 5173e6fcb1
commit 721c5c4ee3
15 changed files with 131 additions and 131 deletions
Show Stats Download Patch File Download Diff File

18
src/directorymergewindow.cpp
Unescape View File

@ -1177,11 +1177,11 @@ static TQListViewItem* treeIterator( TQListViewItem* p, bool bVisitChildren=true
else if ( p->nextSibling() !=0 ) p = p->nextSibling(); else if ( p->nextSibling() !=0 ) p = p->nextSibling();
else else
{ {
p = p->tqparent(); p = p->parent();
while ( p!=0 ) while ( p!=0 )
{ {
if( p->nextSibling()!=0 ) { p = p->nextSibling(); break; } if( p->nextSibling()!=0 ) { p = p->nextSibling(); break; }
else { p = p->tqparent(); } else { p = p->parent(); }
} }
} }
} }
@ -1269,7 +1269,7 @@ void DirectoryMergeWindow::prepareListView( ProgressProxy& pp )
} }
else else
{ {
MergeFileInfos& dirMfi = m_fileMergeMap[sortString(dirPart, m_bCaseSensitive)]; // tqparent MergeFileInfos& dirMfi = m_fileMergeMap[sortString(dirPart, m_bCaseSensitive)]; // parent
assert(dirMfi.m_pDMI!=0); assert(dirMfi.m_pDMI!=0);
new DirMergeItem( dirMfi.m_pDMI, filePart, &mfi ); new DirMergeItem( dirMfi.m_pDMI, filePart, &mfi );
mfi.m_pParent = &dirMfi; mfi.m_pParent = &dirMfi;
@ -1303,7 +1303,7 @@ void DirectoryMergeWindow::prepareListView( ProgressProxy& pp )
TQListViewItem* p = firstChild(); TQListViewItem* p = firstChild();
while( p!=0 && firstChild() != 0 ) while( p!=0 && firstChild() != 0 )
{ {
TQListViewItem* pParent = p->tqparent(); TQListViewItem* pParent = p->parent();
TQListViewItem* pNextSibling = p->nextSibling(); TQListViewItem* pNextSibling = p->nextSibling();
DirMergeItem* pDMI = static_cast<DirMergeItem*>(p); DirMergeItem* pDMI = static_cast<DirMergeItem*>(p);
@ -1323,7 +1323,7 @@ void DirectoryMergeWindow::prepareListView( ProgressProxy& pp )
while ( p!=0 ) while ( p!=0 )
{ {
if( p->nextSibling()!=0 ) { p = p->nextSibling(); break; } if( p->nextSibling()!=0 ) { p = p->nextSibling(); break; }
else { p = p->tqparent(); } else { p = p->parent(); }
} }
} }
} }
@ -2283,10 +2283,10 @@ void DirectoryMergeWindow::mergeContinue(bool bStart, bool bVerbose)
TQListViewItem* pPrevItem = pCurrentItemForOperation; TQListViewItem* pPrevItem = pCurrentItemForOperation;
++m_currentItemForOperation; ++m_currentItemForOperation;
pCurrentItemForOperation = m_currentItemForOperation==m_mergeItemList.end() ? 0 : *m_currentItemForOperation; pCurrentItemForOperation = m_currentItemForOperation==m_mergeItemList.end() ? 0 : *m_currentItemForOperation;
if ( (pCurrentItemForOperation==0 || pCurrentItemForOperation->tqparent()!=pPrevItem->tqparent()) && pPrevItem->tqparent()!=0 ) if ( (pCurrentItemForOperation==0 || pCurrentItemForOperation->parent()!=pPrevItem->parent()) && pPrevItem->parent()!=0 )
{ {
// Check if the tqparent may be set to "Done" // Check if the parent may be set to "Done"
TQListViewItem* pParent = pPrevItem->tqparent(); TQListViewItem* pParent = pPrevItem->parent();
bool bDone = true; bool bDone = true;
while ( bDone && pParent!=0 ) while ( bDone && pParent!=0 )
{ {
@ -2309,7 +2309,7 @@ void DirectoryMergeWindow::mergeContinue(bool bStart, bool bVerbose)
static_cast<DirMergeItem*>(pParent)->m_pMFI->m_bOperationComplete = bDone; static_cast<DirMergeItem*>(pParent)->m_pMFI->m_bOperationComplete = bDone;
} }
} }
pParent = pParent->tqparent(); pParent = pParent->parent();
} }
} }
} }

10
src/fileaccess.cpp
Unescape View File

@ -211,7 +211,7 @@ void FileAccess::addPath( const TQString& txt )
} }
/* Filetype: /* Filetype:
S_IFMT 0170000 bittqmask for the file type bitfields S_IFMT 0170000 bitmask for the file type bitfields
S_IFSOCK 0140000 socket S_IFSOCK 0140000 socket
S_IFLNK 0120000 symbolic link S_IFLNK 0120000 symbolic link
S_IFREG 0100000 regular file S_IFREG 0100000 regular file
@ -224,15 +224,15 @@ void FileAccess::addPath( const TQString& txt )
S_ISVTX 0001000 sticky bit (see below) S_ISVTX 0001000 sticky bit (see below)
Access: Access:
S_IRWXU 00700 tqmask for file owner permissions S_IRWXU 00700 mask for file owner permissions
S_IRUSR 00400 owner has read permission S_IRUSR 00400 owner has read permission
S_IWUSR 00200 owner has write permission S_IWUSR 00200 owner has write permission
S_IXUSR 00100 owner has execute permission S_IXUSR 00100 owner has execute permission
S_IRWXG 00070 tqmask for group permissions S_IRWXG 00070 mask for group permissions
S_IRGRP 00040 group has read permission S_IRGRP 00040 group has read permission
S_IWGRP 00020 group has write permission S_IWGRP 00020 group has write permission
S_IXGRP 00010 group has execute permission S_IXGRP 00010 group has execute permission
S_IRWXO 00007 tqmask for permissions for others (not in group) S_IRWXO 00007 mask for permissions for others (not in group)
S_IROTH 00004 others have read permission S_IROTH 00004 others have read permission
S_IWOTH 00002 others have write permisson S_IWOTH 00002 others have write permisson
S_IXOTH 00001 others have execute permission S_IXOTH 00001 others have execute permission
@ -316,7 +316,7 @@ bool FileAccess::isExecutable() const { return m_bExecutable; }
bool FileAccess::isHidden() const { return m_bHidden; } bool FileAccess::isHidden() const { return m_bHidden; }
TQString FileAccess::readLink() const { return m_linkTarget; } TQString FileAccess::readLink() const { return m_linkTarget; }
TQString FileAccess::absFilePath() const{ return m_absFilePath; } // Full abs path TQString FileAccess::absFilePath() const{ return m_absFilePath; } // Full abs path
TQString FileAccess::fileName() const { return m_name; } // Just the name-part of the path, without tqparent directories TQString FileAccess::fileName() const { return m_name; } // Just the name-part of the path, without parent directories
TQString FileAccess::filePath() const { return m_path; } // The path-string that was used during construction TQString FileAccess::filePath() const { return m_path; } // The path-string that was used during construction
TQString FileAccess::prettyAbsPath() const { return isLocal() ? m_absFilePath : m_url.prettyURL(); } TQString FileAccess::prettyAbsPath() const { return isLocal() ? m_absFilePath : m_url.prettyURL(); }

2
src/fileaccess.h
Unescape View File

@ -50,7 +50,7 @@ public:
TQDateTime lastModified() const; TQDateTime lastModified() const;
TQDateTime lastRead() const; TQDateTime lastRead() const;
TQString fileName() const; // Just the name-part of the path, without tqparent directories TQString fileName() const; // Just the name-part of the path, without parent directories
TQString filePath() const; // The path-string that was used during construction TQString filePath() const; // The path-string that was used during construction
TQString prettyAbsPath() const; TQString prettyAbsPath() const;
KURL url() const; KURL url() const;

2
src/gnudiff_diff.h
Unescape View File

@ -242,7 +242,7 @@ struct file_data {
struct comparison struct comparison
{ {
struct file_data file[2]; struct file_data file[2];
struct comparison const *tqparent; /* tqparent, if a recursive comparison */ struct comparison const *parent; /* parent, if a recursive comparison */
}; };
/* Describe the two files currently being compared. */ /* Describe the two files currently being compared. */

8
src/gnudiff_io.cpp
Unescape View File

@ -419,7 +419,7 @@ void GnuDiff::find_identical_ends (struct file_data filevec[])
const TQChar **linbuf0, **linbuf1; const TQChar **linbuf0, **linbuf1;
lin alloc_lines0, alloc_lines1; lin alloc_lines0, alloc_lines1;
lin buffered_prefix, prefix_count, prefix_tqmask; lin buffered_prefix, prefix_count, prefix_mask;
lin middle_guess, suffix_guess; lin middle_guess, suffix_guess;
if (no_diff_means_no_output if (no_diff_means_no_output
&& context < (lin)(LIN_MAX / 4) && context < (lin)(n0)) && context < (lin)(LIN_MAX / 4) && context < (lin)(n0))
@ -437,7 +437,7 @@ void GnuDiff::find_identical_ends (struct file_data filevec[])
alloc_lines0 = guess_lines (0, 0, n0); alloc_lines0 = guess_lines (0, 0, n0);
} }
prefix_tqmask = prefix_count - 1; prefix_mask = prefix_count - 1;
lin lines = 0; lin lines = 0;
linbuf0 = (const TQChar**) xmalloc (alloc_lines0 * sizeof(*linbuf0)); linbuf0 = (const TQChar**) xmalloc (alloc_lines0 * sizeof(*linbuf0));
p0 = buffer0; p0 = buffer0;
@ -450,7 +450,7 @@ void GnuDiff::find_identical_ends (struct file_data filevec[])
end0 = filevec[0].prefix_end; end0 = filevec[0].prefix_end;
while (p0 != end0) while (p0 != end0)
{ {
lin l = lines++ & prefix_tqmask; lin l = lines++ & prefix_mask;
if (l == alloc_lines0) if (l == alloc_lines0)
{ {
if ((lin)(PTRDIFF_MAX / (2 * sizeof *linbuf0)) <= alloc_lines0) if ((lin)(PTRDIFF_MAX / (2 * sizeof *linbuf0)) <= alloc_lines0)
@ -480,7 +480,7 @@ void GnuDiff::find_identical_ends (struct file_data filevec[])
{ {
/* Rotate prefix lines to proper location. */ /* Rotate prefix lines to proper location. */
for (i = 0; i < buffered_prefix; i++) for (i = 0; i < buffered_prefix; i++)
linbuf1[i] = linbuf0[(lines - context + i) & prefix_tqmask]; linbuf1[i] = linbuf0[(lines - context + i) & prefix_mask];
for (i = 0; i < buffered_prefix; i++) for (i = 0; i < buffered_prefix; i++)
linbuf0[i] = linbuf1[i]; linbuf0[i] = linbuf1[i];
} }

2
src/kdiff3.cpp
Unescape View File

@ -132,7 +132,7 @@ KDiff3App::KDiff3App(TQWidget* pParent, const char* name, KDiff3Part* pKDiff3Par
m_pOptionDialog->readOptions( isPart() ? m_pKDiff3Part->instance()->config() : kapp->config() ); m_pOptionDialog->readOptions( isPart() ? m_pKDiff3Part->instance()->config() : kapp->config() );
// Option handling: Only when pParent==0 (no tqparent) // Option handling: Only when pParent==0 (no parent)
KCmdLineArgs *args = isPart() ? 0 : KCmdLineArgs::parsedArgs(); KCmdLineArgs *args = isPart() ? 0 : KCmdLineArgs::parsedArgs();
if (args) if (args)

2
src/kdiff3.h
Unescape View File

@ -102,7 +102,7 @@ class KDiff3App : public TQSplitter
public: public:
/** constructor of KDiff3App, calls all init functions to create the application. /** constructor of KDiff3App, calls all init functions to create the application.
*/ */
KDiff3App( TQWidget* tqparent, const char* name, KDiff3Part* pKDiff3Part ); KDiff3App( TQWidget* parent, const char* name, KDiff3Part* pKDiff3Part );
~KDiff3App(); ~KDiff3App();
bool isPart(); bool isPart();

10
src/kdiff3_part.cpp
Unescape View File

@ -36,8 +36,8 @@
#include "version.h" #include "version.h"
KDiff3Part::KDiff3Part( TQWidget *parentWidget, const char *widgetName, KDiff3Part::KDiff3Part( TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name ) TQObject *parent, const char *name )
: KParts::ReadOnlyPart(tqparent, name) : KParts::ReadOnlyPart(parent, name)
{ {
// we need an instance // we need an instance
setInstance( KDiff3PartFactory::instance() ); setInstance( KDiff3PartFactory::instance() );
@ -93,7 +93,7 @@ void KDiff3Part::setModified(bool /*modified*/)
else else
save->setEnabled(false); save->setEnabled(false);
// in any event, we want our tqparent to do it's thing // in any event, we want our parent to do it's thing
ReadWritePart::setModified(modified); ReadWritePart::setModified(modified);
*/ */
} }
@ -271,11 +271,11 @@ KDiff3PartFactory::~KDiff3PartFactory()
} }
KParts::Part* KDiff3PartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, KParts::Part* KDiff3PartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name, TQObject *parent, 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( parentWidget, widgetName, tqparent, name ); KDiff3Part* obj = new KDiff3Part( parentWidget, widgetName, parent, 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

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

8
src/kreplacements/ShellContextMenu.cpp
Unescape View File

@ -246,7 +246,7 @@ void CShellContextMenu::SetObjects(const TQStringList &strList)
psfDesktop->ParseDisplayName (NULL, 0, (LPOLESTR)strList[0].ucs2(), NULL, &pidl, NULL); psfDesktop->ParseDisplayName (NULL, 0, (LPOLESTR)strList[0].ucs2(), NULL, &pidl, NULL);
// now we need the tqparent IShellFolder interface of pidl, and the relative PIDL to that interface // now we need the parent IShellFolder interface of pidl, and the relative PIDL to that interface
LPITEMIDLIST pidlItem = NULL; // relative pidl LPITEMIDLIST pidlItem = NULL; // relative pidl
SHBindToParentEx (pidl, IID_IShellFolder, (void **) &m_psfFolder, NULL); SHBindToParentEx (pidl, IID_IShellFolder, (void **) &m_psfFolder, NULL);
free (pidlItem); free (pidlItem);
@ -255,9 +255,9 @@ void CShellContextMenu::SetObjects(const TQStringList &strList)
SHGetMalloc (&lpMalloc); SHGetMalloc (&lpMalloc);
lpMalloc->Free (pidl); lpMalloc->Free (pidl);
// now we have the IShellFolder interface to the tqparent folder specified in the first element in strArray // now we have the IShellFolder interface to the parent folder specified in the first element in strArray
// since we assume that all objects are in the same folder (as it's stated in the MSDN) // since we assume that all objects are in the same folder (as it's stated in the MSDN)
// we now have the IShellFolder interface to every objects tqparent folder // we now have the IShellFolder interface to every objects parent folder
IShellFolder * psfFolder = NULL; IShellFolder * psfFolder = NULL;
nItems = strList.size (); nItems = strList.size ();
@ -295,7 +295,7 @@ void CShellContextMenu::SetObjects(LPITEMIDLIST /*pidl*/)
m_pidlArray = NULL; m_pidlArray = NULL;
// full qualified PIDL is passed so we need // full qualified PIDL is passed so we need
// its tqparent IShellFolder interface and its relative PIDL to that // its parent IShellFolder interface and its relative PIDL to that
LPITEMIDLIST pidlItem = NULL; LPITEMIDLIST pidlItem = NULL;
SHBindToParent ((LPCITEMIDLIST) pidl, IID_IShellFolder, (void **) &m_psfFolder, (LPCITEMIDLIST *) &pidlItem); SHBindToParent ((LPCITEMIDLIST) pidl, IID_IShellFolder, (void **) &m_psfFolder, (LPCITEMIDLIST *) &pidlItem);

122
src/kreplacements/kreplacements.cpp
Unescape View File

@ -122,37 +122,37 @@ TQString getTranslationDir()
} }
// static // static
void KMessageBox::error( TQWidget* tqparent, const TQString& text, const TQString& caption ) void KMessageBox::error( TQWidget* parent, const TQString& text, const TQString& caption )
{ {
TQMessageBox::critical( tqparent, caption, text ); TQMessageBox::critical( parent, caption, text );
} }
int KMessageBox::warningContinueCancel( TQWidget* tqparent, const TQString& text, const TQString& caption, int KMessageBox::warningContinueCancel( TQWidget* parent, const TQString& text, const TQString& caption,
const TQString& button1 ) const TQString& button1 )
{ {
return 0 == TQMessageBox::warning( tqparent, caption, text, button1, "Cancel" ) ? Continue : Cancel; return 0 == TQMessageBox::warning( parent, caption, text, button1, "Cancel" ) ? Continue : Cancel;
} }
void KMessageBox::sorry( TQWidget* tqparent, const TQString& text, const TQString& caption ) void KMessageBox::sorry( TQWidget* parent, const TQString& text, const TQString& caption )
{ {
TQMessageBox::information( tqparent, caption, text ); TQMessageBox::information( parent, caption, text );
} }
void KMessageBox::information( TQWidget* tqparent, const TQString& text, const TQString& caption ) void KMessageBox::information( TQWidget* parent, const TQString& text, const TQString& caption )
{ {
TQMessageBox::information( tqparent, caption, text ); TQMessageBox::information( parent, caption, text );
} }
int KMessageBox::warningYesNo( TQWidget* tqparent, const TQString& text, const TQString& caption, int KMessageBox::warningYesNo( TQWidget* parent, const TQString& text, const TQString& caption,
const TQString& button1, const TQString& button2 ) const TQString& button1, const TQString& button2 )
{ {
return 0 == TQMessageBox::warning( tqparent, caption, text, button1, button2, TQString(), 1, 1 ) ? Yes : No; return 0 == TQMessageBox::warning( parent, caption, text, button1, button2, TQString(), 1, 1 ) ? Yes : No;
} }
int KMessageBox::warningYesNoCancel( TQWidget* tqparent, const TQString& text, const TQString& caption, int KMessageBox::warningYesNoCancel( TQWidget* parent, const TQString& text, const TQString& caption,
const TQString& button1, const TQString& button2 ) const TQString& button1, const TQString& button2 )
{ {
int val = TQMessageBox::warning( tqparent, caption, text, int val = TQMessageBox::warning( parent, caption, text,
button1, button2, i18n("Cancel") ); button1, button2, i18n("Cancel") );
if ( val==0 ) return Yes; if ( val==0 ) return Yes;
if ( val==1 ) return No; if ( val==1 ) return No;
@ -160,9 +160,9 @@ int KMessageBox::warningYesNoCancel( TQWidget* tqparent, const TQString& text, c
} }
KDialogBase::KDialogBase( int, const TQString& caption, int, int, TQWidget* tqparent, const char* name, KDialogBase::KDialogBase( int, const TQString& caption, int, int, TQWidget* parent, const char* name,
bool /*modal*/, bool ) bool /*modal*/, bool )
: TQTabDialog( tqparent, name, true /* modal */ ) : TQTabDialog( parent, name, true /* modal */ )
{ {
setCaption( caption ); setCaption( caption );
setDefaultButton(); setDefaultButton();
@ -254,35 +254,35 @@ void KDialogBase::slotHelp( )
KURL KFileDialog::getSaveURL( const TQString &startDir, KURL KFileDialog::getSaveURL( const TQString &startDir,
const TQString &filter, const TQString &filter,
TQWidget *tqparent, const TQString &caption) TQWidget *parent, const TQString &caption)
{ {
TQString s = TQFileDialog::getSaveFileName(startDir, filter, tqparent, 0, caption); TQString s = TQFileDialog::getSaveFileName(startDir, filter, parent, 0, caption);
return KURL(s); return KURL(s);
} }
KURL KFileDialog::getOpenURL( const TQString & startDir, KURL KFileDialog::getOpenURL( const TQString & startDir,
const TQString & filter, const TQString & filter,
TQWidget * tqparent, TQWidget * parent,
const TQString & caption ) const TQString & caption )
{ {
TQString s = TQFileDialog::getOpenFileName(startDir, filter, tqparent, 0, caption); TQString s = TQFileDialog::getOpenFileName(startDir, filter, parent, 0, caption);
return KURL(s); return KURL(s);
} }
KURL KFileDialog::getExistingURL( const TQString & startDir, KURL KFileDialog::getExistingURL( const TQString & startDir,
TQWidget * tqparent, TQWidget * parent,
const TQString & caption) const TQString & caption)
{ {
TQString s = TQFileDialog::getExistingDirectory(startDir, tqparent, 0, caption); TQString s = TQFileDialog::getExistingDirectory(startDir, parent, 0, caption);
return KURL(s); return KURL(s);
} }
TQString KFileDialog::getSaveFileName (const TQString &startDir, TQString KFileDialog::getSaveFileName (const TQString &startDir,
const TQString &filter, const TQString &filter,
TQWidget *tqparent, TQWidget *parent,
const TQString &caption) const TQString &caption)
{ {
return TQFileDialog::getSaveFileName( startDir, filter, tqparent, 0, caption ); return TQFileDialog::getSaveFileName( startDir, filter, parent, 0, caption );
} }
@ -303,15 +303,15 @@ void KToolBar::setBarPos(BarPosition bp)
else if ( bp == Top ) m_pMainWindow->moveDockWindow( this, DockTop ); else if ( bp == Top ) m_pMainWindow->moveDockWindow( this, DockTop );
} }
KToolBar::KToolBar( TQMainWindow* tqparent ) KToolBar::KToolBar( TQMainWindow* parent )
: TQToolBar( tqparent ) : TQToolBar( parent )
{ {
m_pMainWindow = tqparent; m_pMainWindow = parent;
} }
KMainWindow::KMainWindow( TQWidget* tqparent, const char* name ) KMainWindow::KMainWindow( TQWidget* parent, const char* name )
: TQMainWindow( tqparent, name ), m_actionCollection(this) : TQMainWindow( parent, name ), m_actionCollection(this)
{ {
fileMenu = new TQPopupMenu(); fileMenu = new TQPopupMenu();
menuBar()->insertItem(i18n("&File"), fileMenu); menuBar()->insertItem(i18n("&File"), fileMenu);
@ -582,101 +582,101 @@ bool KToggleAction::isChecked()
//static //static
KAction* KStdAction::open( TQWidget* tqparent, const char* slot, KActionCollection* actionCollection) KAction* KStdAction::open( TQWidget* parent, const char* slot, KActionCollection* actionCollection)
{ {
#include "../xpm/fileopen.xpm" #include "../xpm/fileopen.xpm"
KMainWindow* p = actionCollection->m_pMainWindow; KMainWindow* p = actionCollection->m_pMainWindow;
KAction* a = new KAction( i18n("Open"), TQIconSet(TQPixmap(fileopen)), TQt::CTRL+TQt::Key_O, tqparent, slot, actionCollection, "open", false, false); KAction* a = new KAction( i18n("Open"), TQIconSet(TQPixmap(fileopen)), TQt::CTRL+TQt::Key_O, parent, slot, actionCollection, "open", false, false);
if(p){ a->addTo( p->fileMenu ); } if(p){ a->addTo( p->fileMenu ); }
return a; return a;
} }
KAction* KStdAction::save( TQWidget* tqparent, const char* slot, KActionCollection* actionCollection ) KAction* KStdAction::save( TQWidget* parent, const char* slot, KActionCollection* actionCollection )
{ {
#include "../xpm/filesave.xpm" #include "../xpm/filesave.xpm"
KMainWindow* p = actionCollection->m_pMainWindow; KMainWindow* p = actionCollection->m_pMainWindow;
KAction* a = new KAction( i18n("Save"), TQIconSet(TQPixmap(filesave)), TQt::CTRL+TQt::Key_S, tqparent, slot, actionCollection, "save", false, false); KAction* a = new KAction( i18n("Save"), TQIconSet(TQPixmap(filesave)), TQt::CTRL+TQt::Key_S, parent, slot, actionCollection, "save", false, false);
if(p){ a->addTo( p->fileMenu ); } if(p){ a->addTo( p->fileMenu ); }
return a; return a;
} }
KAction* KStdAction::saveAs( TQWidget* tqparent, const char* slot, KActionCollection* actionCollection) KAction* KStdAction::saveAs( TQWidget* parent, const char* slot, KActionCollection* actionCollection)
{ {
KMainWindow* p = actionCollection->m_pMainWindow; KMainWindow* p = actionCollection->m_pMainWindow;
KAction* a = new KAction( i18n("Save As..."), 0, tqparent, slot, actionCollection, "saveas", false, false); KAction* a = new KAction( i18n("Save As..."), 0, parent, slot, actionCollection, "saveas", false, false);
if(p) a->addTo( p->fileMenu ); if(p) a->addTo( p->fileMenu );
return a; return a;
} }
KAction* KStdAction::print( TQWidget* tqparent, const char* slot, KActionCollection* actionCollection) KAction* KStdAction::print( TQWidget* parent, const char* slot, KActionCollection* actionCollection)
{ {
#include "../xpm/fileprint.xpm" #include "../xpm/fileprint.xpm"
KMainWindow* p = actionCollection->m_pMainWindow; KMainWindow* p = actionCollection->m_pMainWindow;
KAction* a = new KAction( i18n("Print..."), TQIconSet(TQPixmap(fileprint)),TQt::CTRL+TQt::Key_P, tqparent, slot, actionCollection, "print", false, false); KAction* a = new KAction( i18n("Print..."), TQIconSet(TQPixmap(fileprint)),TQt::CTRL+TQt::Key_P, parent, slot, actionCollection, "print", false, false);
if(p) a->addTo( p->fileMenu ); if(p) a->addTo( p->fileMenu );
return a; return a;
} }
KAction* KStdAction::quit( TQWidget* tqparent, const char* slot, KActionCollection* actionCollection) KAction* KStdAction::quit( TQWidget* parent, const char* slot, KActionCollection* actionCollection)
{ {
KMainWindow* p = actionCollection->m_pMainWindow; KMainWindow* p = actionCollection->m_pMainWindow;
KAction* a = new KAction( i18n("Quit"), TQt::CTRL+TQt::Key_Q, tqparent, slot, actionCollection, "quit", false, false); KAction* a = new KAction( i18n("Quit"), TQt::CTRL+TQt::Key_Q, parent, slot, actionCollection, "quit", false, false);
if(p) a->addTo( p->fileMenu ); if(p) a->addTo( p->fileMenu );
return a; return a;
} }
KAction* KStdAction::cut( TQWidget* tqparent, const char* slot, KActionCollection* actionCollection) KAction* KStdAction::cut( TQWidget* parent, const char* slot, KActionCollection* actionCollection)
{ {
KMainWindow* p = actionCollection->m_pMainWindow; KMainWindow* p = actionCollection->m_pMainWindow;
KAction* a = new KAction( i18n("Cut"), TQt::CTRL+TQt::Key_X, tqparent, slot, actionCollection, "cut", false, false ); KAction* a = new KAction( i18n("Cut"), TQt::CTRL+TQt::Key_X, parent, slot, actionCollection, "cut", false, false );
if(p) a->addTo( p->editMenu ); if(p) a->addTo( p->editMenu );
return a; return a;
} }
KAction* KStdAction::copy( TQWidget* tqparent, const char* slot, KActionCollection* actionCollection) KAction* KStdAction::copy( TQWidget* parent, const char* slot, KActionCollection* actionCollection)
{ {
KMainWindow* p = actionCollection->m_pMainWindow; KMainWindow* p = actionCollection->m_pMainWindow;
KAction* a = new KAction( i18n("Copy"), TQt::CTRL+TQt::Key_C, tqparent, slot, actionCollection, "copy", false, false ); KAction* a = new KAction( i18n("Copy"), TQt::CTRL+TQt::Key_C, parent, slot, actionCollection, "copy", false, false );
if(p) a->addTo( p->editMenu ); if(p) a->addTo( p->editMenu );
return a; return a;
} }
KAction* KStdAction::paste( TQWidget* tqparent, const char* slot, KActionCollection* actionCollection) KAction* KStdAction::paste( TQWidget* parent, const char* slot, KActionCollection* actionCollection)
{ {
KMainWindow* p = actionCollection->m_pMainWindow; KMainWindow* p = actionCollection->m_pMainWindow;
KAction* a = new KAction( i18n("Paste"), TQt::CTRL+TQt::Key_V, tqparent, slot, actionCollection, "paste", false, false ); KAction* a = new KAction( i18n("Paste"), TQt::CTRL+TQt::Key_V, parent, slot, actionCollection, "paste", false, false );
if(p) a->addTo( p->editMenu ); if(p) a->addTo( p->editMenu );
return a; return a;
} }
KAction* KStdAction::selectAll( TQWidget* tqparent, const char* slot, KActionCollection* actionCollection) KAction* KStdAction::selectAll( TQWidget* parent, const char* slot, KActionCollection* actionCollection)
{ {
KMainWindow* p = actionCollection->m_pMainWindow; KMainWindow* p = actionCollection->m_pMainWindow;
KAction* a = new KAction( i18n("Select All"), TQt::CTRL+TQt::Key_A, tqparent, slot, actionCollection, "selectall", false, false ); KAction* a = new KAction( i18n("Select All"), TQt::CTRL+TQt::Key_A, parent, slot, actionCollection, "selectall", false, false );
if(p) a->addTo( p->editMenu ); if(p) a->addTo( p->editMenu );
return a; return a;
} }
KToggleAction* KStdAction::showToolbar( TQWidget* tqparent, const char* slot, KActionCollection* actionCollection) KToggleAction* KStdAction::showToolbar( TQWidget* parent, const char* slot, KActionCollection* actionCollection)
{ {
KMainWindow* p = actionCollection->m_pMainWindow; KMainWindow* p = actionCollection->m_pMainWindow;
KToggleAction* a = new KToggleAction( i18n("Show Toolbar"), 0, tqparent, slot, actionCollection, "showtoolbar", false ); KToggleAction* a = new KToggleAction( i18n("Show Toolbar"), 0, parent, slot, actionCollection, "showtoolbar", false );
if(p) a->addTo( p->settingsMenu ); if(p) a->addTo( p->settingsMenu );
return a; return a;
} }
KToggleAction* KStdAction::showStatusbar( TQWidget* tqparent, const char* slot, KActionCollection* actionCollection) KToggleAction* KStdAction::showStatusbar( TQWidget* parent, const char* slot, KActionCollection* actionCollection)
{ {
KMainWindow* p = actionCollection->m_pMainWindow; KMainWindow* p = actionCollection->m_pMainWindow;
KToggleAction* a = new KToggleAction( i18n("Show &Statusbar"), 0, tqparent, slot, actionCollection, "showstatusbar", false ); KToggleAction* a = new KToggleAction( i18n("Show &Statusbar"), 0, parent, slot, actionCollection, "showstatusbar", false );
if(p) a->addTo( p->settingsMenu ); if(p) a->addTo( p->settingsMenu );
return a; return a;
} }
KAction* KStdAction::preferences( TQWidget* tqparent, const char* slot, KActionCollection* actionCollection) KAction* KStdAction::preferences( TQWidget* parent, const char* slot, KActionCollection* actionCollection)
{ {
KMainWindow* p = actionCollection->m_pMainWindow; KMainWindow* p = actionCollection->m_pMainWindow;
KAction* a = new KAction( i18n("&Configure %1...").tqarg("KDiff3"), 0, tqparent, slot, actionCollection, "settings", false, false ); KAction* a = new KAction( i18n("&Configure %1...").tqarg("KDiff3"), 0, parent, slot, actionCollection, "settings", false, false );
if(p) a->addTo( p->settingsMenu ); if(p) a->addTo( p->settingsMenu );
return a; return a;
} }
@ -685,10 +685,10 @@ KAction* KStdAction::keyBindings( TQWidget*, const char*, KActionCollection*)
return 0; return 0;
} }
KAction* KStdAction::about( TQWidget* tqparent, const char* slot, KActionCollection* actionCollection) KAction* KStdAction::about( TQWidget* parent, const char* slot, KActionCollection* actionCollection)
{ {
KMainWindow* p = actionCollection->m_pMainWindow; KMainWindow* p = actionCollection->m_pMainWindow;
KAction* a = new KAction( i18n("About")+" KDiff3", 0, tqparent, slot, actionCollection, "about_kdiff3", false, false ); KAction* a = new KAction( i18n("About")+" KDiff3", 0, parent, slot, actionCollection, "about_kdiff3", false, false );
if(p) a->addTo( p->helpMenu ); if(p) a->addTo( p->helpMenu );
return a; return a;
} }
@ -701,25 +701,25 @@ KAction* KStdAction::aboutTQt( KActionCollection* actionCollection )
return a; return a;
} }
KAction* KStdAction::help( TQWidget* tqparent, const char* slot, KActionCollection* actionCollection) KAction* KStdAction::help( TQWidget* parent, const char* slot, KActionCollection* actionCollection)
{ {
KMainWindow* p = actionCollection->m_pMainWindow; KMainWindow* p = actionCollection->m_pMainWindow;
KAction* a = new KAction( i18n("Help"), TQt::Key_F1, tqparent, slot, actionCollection, "help", false, false ); KAction* a = new KAction( i18n("Help"), TQt::Key_F1, parent, slot, actionCollection, "help", false, false );
if(p) a->addTo( p->helpMenu ); if(p) a->addTo( p->helpMenu );
return a; return a;
} }
KAction* KStdAction::find( TQWidget* tqparent, const char* slot, KActionCollection* actionCollection) KAction* KStdAction::find( TQWidget* parent, const char* slot, KActionCollection* actionCollection)
{ {
KMainWindow* p = actionCollection->m_pMainWindow; KMainWindow* p = actionCollection->m_pMainWindow;
KAction* a = new KAction( i18n("Find"), TQt::CTRL+TQt::Key_F, tqparent, slot, actionCollection, "find", false, false ); KAction* a = new KAction( i18n("Find"), TQt::CTRL+TQt::Key_F, parent, slot, actionCollection, "find", false, false );
if(p) a->addTo( p->editMenu ); if(p) a->addTo( p->editMenu );
return a; return a;
} }
KAction* KStdAction::findNext( TQWidget* tqparent, const char* slot, KActionCollection* actionCollection) KAction* KStdAction::findNext( TQWidget* parent, const char* slot, KActionCollection* actionCollection)
{ {
KMainWindow* p = actionCollection->m_pMainWindow; KMainWindow* p = actionCollection->m_pMainWindow;
KAction* a = new KAction( i18n("Find Next"), TQt::Key_F3, tqparent, slot, actionCollection, "findNext", false, false ); KAction* a = new KAction( i18n("Find Next"), TQt::Key_F3, parent, slot, actionCollection, "findNext", false, false );
if(p) a->addTo( p->editMenu ); if(p) a->addTo( p->editMenu );
return a; return a;
} }
@ -785,8 +785,8 @@ void KFontChooser::slotSelectFont()
} }
KColorButton::KColorButton(TQWidget* tqparent) KColorButton::KColorButton(TQWidget* parent)
: TQPushButton(tqparent) : TQPushButton(parent)
{ {
connect( this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked())); connect( this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked()));
} }

66
src/kreplacements/kreplacements.h
Unescape View File

@ -64,15 +64,15 @@ private:
class KMessageBox class KMessageBox
{ {
public: public:
static void error( TQWidget* tqparent, const TQString& text, const TQString& caption=TQString() ); static void error( TQWidget* parent, const TQString& text, const TQString& caption=TQString() );
static int warningContinueCancel( TQWidget* tqparent, const TQString& text, const TQString& caption=TQString(), static int warningContinueCancel( TQWidget* parent, const TQString& text, const TQString& caption=TQString(),
const TQString& button1=TQString("Continue") ); const TQString& button1=TQString("Continue") );
static void sorry( TQWidget* tqparent, const TQString& text, const TQString& caption=TQString() ); static void sorry( TQWidget* parent, const TQString& text, const TQString& caption=TQString() );
static void information( TQWidget* tqparent, const TQString& text, const TQString& caption=TQString() ); static void information( TQWidget* parent, const TQString& text, const TQString& caption=TQString() );
static int warningYesNo( TQWidget* tqparent, const TQString& text, const TQString& caption, static int warningYesNo( TQWidget* parent, const TQString& text, const TQString& caption,
const TQString& button1, const TQString& button2 ); const TQString& button1, const TQString& button2 );
static int warningYesNoCancel( static int warningYesNoCancel(
TQWidget* tqparent, const TQString& text, const TQString& caption, TQWidget* parent, const TQString& text, const TQString& caption,
const TQString& button1, const TQString& button2 ); const TQString& button1, const TQString& button2 );
enum {Cancel=-1, No=0, Yes=1, Continue=1}; enum {Cancel=-1, No=0, Yes=1, Continue=1};
@ -90,7 +90,7 @@ class KDialogBase : public TQTabDialog
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KDialogBase( int, const TQString& caption, int, int, TQWidget* tqparent, const char* name, KDialogBase( int, const TQString& caption, int, int, TQWidget* parent, const char* name,
bool /*modal*/, bool ); bool /*modal*/, bool );
~KDialogBase(); ~KDialogBase();
@ -121,17 +121,17 @@ class KFileDialog : public TQFileDialog
public: public:
static KURL getSaveURL( const TQString &startDir=TQString(), static KURL getSaveURL( const TQString &startDir=TQString(),
const TQString &filter=TQString(), const TQString &filter=TQString(),
TQWidget *tqparent=0, const TQString &caption=TQString()); TQWidget *parent=0, const TQString &caption=TQString());
static KURL getOpenURL( const TQString & startDir = TQString(), static KURL getOpenURL( const TQString & startDir = TQString(),
const TQString & filter = TQString(), const TQString & filter = TQString(),
TQWidget * tqparent = 0, TQWidget * parent = 0,
const TQString & caption = TQString() ); const TQString & caption = TQString() );
static KURL getExistingURL( const TQString & startDir = TQString(), static KURL getExistingURL( const TQString & startDir = TQString(),
TQWidget * tqparent = 0, TQWidget * parent = 0,
const TQString & caption = TQString() ); const TQString & caption = TQString() );
static TQString getSaveFileName (const TQString &startDir=TQString(), static TQString getSaveFileName (const TQString &startDir=TQString(),
const TQString &filter=TQString(), const TQString &filter=TQString(),
TQWidget *tqparent=0, TQWidget *parent=0,
const TQString &caption=TQString()); const TQString &caption=TQString());
}; };
@ -140,7 +140,7 @@ typedef TQStatusBar KStatusBar;
class KToolBar : public TQToolBar class KToolBar : public TQToolBar
{ {
public: public:
KToolBar(TQMainWindow* tqparent); KToolBar(TQMainWindow* parent);
enum BarPosition {Top, Bottom, Left, Right}; enum BarPosition {Top, Bottom, Left, Right};
BarPosition barPos(); BarPosition barPos();
@ -194,7 +194,7 @@ public:
KToolBar* m_pToolBar; KToolBar* m_pToolBar;
KMainWindow( TQWidget* tqparent, const char* name ); KMainWindow( TQWidget* parent, const char* name );
KToolBar* toolBar(const TQString& s = TQString()); KToolBar* toolBar(const TQString& s = TQString());
KActionCollection* actionCollection(); KActionCollection* actionCollection();
void createGUI(); void createGUI();
@ -244,24 +244,24 @@ public:
class KStdAction class KStdAction
{ {
public: public:
static KAction* open( TQWidget* tqparent, const char* slot, KActionCollection* ); static KAction* open( TQWidget* parent, const char* slot, KActionCollection* );
static KAction* save( TQWidget* tqparent, const char* slot, KActionCollection* ); static KAction* save( TQWidget* parent, const char* slot, KActionCollection* );
static KAction* saveAs( TQWidget* tqparent, const char* slot, KActionCollection* ); static KAction* saveAs( TQWidget* parent, const char* slot, KActionCollection* );
static KAction* print( TQWidget* tqparent, const char* slot, KActionCollection* ); static KAction* print( TQWidget* parent, const char* slot, KActionCollection* );
static KAction* quit( TQWidget* tqparent, const char* slot, KActionCollection* ); static KAction* quit( TQWidget* parent, const char* slot, KActionCollection* );
static KAction* cut( TQWidget* tqparent, const char* slot, KActionCollection* ); static KAction* cut( TQWidget* parent, const char* slot, KActionCollection* );
static KAction* copy( TQWidget* tqparent, const char* slot, KActionCollection* ); static KAction* copy( TQWidget* parent, const char* slot, KActionCollection* );
static KAction* paste( TQWidget* tqparent, const char* slot, KActionCollection* ); static KAction* paste( TQWidget* parent, const char* slot, KActionCollection* );
static KAction* selectAll( TQWidget* tqparent, const char* slot, KActionCollection* ); static KAction* selectAll( TQWidget* parent, const char* slot, KActionCollection* );
static KToggleAction* showToolbar( TQWidget* tqparent, const char* slot, KActionCollection* ); static KToggleAction* showToolbar( TQWidget* parent, const char* slot, KActionCollection* );
static KToggleAction* showStatusbar( TQWidget* tqparent, const char* slot, KActionCollection* ); static KToggleAction* showStatusbar( TQWidget* parent, const char* slot, KActionCollection* );
static KAction* preferences( TQWidget* tqparent, const char* slot, KActionCollection* ); static KAction* preferences( TQWidget* parent, const char* slot, KActionCollection* );
static KAction* about( TQWidget* tqparent, const char* slot, KActionCollection* ); static KAction* about( TQWidget* parent, const char* slot, KActionCollection* );
static KAction* aboutTQt( KActionCollection* ); static KAction* aboutTQt( KActionCollection* );
static KAction* help( TQWidget* tqparent, const char* slot, KActionCollection* ); static KAction* help( TQWidget* parent, const char* slot, KActionCollection* );
static KAction* find( TQWidget* tqparent, const char* slot, KActionCollection* ); static KAction* find( TQWidget* parent, const char* slot, KActionCollection* );
static KAction* findNext( TQWidget* tqparent, const char* slot, KActionCollection* ); static KAction* findNext( TQWidget* parent, const char* slot, KActionCollection* );
static KAction* keyBindings( TQWidget* tqparent, const char* slot, KActionCollection* ); static KAction* keyBindings( TQWidget* parent, const char* slot, KActionCollection* );
}; };
class KIcon class KIcon
@ -292,7 +292,7 @@ class KColorButton : public TQPushButton
TQ_OBJECT TQ_OBJECT
TQColor m_color; TQColor m_color;
public: public:
KColorButton(TQWidget* tqparent); KColorButton(TQWidget* parent);
TQColor color(); TQColor color();
void setColor(const TQColor&); void setColor(const TQColor&);
virtual void paintEvent(TQPaintEvent* e); virtual void paintEvent(TQPaintEvent* e);
@ -461,7 +461,7 @@ namespace KParts
class MainWindow : public KMainWindow class MainWindow : public KMainWindow
{ {
public: public:
MainWindow( TQWidget* tqparent, const char* name ) : KMainWindow(tqparent,name) {} MainWindow( TQWidget* parent, const char* name ) : KMainWindow(parent,name) {}
void setXMLFile(const TQString&){} void setXMLFile(const TQString&){}
void setAutoSaveSettings(){} void setAutoSaveSettings(){}
void saveMainWindowSettings(KConfig*){} void saveMainWindowSettings(KConfig*){}
@ -503,7 +503,7 @@ namespace KParts
TQ_OBJECT TQ_OBJECT
public: public:
virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name, TQObject *parent, const char *name,
const char *classname, const TQStringList &args )=0; const char *classname, const TQStringList &args )=0;
}; };
}; };

4
src/optiondialog.cpp
Unescape View File

@ -451,9 +451,9 @@ public:
}; };
OptionDialog::OptionDialog( bool bShowDirMergeSettings, TQWidget *tqparent, char *name ) OptionDialog::OptionDialog( bool bShowDirMergeSettings, TQWidget *parent, char *name )
:KDialogBase( IconList, i18n("Configure"), Help|Default|Apply|Ok|Cancel, :KDialogBase( IconList, i18n("Configure"), Help|Default|Apply|Ok|Cancel,
Ok, tqparent, name, true /*modal*/, true ) Ok, parent, name, true /*modal*/, true )
{ {
setHelp( "kdiff3/index.html", TQString() ); setHelp( "kdiff3/index.html", TQString() );

2
src/optiondialog.h
Unescape View File

@ -53,7 +53,7 @@ class OptionDialog : public KDialogBase
public: public:
OptionDialog( bool bShowDirMergeSettings, TQWidget *tqparent = 0, char *name = 0 ); OptionDialog( bool bShowDirMergeSettings, TQWidget *parent = 0, char *name = 0 );
~OptionDialog( void ); ~OptionDialog( void );
TQString parseOptions( const QCStringList& optionList ); TQString parseOptions( const QCStringList& optionList );
TQString calcOptionHelp(); TQString calcOptionHelp();

2
src/pdiff.cpp
Unescape View File

@ -84,7 +84,7 @@ bool KDiff3App::runDiff( const LineData* p1, int size1, const LineData* p2, int
{ {
GnuDiff::comparison comparisonInput; GnuDiff::comparison comparisonInput;
memset( &comparisonInput, 0, sizeof(comparisonInput) ); memset( &comparisonInput, 0, sizeof(comparisonInput) );
comparisonInput.tqparent = 0; comparisonInput.parent = 0;
comparisonInput.file[0].buffer = p1[0].pLine;//ptr to buffer comparisonInput.file[0].buffer = p1[0].pLine;//ptr to buffer
comparisonInput.file[0].buffered = (p1[size1-1].pLine-p1[0].pLine+p1[size1-1].size); // size of buffer comparisonInput.file[0].buffered = (p1[size1-1].pLine-p1[0].pLine+p1[size1-1].size); // size of buffer
comparisonInput.file[1].buffer = p2[0].pLine;//ptr to buffer comparisonInput.file[1].buffer = p2[0].pLine;//ptr to buffer

Write Preview
Loading…
Cancel
Save