summaryrefslogtreecommitdiffstats
path: root/kexi/main
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
commit04766b207afba7961d4d802313e426f5a2fbef63 (patch)
treec888ea1027c793e2d0386a7e5a1a0cd077b03cb3 /kexi/main
parentb6edfe41c9395f2e20784cbf0e630af6426950a3 (diff)
downloadkoffice-04766b207afba7961d4d802313e426f5a2fbef63.tar.gz
koffice-04766b207afba7961d4d802313e426f5a2fbef63.zip
rename the following methods:
tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kexi/main')
-rw-r--r--kexi/main/kexifinddialog.cpp14
-rw-r--r--kexi/main/kexifinddialog.h2
-rw-r--r--kexi/main/keximainwindowimpl.cpp2
-rw-r--r--kexi/main/kexinamedialog.cpp10
-rw-r--r--kexi/main/kexinamedialog.h4
-rw-r--r--kexi/main/kexinamewidget.cpp8
-rw-r--r--kexi/main/kexinamewidget.h4
-rw-r--r--kexi/main/kexinewstuff.cpp4
-rw-r--r--kexi/main/kexinewstuff.h2
-rw-r--r--kexi/main/kexistatusbar.cpp4
-rw-r--r--kexi/main/kexistatusbar.h2
-rw-r--r--kexi/main/ksplitter.h4
-rw-r--r--kexi/main/printing/kexisimpleprintingengine.cpp4
-rw-r--r--kexi/main/printing/kexisimpleprintingengine.h2
-rw-r--r--kexi/main/printing/kexisimpleprintingpagesetup.cpp8
-rw-r--r--kexi/main/printing/kexisimpleprintingpagesetup.h4
-rw-r--r--kexi/main/printing/kexisimpleprintingpart.cpp4
-rw-r--r--kexi/main/printing/kexisimpleprintingpart.h2
-rw-r--r--kexi/main/printing/kexisimpleprintpreviewwindow.cpp8
-rw-r--r--kexi/main/printing/kexisimpleprintpreviewwindow.h2
-rw-r--r--kexi/main/printing/kexisimpleprintpreviewwindow_p.h2
-rw-r--r--kexi/main/startup/KexiConnSelector.cpp4
-rw-r--r--kexi/main/startup/KexiConnSelector.h2
-rw-r--r--kexi/main/startup/KexiDBTitlePage.cpp4
-rw-r--r--kexi/main/startup/KexiDBTitlePage.h2
-rw-r--r--kexi/main/startup/KexiNewProjectWizard.cpp4
-rw-r--r--kexi/main/startup/KexiNewProjectWizard.h2
-rw-r--r--kexi/main/startup/KexiProjectSelector.cpp14
-rw-r--r--kexi/main/startup/KexiProjectSelector.h6
-rw-r--r--kexi/main/startup/KexiStartup.cpp24
-rw-r--r--kexi/main/startup/KexiStartup.h12
-rw-r--r--kexi/main/startup/KexiStartupDialog.cpp8
-rw-r--r--kexi/main/startup/KexiStartupDialog.h4
-rw-r--r--kexi/main/startup/KexiStartupDialogTemplatesPage.cpp8
-rw-r--r--kexi/main/startup/KexiStartupDialogTemplatesPage.h2
-rw-r--r--kexi/main/startup/KexiStartupFileDialog.cpp8
-rw-r--r--kexi/main/startup/KexiStartupFileDialog.h6
-rw-r--r--kexi/main/startup/KexiStartupFileDialogBase_win.h2
-rw-r--r--kexi/main/startup/KexiStartupFileDialog_win.cpp8
39 files changed, 108 insertions, 108 deletions
diff --git a/kexi/main/kexifinddialog.cpp b/kexi/main/kexifinddialog.cpp
index 6f451aef..0aa0cd35 100644
--- a/kexi/main/kexifinddialog.cpp
+++ b/kexi/main/kexifinddialog.cpp
@@ -48,18 +48,18 @@ class KexiFindDialog::Private
}
//! Connects action \a action with appropriate signal \a member
//! and optionally adds accel that will receive shortcut for \a action
- //! at global scope of the dialog \a tqparent.
- void setActionAndAccel(KAction *action, TQWidget* tqparent, const char* member)
+ //! at global scope of the dialog \a parent.
+ void setActionAndAccel(KAction *action, TQWidget* parent, const char* member)
{
if (!action)
return;
- TQObject::connect(tqparent, member, action, TQT_SLOT(activate()));
+ TQObject::connect(parent, member, action, TQT_SLOT(activate()));
if (action->shortcut().isNull())
return;
- TQAccel *accel = new TQAccel(tqparent); // we want to handle dialog-wide shortcut as well
+ TQAccel *accel = new TQAccel(parent); // we want to handle dialog-wide shortcut as well
accels.append( accel );
accel->connectItem(
- accel->insertItem( action->shortcut() ), tqparent, member );
+ accel->insertItem( action->shortcut() ), parent, member );
}
TQStringList lookInColumnNames;
@@ -75,8 +75,8 @@ class KexiFindDialog::Private
//------------------------------------------
-KexiFindDialog::KexiFindDialog( TQWidget* tqparent )
- : KexiFindDialogBase(tqparent, "KexiFindDialog", false/*!modal*/,
+KexiFindDialog::KexiFindDialog( TQWidget* parent )
+ : KexiFindDialogBase(parent, "KexiFindDialog", false/*!modal*/,
TQt::WType_Dialog|TQt::WStyle_NormalBorder|TQt::WStyle_Title
|TQt::WStyle_SysMenu|TQt::WStyle_Customize|TQt::WStyle_Tool)
, d( new Private() )
diff --git a/kexi/main/kexifinddialog.h b/kexi/main/kexifinddialog.h
index 4cf55e53..70d13917 100644
--- a/kexi/main/kexifinddialog.h
+++ b/kexi/main/kexifinddialog.h
@@ -37,7 +37,7 @@ class KexiFindDialog : public KexiFindDialogBase
TQ_OBJECT
public:
//! Creates a new find dialog. Replace mode is off by default.
- KexiFindDialog(TQWidget* tqparent);
+ KexiFindDialog(TQWidget* parent);
virtual ~KexiFindDialog();
//! Sets actions that receive button clicks and shortcuts within the dialog. Should be called once.
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index a14ebfbb..37ff1c83 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -3514,7 +3514,7 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
else {
/* TQObject* o = tqfocusWidget();
while (o && !o->inherits("KexiDialogBase") && !o->inherits("KexiDockBase"))
- o = o->tqparent();*/
+ o = o->parent();*/
//js invalidateSharedActions(focus_w);
}
}
diff --git a/kexi/main/kexinamedialog.cpp b/kexi/main/kexinamedialog.cpp
index c9b78f36..45cbc449 100644
--- a/kexi/main/kexinamedialog.cpp
+++ b/kexi/main/kexinamedialog.cpp
@@ -20,13 +20,13 @@
#include "kexinamedialog.h"
KexiNameDialog::KexiNameDialog(const TQString& message,
- TQWidget * tqparent, const char * name)
+ TQWidget * parent, const char * name)
: KDialogBase(KDialogBase::Plain, TQString(),
KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Help,
KDialogBase::Ok,
- tqparent, name)
+ parent, name)
{
-// TQHBox ( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 )
+// TQHBox ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 )
m_widget= new KexiNameWidget(message, plainPage(), "KexiNameWidget");
init();
}
@@ -34,11 +34,11 @@ KexiNameDialog::KexiNameDialog(const TQString& message,
KexiNameDialog::KexiNameDialog(const TQString& message,
const TQString& nameLabel, const TQString& nameText,
const TQString& captionLabel, const TQString& captionText,
- TQWidget * tqparent, const char * name)
+ TQWidget * parent, const char * name)
: KDialogBase(KDialogBase::Plain, TQString(),
KDialogBase::Ok|KDialogBase::Cancel,
KDialogBase::Ok,
- tqparent, name)
+ parent, name)
{
m_widget= new KexiNameWidget(message, nameLabel, nameText,
captionLabel, captionText, plainPage(), "KexiNameWidget");
diff --git a/kexi/main/kexinamedialog.h b/kexi/main/kexinamedialog.h
index c4453c0d..365214e2 100644
--- a/kexi/main/kexinamedialog.h
+++ b/kexi/main/kexinamedialog.h
@@ -31,12 +31,12 @@ class KEXIMAIN_EXPORT KexiNameDialog : public KDialogBase
public:
KexiNameDialog(const TQString& message,
- TQWidget * tqparent = 0, const char * name = 0);
+ TQWidget * parent = 0, const char * name = 0);
KexiNameDialog(const TQString& message,
const TQString& nameLabel, const TQString& nameText,
const TQString& captionLabel, const TQString& captionText,
- TQWidget * tqparent = 0, const char * name = 0);
+ TQWidget * parent = 0, const char * name = 0);
virtual ~KexiNameDialog();
diff --git a/kexi/main/kexinamewidget.cpp b/kexi/main/kexinamewidget.cpp
index db061d93..c6ca8f41 100644
--- a/kexi/main/kexinamewidget.cpp
+++ b/kexi/main/kexinamewidget.cpp
@@ -33,8 +33,8 @@
using namespace KexiUtils;
KexiNameWidget::KexiNameWidget( const TQString& message,
- TQWidget* tqparent, const char* name, WFlags fl )
- : TQWidget(tqparent, name, fl)
+ TQWidget* parent, const char* name, WFlags fl )
+ : TQWidget(parent, name, fl)
{
init(message, TQString(), TQString(), TQString(), TQString());
}
@@ -42,9 +42,9 @@ KexiNameWidget::KexiNameWidget( const TQString& message,
KexiNameWidget::KexiNameWidget(const TQString& message,
const TQString& nameLabel, const TQString& nameText,
const TQString& captionLabel, const TQString& captionText,
- TQWidget * tqparent, const char * name, WFlags fl)
+ TQWidget * parent, const char * name, WFlags fl)
{
- Q_UNUSED( tqparent );
+ Q_UNUSED( parent );
Q_UNUSED( name );
Q_UNUSED( fl );
diff --git a/kexi/main/kexinamewidget.h b/kexi/main/kexinamewidget.h
index 1ab1d106..acbeed5c 100644
--- a/kexi/main/kexinamewidget.h
+++ b/kexi/main/kexinamewidget.h
@@ -36,12 +36,12 @@ class KEXIMAIN_EXPORT KexiNameWidget : public TQWidget
public:
KexiNameWidget(const TQString& message,
- TQWidget * tqparent = 0, const char * name = 0, WFlags fl = 0);
+ TQWidget * parent = 0, const char * name = 0, WFlags fl = 0);
KexiNameWidget(const TQString& message,
const TQString& nameLabel, const TQString& nameText,
const TQString& captionLabel, const TQString& captionText,
- TQWidget * tqparent = 0, const char * name = 0, WFlags fl = 0);
+ TQWidget * parent = 0, const char * name = 0, WFlags fl = 0);
virtual ~KexiNameWidget();
diff --git a/kexi/main/kexinewstuff.cpp b/kexi/main/kexinewstuff.cpp
index 2e26b356..c6bd3a96 100644
--- a/kexi/main/kexinewstuff.cpp
+++ b/kexi/main/kexinewstuff.cpp
@@ -30,12 +30,12 @@
#include "kexinewstuff.h"
-KexiNewStuff::KexiNewStuff(TQWidget *tqparent)
+KexiNewStuff::KexiNewStuff(TQWidget *parent)
: KNewStuff( "kexi/template"
#if KDE_IS_VERSION(3,3,0)
, "http://download.kde.org/khotnewstuff/kexi-providers.xml"
#endif
- , tqparent)
+ , parent)
{
// Prevent GHNS to deny downloading a second time. If GHNS
// fails to download something, it still marks the thing as
diff --git a/kexi/main/kexinewstuff.h b/kexi/main/kexinewstuff.h
index 0247e706..e2966841 100644
--- a/kexi/main/kexinewstuff.h
+++ b/kexi/main/kexinewstuff.h
@@ -27,7 +27,7 @@
class KexiNewStuff : public KNewStuff
{
public:
- KexiNewStuff(TQWidget *tqparent);
+ KexiNewStuff(TQWidget *parent);
virtual ~KexiNewStuff();
virtual bool install( const TQString &fileName );
diff --git a/kexi/main/kexistatusbar.cpp b/kexi/main/kexistatusbar.cpp
index 2d51cad5..bfee9859 100644
--- a/kexi/main/kexistatusbar.cpp
+++ b/kexi/main/kexistatusbar.cpp
@@ -38,8 +38,8 @@
#include <ktexteditor/viewstatusmsginterface.h>
#endif
-KexiStatusBar::KexiStatusBar(TQWidget *tqparent, const char *name)
- : KStatusBar(tqparent, name)
+KexiStatusBar::KexiStatusBar(TQWidget *parent, const char *name)
+ : KStatusBar(parent, name)
#if KexiStatusBar_KTEXTEDITOR_USED
, m_cursorIface(0)
#endif
diff --git a/kexi/main/kexistatusbar.h b/kexi/main/kexistatusbar.h
index 0cd5f6c6..c498e2f5 100644
--- a/kexi/main/kexistatusbar.h
+++ b/kexi/main/kexistatusbar.h
@@ -43,7 +43,7 @@ class KexiStatusBar : public KStatusBar
Q_OBJECT
TQ_OBJECT
public:
- KexiStatusBar( TQWidget *tqparent=0, const char *name=0 );
+ KexiStatusBar( TQWidget *parent=0, const char *name=0 );
virtual ~KexiStatusBar();
// virtual void addWidget( TQWidget *widget, int stretch = 0, bool permanent = false);
diff --git a/kexi/main/ksplitter.h b/kexi/main/ksplitter.h
index 9bf359b1..3fe7b28d 100644
--- a/kexi/main/ksplitter.h
+++ b/kexi/main/ksplitter.h
@@ -51,12 +51,12 @@ class KDockSplitter : public TQWidget
public:
/**
* Constructor.
- * @param tqparent tqparent widget
+ * @param parent parent widget
* @param name name
* @param orient orientation. Either @pQt::Vertical or @pQt::Horizontal
* @param pos procentual position of the splitter. Must be int [0...100].
*/
- KDockSplitter(TQWidget *tqparent= 0, const char *name= 0, Qt::Orientation orient=Qt::Vertical, int pos= 50);
+ KDockSplitter(TQWidget *parent= 0, const char *name= 0, Qt::Orientation orient=Qt::Vertical, int pos= 50);
virtual ~KDockSplitter(){};
/**
diff --git a/kexi/main/printing/kexisimpleprintingengine.cpp b/kexi/main/printing/kexisimpleprintingengine.cpp
index 59a86efd..45ab5892 100644
--- a/kexi/main/printing/kexisimpleprintingengine.cpp
+++ b/kexi/main/printing/kexisimpleprintingengine.cpp
@@ -116,8 +116,8 @@ void KexiSimplePrintingSettings::save()
//------------------------
KexiSimplePrintingEngine::KexiSimplePrintingEngine(
- const KexiSimplePrintingSettings& settings, TQObject* tqparent)
- : TQObject(tqparent, "KexiSimplePrintingEngine")
+ const KexiSimplePrintingSettings& settings, TQObject* parent)
+ : TQObject(parent, "KexiSimplePrintingEngine")
, m_settings(&settings)
, m_pdm(0)
{
diff --git a/kexi/main/printing/kexisimpleprintingengine.h b/kexi/main/printing/kexisimpleprintingengine.h
index f3a5371d..8c6d995d 100644
--- a/kexi/main/printing/kexisimpleprintingengine.h
+++ b/kexi/main/printing/kexisimpleprintingengine.h
@@ -60,7 +60,7 @@ class KexiSimplePrintingEngine : public TQObject
TQ_OBJECT
public:
- KexiSimplePrintingEngine( const KexiSimplePrintingSettings& settings, TQObject* tqparent );
+ KexiSimplePrintingEngine( const KexiSimplePrintingSettings& settings, TQObject* parent );
~KexiSimplePrintingEngine();
bool init(KexiDB::Connection& conn, KexiDB::TableOrQuerySchema& tableOrQuery,
diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.cpp b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
index f528cb23..f8634e82 100644
--- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp
+++ b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
@@ -47,8 +47,8 @@
#include <kexiutils/tristate.h>
KexiSimplePrintingCommand::KexiSimplePrintingCommand(
- KexiMainWindow* mainWin, int objectId, TQObject* tqparent)
- : TQObject(tqparent, "KexiSimplePrintCommand")
+ KexiMainWindow* mainWin, int objectId, TQObject* parent)
+ : TQObject(parent, "KexiSimplePrintCommand")
, m_previewEngine(0)
, m_mainWin(mainWin)
, m_objectId(objectId)
@@ -297,9 +297,9 @@ void KexiSimplePrintingCommand::slotShowPageSetupRequested()
//----------------------------------------------------------
-KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWin, TQWidget *tqparent,
+KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWin, TQWidget *parent,
TQMap<TQString,TQString>* args )
- : KexiViewBase( mainWin, tqparent, "KexiSimplePrintingPageSetup" )
+ : KexiViewBase( mainWin, parent, "KexiSimplePrintingPageSetup" )
, m_settings( KexiSimplePrintingSettings::load() )
// , m_command(0)
{
diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.h b/kexi/main/printing/kexisimpleprintingpagesetup.h
index b2fbc668..6efd1314 100644
--- a/kexi/main/printing/kexisimpleprintingpagesetup.h
+++ b/kexi/main/printing/kexisimpleprintingpagesetup.h
@@ -42,7 +42,7 @@ class KexiSimplePrintingCommand : public TQObject
public:
KexiSimplePrintingCommand(KexiMainWindow* mainWin, int objectId,
- TQObject* tqparent = 0);
+ TQObject* parent = 0);
~KexiSimplePrintingCommand();
public slots:
@@ -76,7 +76,7 @@ class KexiSimplePrintingPageSetup : public KexiViewBase
TQ_OBJECT
public:
- KexiSimplePrintingPageSetup( KexiMainWindow *mainWin, TQWidget *tqparent, TQMap<TQString,TQString>* args );
+ KexiSimplePrintingPageSetup( KexiMainWindow *mainWin, TQWidget *parent, TQMap<TQString,TQString>* args );
~KexiSimplePrintingPageSetup();
public slots:
diff --git a/kexi/main/printing/kexisimpleprintingpart.cpp b/kexi/main/printing/kexisimpleprintingpart.cpp
index ca751003..048f92ae 100644
--- a/kexi/main/printing/kexisimpleprintingpart.cpp
+++ b/kexi/main/printing/kexisimpleprintingpart.cpp
@@ -48,12 +48,12 @@ KexiSimplePrintingPart::~KexiSimplePrintingPart()
{
}
-KexiViewBase* KexiSimplePrintingPart::createView(TQWidget *tqparent, KexiDialogBase* dialog,
+KexiViewBase* KexiSimplePrintingPart::createView(TQWidget *parent, KexiDialogBase* dialog,
KexiPart::Item &item, int viewMode, TQMap<TQString,TQString>* args)
{
Q_UNUSED( item );
if (viewMode == Kexi::DesignViewMode) {
- KexiSimplePrintingPageSetup *w = new KexiSimplePrintingPageSetup( dialog->mainWin(), tqparent, args );
+ KexiSimplePrintingPageSetup *w = new KexiSimplePrintingPageSetup( dialog->mainWin(), parent, args );
return w;
}
diff --git a/kexi/main/printing/kexisimpleprintingpart.h b/kexi/main/printing/kexisimpleprintingpart.h
index 6e44ff4c..00c44b50 100644
--- a/kexi/main/printing/kexisimpleprintingpart.h
+++ b/kexi/main/printing/kexisimpleprintingpart.h
@@ -44,7 +44,7 @@ class KexiSimplePrintingPart : public KexiPart::StaticPart
virtual ~KexiSimplePrintingPart();
protected:
- virtual KexiViewBase* createView(TQWidget *tqparent, KexiDialogBase* dialog,
+ virtual KexiViewBase* createView(TQWidget *parent, KexiDialogBase* dialog,
KexiPart::Item &item, int viewMode, TQMap<TQString,TQString>* staticObjectArgs);
};
diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
index 960a23b2..68c1c673 100644
--- a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
+++ b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
@@ -36,8 +36,8 @@
#include <kapplication.h>
KexiSimplePrintPreviewView::KexiSimplePrintPreviewView(
- TQWidget *tqparent, KexiSimplePrintPreviewWindow *window)
- : TQWidget(tqparent, "KexiSimplePrintPreviewView", WStaticContents)//|WNoAutoErase)
+ TQWidget *parent, KexiSimplePrintPreviewWindow *window)
+ : TQWidget(parent, "KexiSimplePrintPreviewView", WStaticContents)//|WNoAutoErase)
, m_window(window)
{
enablePainting = false;
@@ -150,8 +150,8 @@ void KexiSimplePrintPreviewScrollView::setContentsPos(int x, int y)
KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow(
KexiSimplePrintingEngine &engine, const TQString& previewName,
- TQWidget *tqparent, WFlags f)
- : TQWidget(tqparent, "KexiSimplePrintPreviewWindow", f)
+ TQWidget *parent, WFlags f)
+ : TQWidget(parent, "KexiSimplePrintPreviewWindow", f)
, m_engine(engine)
, m_settings(*m_engine.settings())
, m_pageNumber(-1)
diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.h b/kexi/main/printing/kexisimpleprintpreviewwindow.h
index d3119339..35870285 100644
--- a/kexi/main/printing/kexisimpleprintpreviewwindow.h
+++ b/kexi/main/printing/kexisimpleprintpreviewwindow.h
@@ -38,7 +38,7 @@ class KexiSimplePrintPreviewWindow : public TQWidget
public:
KexiSimplePrintPreviewWindow(KexiSimplePrintingEngine &engine,
- const TQString& previewName, TQWidget *tqparent, WFlags f = 0);
+ const TQString& previewName, TQWidget *parent, WFlags f = 0);
~KexiSimplePrintPreviewWindow();
int currentPage() const { return m_pageNumber; }
diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow_p.h b/kexi/main/printing/kexisimpleprintpreviewwindow_p.h
index 2c72e8a1..5246d329 100644
--- a/kexi/main/printing/kexisimpleprintpreviewwindow_p.h
+++ b/kexi/main/printing/kexisimpleprintpreviewwindow_p.h
@@ -25,7 +25,7 @@
class KexiSimplePrintPreviewView : public TQWidget
{
public:
- KexiSimplePrintPreviewView(TQWidget *tqparent, KexiSimplePrintPreviewWindow *window);
+ KexiSimplePrintPreviewView(TQWidget *parent, KexiSimplePrintPreviewWindow *window);
virtual void paintEvent( TQPaintEvent *pe );
diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp
index 797dcc2a..a9a2a316 100644
--- a/kexi/main/startup/KexiConnSelector.cpp
+++ b/kexi/main/startup/KexiConnSelector.cpp
@@ -101,8 +101,8 @@ public:
/*================================================================*/
KexiConnSelectorWidget::KexiConnSelectorWidget( KexiDBConnectionSet& conn_set,
- const TQString& startDirOrVariable, TQWidget* tqparent, const char* name )
- : TQWidget( tqparent, name )
+ const TQString& startDirOrVariable, TQWidget* parent, const char* name )
+ : TQWidget( parent, name )
,d(new KexiConnSelectorWidgetPrivate())
{
d->conn_set = &conn_set;
diff --git a/kexi/main/startup/KexiConnSelector.h b/kexi/main/startup/KexiConnSelector.h
index 2f4a9fe9..c42fc536 100644
--- a/kexi/main/startup/KexiConnSelector.h
+++ b/kexi/main/startup/KexiConnSelector.h
@@ -67,7 +67,7 @@ class KEXIMAIN_EXPORT KexiConnSelectorWidget : public TQWidget
in KRecentDirs documentation). */
KexiConnSelectorWidget( KexiDBConnectionSet& conn_set,
const TQString& startDirOrVariable,
- TQWidget* tqparent = 0, const char* name = 0 );
+ TQWidget* parent = 0, const char* name = 0 );
virtual ~KexiConnSelectorWidget();
diff --git a/kexi/main/startup/KexiDBTitlePage.cpp b/kexi/main/startup/KexiDBTitlePage.cpp
index 4d686039..7c97440c 100644
--- a/kexi/main/startup/KexiDBTitlePage.cpp
+++ b/kexi/main/startup/KexiDBTitlePage.cpp
@@ -21,8 +21,8 @@
#include <tqlabel.h>
-KexiDBTitlePage::KexiDBTitlePage( const TQString& labelText, TQWidget* tqparent, const char* name )
- : KexiDBTitlePageBase( tqparent, name )
+KexiDBTitlePage::KexiDBTitlePage( const TQString& labelText, TQWidget* parent, const char* name )
+ : KexiDBTitlePageBase( parent, name )
{
if (!labelText.isEmpty())
label->setText(labelText);
diff --git a/kexi/main/startup/KexiDBTitlePage.h b/kexi/main/startup/KexiDBTitlePage.h
index 15030c7b..4ac59bc0 100644
--- a/kexi/main/startup/KexiDBTitlePage.h
+++ b/kexi/main/startup/KexiDBTitlePage.h
@@ -31,7 +31,7 @@ class KEXIMAIN_EXPORT KexiDBTitlePage : public KexiDBTitlePageBase
public:
//! Constructs title page. \a labelText can be provided to change default
//! "Project caption:" label.
- KexiDBTitlePage( const TQString& labelText, TQWidget* tqparent = 0, const char* name = 0 );
+ KexiDBTitlePage( const TQString& labelText, TQWidget* parent = 0, const char* name = 0 );
~KexiDBTitlePage();
protected slots:
diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp
index 9e897e8f..b24a66ab 100644
--- a/kexi/main/startup/KexiNewProjectWizard.cpp
+++ b/kexi/main/startup/KexiNewProjectWizard.cpp
@@ -84,8 +84,8 @@ class KexiNewProjectWizardPrivate
};
KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set,
- TQWidget *tqparent, const char *name, bool modal, WFlags f)
-: KWizard(tqparent, name, modal, f)
+ TQWidget *parent, const char *name, bool modal, WFlags f)
+: KWizard(parent, name, modal, f)
, d(new KexiNewProjectWizardPrivate() )
{
d->msgHandler = new KexiGUIMessageHandler(this);
diff --git a/kexi/main/startup/KexiNewProjectWizard.h b/kexi/main/startup/KexiNewProjectWizard.h
index 18dab257..ff16b996 100644
--- a/kexi/main/startup/KexiNewProjectWizard.h
+++ b/kexi/main/startup/KexiNewProjectWizard.h
@@ -39,7 +39,7 @@ class KEXIMAIN_EXPORT KexiNewProjectWizard : public KWizard
Q_OBJECT
TQ_OBJECT
public:
- KexiNewProjectWizard(KexiDBConnectionSet& conn_set, TQWidget *tqparent=0,
+ KexiNewProjectWizard(KexiDBConnectionSet& conn_set, TQWidget *parent=0,
const char *name=0, bool modal=false, WFlags f=0);
~KexiNewProjectWizard();
diff --git a/kexi/main/startup/KexiProjectSelector.cpp b/kexi/main/startup/KexiProjectSelector.cpp
index 55aa930f..9353e3a6 100644
--- a/kexi/main/startup/KexiProjectSelector.cpp
+++ b/kexi/main/startup/KexiProjectSelector.cpp
@@ -91,14 +91,14 @@ public:
/*================================================================*/
/*!
- * Constructs a KexiProjectSelector which is a child of 'tqparent', with the
+ * Constructs a KexiProjectSelector which is a child of 'parent', with the
* name 'name' and widget flags set to 'f'
*/
KexiProjectSelectorWidget::KexiProjectSelectorWidget(
- TQWidget* tqparent, const char* name,
+ TQWidget* parent, const char* name,
KexiProjectSet* prj_set, bool showProjectNameColumn,
bool showConnectionColumns )
- : KexiProjectSelectorBase( tqparent, name )
+ : KexiProjectSelectorBase( parent, name )
,m_prj_set(prj_set)
,d(new KexiProjectSelectorWidgetPrivate())
{
@@ -217,19 +217,19 @@ bool KexiProjectSelectorWidget::isSelectable() const
/*================================================================*/
-KexiProjectSelectorDialog::KexiProjectSelectorDialog( TQWidget *tqparent, const char *name,
+KexiProjectSelectorDialog::KexiProjectSelectorDialog( TQWidget *parent, const char *name,
KexiProjectSet* prj_set, bool showProjectNameColumn, bool showConnectionColumns)
: KDialogBase( Plain, i18n("Open Recent Project"),
#ifndef KEXI_NO_UNFINISHED
//! @todo re-add Help when doc is available
Help |
#endif
- Ok | Cancel, Ok, tqparent, name )
+ Ok | Cancel, Ok, parent, name )
{
init(prj_set, showProjectNameColumn, showConnectionColumns);
}
-KexiProjectSelectorDialog::KexiProjectSelectorDialog( TQWidget *tqparent, const char *name,
+KexiProjectSelectorDialog::KexiProjectSelectorDialog( TQWidget *parent, const char *name,
KexiDB::ConnectionData* cdata,
bool showProjectNameColumn, bool showConnectionColumns)
: KDialogBase(
@@ -238,7 +238,7 @@ KexiProjectSelectorDialog::KexiProjectSelectorDialog( TQWidget *tqparent, const
//! @todo re-add Help when doc is available
Help |
#endif
- Ok | Cancel, Ok, tqparent, name, true/*modal*/, false/*sep*/ )
+ Ok | Cancel, Ok, parent, name, true/*modal*/, false/*sep*/ )
{
setButtonGuiItem(Ok, KGuiItem(i18n("&Open"), "fileopen", i18n("Open Database Connection")));
assert(cdata);
diff --git a/kexi/main/startup/KexiProjectSelector.h b/kexi/main/startup/KexiProjectSelector.h
index 91c13712..43c6a6b5 100644
--- a/kexi/main/startup/KexiProjectSelector.h
+++ b/kexi/main/startup/KexiProjectSelector.h
@@ -45,7 +45,7 @@ public:
information about database driver and connection columns are added.
\a prj_set may be NULL - you can assign a set later with setProjectSet().
*/
- KexiProjectSelectorWidget( TQWidget* tqparent = 0, const char* name = 0,
+ KexiProjectSelectorWidget( TQWidget* parent = 0, const char* name = 0,
KexiProjectSet* prj_set = 0, bool showProjectNameColumn = true,
bool showConnectionColumns = true );
@@ -99,7 +99,7 @@ public:
/*! Constructor 1, used for displaying recent projects list
Label "there are recently opened projects" is displayed automatically
*/
- KexiProjectSelectorDialog( TQWidget *tqparent, const char *name,
+ KexiProjectSelectorDialog( TQWidget *parent, const char *name,
KexiProjectSet* prj_set,
bool showProjectNameColumn = true, bool showConnectionColumns = true);
@@ -107,7 +107,7 @@ public:
Label "Select one of these existing projects on server" is displayed automatically
You should test if project set was properly loaded using projectSet()->error().
*/
- KexiProjectSelectorDialog( TQWidget *tqparent, const char *name,
+ KexiProjectSelectorDialog( TQWidget *parent, const char *name,
KexiDB::ConnectionData* cdata,
bool showProjectNameColumn = true, bool showConnectionColumns = true);
diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp
index 13becfc8..61746d5c 100644
--- a/kexi/main/startup/KexiStartup.cpp
+++ b/kexi/main/startup/KexiStartup.cpp
@@ -134,9 +134,9 @@ void updateProgressBar(KProgressDialog *pd, char *buffer, int buflen)
//---------------------------------
-KexiDBPasswordDialog::KexiDBPasswordDialog(TQWidget *tqparent, KexiDB::ConnectionData& cdata, bool showDetailsButton)
+KexiDBPasswordDialog::KexiDBPasswordDialog(TQWidget *parent, KexiDB::ConnectionData& cdata, bool showDetailsButton)
: KPasswordDialog( KPasswordDialog::Password, false/*keep*/,
- showDetailsButton ? (int)KDialogBase::User1 : 0, tqparent )
+ showDetailsButton ? (int)KDialogBase::User1 : 0, parent )
, m_cdata(&cdata)
, m_showConnectionDetailsRequested(false)
{
@@ -739,7 +739,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
tristate KexiStartupHandler::detectActionForFile(
KexiStartupData::Import& detectedImportAction, TQString& detectedDriverName,
- const TQString& _suggestedDriverName, const TQString &dbFileName, TQWidget *tqparent, int options )
+ const TQString& _suggestedDriverName, const TQString &dbFileName, TQWidget *parent, int options )
{
detectedImportAction = KexiStartupData::Import(); //clear
TQString suggestedDriverName(_suggestedDriverName); //safe
@@ -747,7 +747,7 @@ tristate KexiStartupHandler::detectActionForFile(
TQFileInfo finfo(dbFileName);
if (dbFileName.isEmpty() || !finfo.isReadable()) {
if (!(options & SkipMessages))
- KMessageBox::sorry(tqparent, i18n("<p>Could not open project.</p>")
+ KMessageBox::sorry(parent, i18n("<p>Could not open project.</p>")
+i18n("<p>The file <nobr>\"%1\"</nobr> does not exist or is not readable.</p>")
.tqarg(TQDir::convertSeparators(dbFileName))
+i18n("Check the file's permissions and whether it is already opened "
@@ -779,7 +779,7 @@ tristate KexiStartupHandler::detectActionForFile(
if (!f.open(IO_ReadOnly)) {
// BTW: similar error msg is provided in SQLiteConnection::drv_useDatabase()
if (!(options & SkipMessages))
- KMessageBox::sorry(tqparent, i18n("<p>Could not open project.</p>")
+ KMessageBox::sorry(parent, i18n("<p>Could not open project.</p>")
+i18n("<p>The file <nobr>\"%1\"</nobr> is not readable.</p>")
.tqarg(TQDir::convertSeparators(dbFileName))
+i18n("Check the file's permissions and whether it is already opened "
@@ -802,7 +802,7 @@ tristate KexiStartupHandler::detectActionForFile(
if (ptr.data()) {
if (mimename=="application/x-msaccess") {
if ((options & SkipMessages) || KMessageBox::Yes != KMessageBox::questionYesNo(
- tqparent, i18n("\"%1\" is an external file of type:\n\"%2\".\n"
+ parent, i18n("\"%1\" is an external file of type:\n\"%2\".\n"
"Do you want to import the file as a Kexi project?")
.tqarg(TQDir::convertSeparators(dbFileName)).tqarg(ptr.data()->comment()),
i18n("Open External File"), KGuiItem(i18n("Import...")), KStdGuiItem::cancel() ) )
@@ -826,7 +826,7 @@ tristate KexiStartupHandler::detectActionForFile(
if (!useDetectedDriver) {
int res = KMessageBox::Yes;
if (!(options & SkipMessages))
- res = KMessageBox::warningYesNoCancel(tqparent, i18n(
+ res = KMessageBox::warningYesNoCancel(parent, i18n(
"The project file \"%1\" is recognized as compatible with \"%2\" database driver, "
"while you have asked for \"%3\" database driver to be used.\n"
"Do you want to use \"%4\" database driver?")
@@ -848,7 +848,7 @@ tristate KexiStartupHandler::detectActionForFile(
const TQString newFileFormat = "SQLite3";
if (!(options & DontConvert || options & SkipMessages)
&& detectedDriverName.lower()=="sqlite2" && detectedDriverName.lower()!=suggestedDriverName.lower()
- && KMessageBox::Yes == KMessageBox::questionYesNo(tqparent, i18n(
+ && KMessageBox::Yes == KMessageBox::questionYesNo(parent, i18n(
"Previous version of database file format (\"%1\") is detected in the \"%2\" "
"project file.\nDo you want to convert the project to a new \"%3\" format (recommended)?")
.tqarg(detectedDriverName).tqarg(TQDir::convertSeparators(dbFileName)).tqarg(newFileFormat)) )
@@ -859,7 +859,7 @@ tristate KexiStartupHandler::detectActionForFile(
// kdDebug() << "--- migr.run() END ---" <<endl;
if (!res) {
//TODO msg
- KMessageBox::sorry(tqparent, i18n(
+ KMessageBox::sorry(parent, i18n(
"Failed to convert project file \"%1\" to a new \"%2\" format.\n"
"The file format remains unchanged.")
.tqarg(TQDir::convertSeparators(dbFileName)).tqarg(newFileFormat) );
@@ -876,7 +876,7 @@ tristate KexiStartupHandler::detectActionForFile(
possibleProblemsInfoMsg += TQString::tqfromLatin1("</p>");
}
if (!(options & SkipMessages))
- KMessageBox::detailedSorry(tqparent,
+ KMessageBox::detailedSorry(parent,
i18n( "The file \"%1\" is not recognized as being supported by Kexi.")
.tqarg(TQDir::convertSeparators(dbFileName)),
TQString::tqfromLatin1("<p>")
@@ -892,7 +892,7 @@ tristate KexiStartupHandler::detectActionForFile(
}
KexiProjectData*
-KexiStartupHandler::selectProject(KexiDB::ConnectionData *cdata, bool& cancelled, TQWidget *tqparent)
+KexiStartupHandler::selectProject(KexiDB::ConnectionData *cdata, bool& cancelled, TQWidget *parent)
{
cleartqStatus();
cancelled = false;
@@ -911,7 +911,7 @@ KexiStartupHandler::selectProject(KexiDB::ConnectionData *cdata, bool& cancelled
}
KexiProjectData* projectData = 0;
//dialog for selecting a project
- KexiProjectSelectorDialog prjdlg( tqparent, "prjdlg", cdata, true, false );
+ KexiProjectSelectorDialog prjdlg( parent, "prjdlg", cdata, true, false );
if (!prjdlg.projectSet() || prjdlg.projectSet()->error()) {
KexiGUIMessageHandler msgh;
if (prjdlg.projectSet())
diff --git a/kexi/main/startup/KexiStartup.h b/kexi/main/startup/KexiStartup.h
index 22c55440..fe1b3cf0 100644
--- a/kexi/main/startup/KexiStartup.h
+++ b/kexi/main/startup/KexiStartup.h
@@ -42,7 +42,7 @@ class KEXIMAIN_EXPORT KexiDBPasswordDialog : public KPasswordDialog
Q_OBJECT
TQ_OBJECT
public:
- KexiDBPasswordDialog(TQWidget *tqparent, KexiDB::ConnectionData& cdata, bool showDetailsButton = false);
+ KexiDBPasswordDialog(TQWidget *parent, KexiDB::ConnectionData& cdata, bool showDetailsButton = false);
virtual ~KexiDBPasswordDialog();
bool showConnectionDetailsRequested() const { return m_showConnectionDetailsRequested; }
@@ -73,12 +73,12 @@ class KEXIMAIN_EXPORT KexiStartupHandler
#if 0
/*! Used for opening existing projects.
Detects project file type by mime type and returns project data, if it can be detected,
- otherwise - NULL. \a tqparent is passed as tqparent for potential error message boxes.
+ otherwise - NULL. \a parent is passed as parent for potential error message boxes.
Also uses \a cdata connection data for server-based projects.
cdata.driverName is adjusted, if a file-based project has been detected.
*/
static KexiProjectData* detectProjectData(
- KexiDB::ConnectionData& cdata, const TQString &dbname, TQWidget *tqparent);
+ KexiDB::ConnectionData& cdata, const TQString &dbname, TQWidget *parent);
#endif
/*! Options for detectDriverForFile() */
@@ -103,20 +103,20 @@ class KEXIMAIN_EXPORT KexiStartupHandler
- "shortcut" if the file looks like a shortcut to a project/connection file
- "connection" if the file looks like a connection data file.
- \a tqparent is passed as a tqparent for potential error message boxes.
+ \a parent is passed as a parent for potential error message boxes.
\a driverName is a preferred driver name.
\a options should be a combination of DetectDriverForFileOptions enum values. */
static tristate detectActionForFile(
KexiStartupData::Import& detectedImportAction, TQString& detectedDriverName,
const TQString& _suggestedDriverName,
- const TQString &dbFileName, TQWidget *tqparent = 0, int options = 0 );
+ const TQString &dbFileName, TQWidget *parent = 0, int options = 0 );
/*! Allows user to select a project with KexiProjectSelectorDialog.
\return selected project's data
Returns NULL and sets cancelled to true if the dialog was cancelled.
Returns NULL and sets cancelled to false if there was an error.
*/
- KexiProjectData* selectProject(KexiDB::ConnectionData *cdata, bool& cancelled, TQWidget *tqparent = 0);
+ KexiProjectData* selectProject(KexiDB::ConnectionData *cdata, bool& cancelled, TQWidget *parent = 0);
protected slots:
void slotSaveShortcutFileChanges();
diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp
index 40ced9b1..43666706 100644
--- a/kexi/main/startup/KexiStartupDialog.cpp
+++ b/kexi/main/startup/KexiStartupDialog.cpp
@@ -142,21 +142,21 @@ TQString captionForDialogType(int type)
}
/*================================================================*/
-/*KexiStartupDialog::KexiStartupDialog(TQWidget *tqparent, const char *name, KInstance* global,
+/*KexiStartupDialog::KexiStartupDialog(TQWidget *parent, const char *name, KInstance* global,
const TQCString &format, const TQString &nativePattern,
const TQString &nativeName, const DialogType &dialogType,
const TQCString& templateType) :
- KDialogBase(tqparent, name, true, i18n("Open Document"), KDialogBase::Ok | KDialogBase::Cancel,
+ KDialogBase(parent, name, true, i18n("Open Document"), KDialogBase::Ok | KDialogBase::Cancel,
KDialogBase::Ok) {
*/
KexiStartupDialog::KexiStartupDialog(
int dialogType, int dialogOptions,
KexiDBConnectionSet& connSet, KexiProjectSet& recentProjects,
- TQWidget *tqparent, const char *name )
+ TQWidget *parent, const char *name )
: KDialogBase(
dlgSinglePage(dialogType) ? Plain : Tabbed
,captionForDialogType(dialogType)
- ,Help | Ok | Cancel, Ok, tqparent, name )
+ ,Help | Ok | Cancel, Ok, parent, name )
, d(new KexiStartupDialogPrivate())
{
d->recentProjects = &recentProjects;
diff --git a/kexi/main/startup/KexiStartupDialog.h b/kexi/main/startup/KexiStartupDialog.h
index 0f994ff3..aad9ec9e 100644
--- a/kexi/main/startup/KexiStartupDialog.h
+++ b/kexi/main/startup/KexiStartupDialog.h
@@ -89,7 +89,7 @@ public:
@param recentProjects a set of recent projects' info, used for "Open recent" tab
@param connSet conenction set used to present available conenctions
in "Open Existing" tab. Pass an empty object is this tab is not used.
- @param tqparent tqparent widget, if any.
+ @param parent parent widget, if any.
@param name name of this object.
*/
KexiStartupDialog(
@@ -97,7 +97,7 @@ public:
int dialogOptions,
KexiDBConnectionSet& connSet,
KexiProjectSet& recentProjects,
- TQWidget *tqparent = 0, const char *name = 0 );
+ TQWidget *parent = 0, const char *name = 0 );
~KexiStartupDialog();
/*! \return true if startup dialog should be shown (info is taken from kexi config)
diff --git a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
index 52fe0870..429499f4 100644
--- a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
+++ b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
@@ -52,10 +52,10 @@
class TemplateItem : public KListViewItem
{
public:
- TemplateItem(TQListView* tqparent, const TQString& aFilename,
+ TemplateItem(TQListView* parent, const TQString& aFilename,
const TQString& name, const TQString& description, const TQPixmap& icon,
const TQValueList<KexiProjectData::ObjectInfo>& aAutoopenObjects)
- : KListViewItem(tqparent, name + "\n" + description)
+ : KListViewItem(parent, name + "\n" + description)
, autoopenObjects(aAutoopenObjects)
, filename(aFilename)
{
@@ -69,8 +69,8 @@ class TemplateItem : public KListViewItem
//-----------------------
-KexiStartupDialogTemplatesPage::KexiStartupDialogTemplatesPage( TQWidget * tqparent )
- : KListView(tqparent, "KexiStartupDialogTemplatesPage")
+KexiStartupDialogTemplatesPage::KexiStartupDialogTemplatesPage( TQWidget * parent )
+ : KListView(parent, "KexiStartupDialogTemplatesPage")
, m_popuplated(false)
{
addColumn(TQString());
diff --git a/kexi/main/startup/KexiStartupDialogTemplatesPage.h b/kexi/main/startup/KexiStartupDialogTemplatesPage.h
index 2cf50b7b..2c7058d4 100644
--- a/kexi/main/startup/KexiStartupDialogTemplatesPage.h
+++ b/kexi/main/startup/KexiStartupDialogTemplatesPage.h
@@ -30,7 +30,7 @@ class KEXIMAIN_EXPORT KexiStartupDialogTemplatesPage : public KListView
TQ_OBJECT
public:
- KexiStartupDialogTemplatesPage( TQWidget * tqparent = 0 );
+ KexiStartupDialogTemplatesPage( TQWidget * parent = 0 );
~KexiStartupDialogTemplatesPage();
// void addItem(const TQString& key, const TQString& name,
// const TQString& description, const TQPixmap& icon);
diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp
index ed4dcd40..cd54602b 100644
--- a/kexi/main/startup/KexiStartupFileDialog.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog.cpp
@@ -37,8 +37,8 @@
KexiStartupFileDialog::KexiStartupFileDialog(
const TQString& startDirOrVariable, int mode,
- TQWidget *tqparent, const char *name)
- : KexiStartupFileDialogBase(startDirOrVariable, "", tqparent, name, 0)
+ TQWidget *parent, const char *name)
+ : KexiStartupFileDialogBase(startDirOrVariable, "", parent, name, 0)
, m_confirmOverwrites(true)
, m_filtersUpdated(false)
{
@@ -323,12 +323,12 @@ bool KexiStartupFileDialog::checkFileName()
}
//static
-bool KexiStartupFileDialog::askForOverwriting(const TQString& filePath, TQWidget *tqparent)
+bool KexiStartupFileDialog::askForOverwriting(const TQString& filePath, TQWidget *parent)
{
TQFileInfo fi(filePath);
if (!fi.exists())
return true;
- const int res = KMessageBox::warningYesNo( tqparent, i18n( "The file \"%1\" already exists.\n"
+ const int res = KMessageBox::warningYesNo( parent, i18n( "The file \"%1\" already exists.\n"
"Do you want to overwrite it?").tqarg( TQDir::convertSeparators(filePath) ), TQString(),
i18n("Overwrite"), KStdGuiItem::no() );
if (res == KMessageBox::Yes)
diff --git a/kexi/main/startup/KexiStartupFileDialog.h b/kexi/main/startup/KexiStartupFileDialog.h
index 12fc3ef4..c85797db 100644
--- a/kexi/main/startup/KexiStartupFileDialog.h
+++ b/kexi/main/startup/KexiStartupFileDialog.h
@@ -50,15 +50,15 @@ public:
};
KexiStartupFileDialog(
- const TQString& startDirOrVariable, int mode, TQWidget *tqparent=0, const char *name=0);
+ const TQString& startDirOrVariable, int mode, TQWidget *parent=0, const char *name=0);
virtual ~KexiStartupFileDialog();
/*! Helper. Displays "The file %1 already exists. Do you want to overwrite it?" yes/no message box.
- \a tqparent is used as a tqparent of the KMessageBox.
+ \a parent is used as a parent of the KMessageBox.
\return true if \a filePath file does not exists or user has agreed on overwriting,
false in user do not want to overwrite. */
- static bool askForOverwriting(const TQString& filePath, TQWidget *tqparent = 0);
+ static bool askForOverwriting(const TQString& filePath, TQWidget *parent = 0);
void setMode(int mode);
diff --git a/kexi/main/startup/KexiStartupFileDialogBase_win.h b/kexi/main/startup/KexiStartupFileDialogBase_win.h
index 00742c69..9231b744 100644
--- a/kexi/main/startup/KexiStartupFileDialogBase_win.h
+++ b/kexi/main/startup/KexiStartupFileDialogBase_win.h
@@ -33,7 +33,7 @@ class KexiStartupFileDialogBase : public TQFileDialog
{
public:
KexiStartupFileDialogBase(const TQString & dirName, const TQString & filter = TQString(),
- TQWidget * tqparent = 0, const char * name = 0, bool modal = false );
+ TQWidget * parent = 0, const char * name = 0, bool modal = false );
~KexiStartupFileDialogBase();
TQPushButton * okButton() const { return m_okBtn; }
diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp
index e716a607..c81de131 100644
--- a/kexi/main/startup/KexiStartupFileDialog_win.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp
@@ -47,8 +47,8 @@ class KexiStartupFileDialogBasePrivate
KexiStartupFileDialogBase::KexiStartupFileDialogBase(
const TQString & dirName, const TQString & filter,
- TQWidget * tqparent, const char * name, bool modal )
- : TQFileDialog( realStartDir(dirName), filter, tqparent, name, modal )
+ TQWidget * parent, const char * name, bool modal )
+ : TQFileDialog( realStartDir(dirName), filter, parent, name, modal )
, d(new KexiStartupFileDialogBasePrivate())
{
// TQString _dirName = dirName;
@@ -58,7 +58,7 @@ KexiStartupFileDialogBase::KexiStartupFileDialogBase(
if (_dirName.isEmpty())
_dirName = KGlobalSettings::documentPath();
- init(_dirName, filter, tqparent);
+ init(_dirName, filter, parent);
//find "OK" button
TQObjectList *l = queryList( TQPUSHBUTTON_OBJECT_NAME_STRING, "OK", false );
@@ -183,7 +183,7 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
// plug nav items into the toolbar
coll->action( "up" )->plug( toolbar );
- coll->action( "up" )->setWhatsThis(i18n("<qt>Click this button to enter the tqparent directory.<p>"
+ coll->action( "up" )->setWhatsThis(i18n("<qt>Click this button to enter the parent directory.<p>"
"For instance, if the current location is file:/home/%1 clicking this "
"button will take you to file:/home.</qt>").tqarg(getlogin()));
coll->action( "back" )->plug( toolbar );