rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 33 insertions, 33 deletions

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