Rename obsolete tq methods to standard names

1 files changed, 32 insertions, 32 deletions

diff --git a/src/settings.cpp b/src/settings.cpp
index 9195324..4c9d2f3 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -357,12 +357,12 @@ void Settings::setAutoBullet(bool yes)
 GeneralPage::GeneralPage(TQWidget * parent, const char * name)
  : KCModule(parent, name)
 {
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, /*margin=*/0, KDialogBase::spacingHint());
+	TQVBoxLayout *layout = new TQVBoxLayout(this, /*margin=*/0, KDialogBase::spacingHint());
 	TQHBoxLayout *hLay;
 	TQLabel      *label;
 	HelpLabel   *hLabel;
 
-	TQGridLayout *gl = new TQGridLayout(tqlayout, /*nRows=*/3, /*nCols=*/3);
+	TQGridLayout *gl = new TQGridLayout(layout, /*nRows=*/3, /*nCols=*/3);
 	gl->addItem(new TQSpacerItem(0, 0, TQSizePolicy::Expanding), 0, 2);
 
 	// Basket Tree Position:
@@ -399,11 +399,11 @@ GeneralPage::GeneralPage(TQWidget * parent, const char * name)
 	hLay->addWidget(m_usePassivePopup);
 	hLay->addWidget(hLabel);
 	hLay->addStretch();
-	tqlayout->addLayout(hLay);
+	layout->addLayout(hLay);
 
 	// System Tray Icon:
 	TQGroupBox *gbSys = new TQGroupBox(3, Qt::Vertical, i18n("System Tray Icon"), this);
-	tqlayout->addWidget(gbSys);
+	layout->addWidget(gbSys);
 	TQVBoxLayout *sysLay = new TQVBoxLayout(gbSys, /*margin=*/0, KDialogBase::spacingHint());
 
 	// Dock in System Tray:
@@ -450,7 +450,7 @@ GeneralPage::GeneralPage(TQWidget * parent, const char * name)
 
 	connect( m_useSystray,     TQT_SIGNAL(toggled(bool)), m_systray,              TQT_SLOT(setEnabled(bool)) );
 
-	tqlayout->insertStretch(-1);
+	layout->insertStretch(-1);
 	load();
 }
 
@@ -502,14 +502,14 @@ void GeneralPage::defaults()
 BasketsPage::BasketsPage(TQWidget * parent, const char * name)
  : KCModule(parent, name)
 {
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, /*margin=*/0, KDialogBase::spacingHint());
+	TQVBoxLayout *layout = new TQVBoxLayout(this, /*margin=*/0, KDialogBase::spacingHint());
 	TQHBoxLayout *hLay;
 	HelpLabel   *hLabel;
 
 	// Appearance:
 
 	TQGroupBox *appearanceBox = new TQGroupBox(3, Qt::Vertical, i18n("Appearance"), this);
-	tqlayout->addWidget(appearanceBox);
+	layout->addWidget(appearanceBox);
 
 	m_playAnimations = new TQCheckBox(i18n("Ani&mate changes in baskets"), appearanceBox);
 	connect( m_playAnimations, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) );
@@ -523,7 +523,7 @@ BasketsPage::BasketsPage(TQWidget * parent, const char * name)
 	// Behavior:
 
 	TQGroupBox *behaviorBox = new TQGroupBox(5, Qt::Vertical, i18n("Behavior"), this);
-	tqlayout->addWidget(behaviorBox);
+	layout->addWidget(behaviorBox);
 
 	m_autoBullet = new TQCheckBox(i18n("&Transform lines starting with * or - to lists in text editors"), behaviorBox);
 	connect( m_autoBullet, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) );
@@ -566,7 +566,7 @@ BasketsPage::BasketsPage(TQWidget * parent, const char * name)
 	hLayV->addWidget(m_groupOnInsertionLine);
 	hLayV->addWidget(helpV);
 	hLayV->insertStretch(-1);
-	tqlayout->addWidget(m_groupOnInsertionLineWidget);
+	layout->addWidget(m_groupOnInsertionLineWidget);
 	connect(m_groupOnInsertionLine, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()));
 
 	widget = new TQWidget(behaviorBox);
@@ -594,7 +594,7 @@ BasketsPage::BasketsPage(TQWidget * parent, const char * name)
 	// Protection:
 
 	TQGroupBox *protectionBox = new TQGroupBox(3, Qt::Vertical, i18n("Password Protection"), this);
-	tqlayout->addWidget(protectionBox);
+	layout->addWidget(protectionBox);
 	widget = new TQWidget(protectionBox);
 
 	// Re-Lock timeout configuration
@@ -608,7 +608,7 @@ BasketsPage::BasketsPage(TQWidget * parent, const char * name)
 	//label = new TQLabel(i18n("minutes"), this);
 	//hLay->addWidget(label);
 	hLay->addStretch();
-//	tqlayout->addLayout(hLay);
+//	layout->addLayout(hLay);
 	connect( m_enableReLockTimeoutMinutes, TQT_SIGNAL(stateChanged(int)), this,                   TQT_SLOT(changed())        );
 	connect( m_reLockTimeoutMinutes,       TQT_SIGNAL(valueChanged(int)), this,                   TQT_SLOT(changed())        );
 	connect( m_enableReLockTimeoutMinutes, TQT_SIGNAL(toggled(bool)),     m_reLockTimeoutMinutes, TQT_SLOT(setEnabled(bool)) );
@@ -619,7 +619,7 @@ BasketsPage::BasketsPage(TQWidget * parent, const char * name)
 	connect( m_useGnuPGAgent, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) );
 #endif
 
-	tqlayout->insertStretch(-1);
+	layout->insertStretch(-1);
 	load();
 }
 
@@ -682,7 +682,7 @@ void BasketsPage::defaults()
 NewNotesPage::NewNotesPage(TQWidget * parent, const char * name)
  : KCModule(parent, name)
 {
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, /*margin=*/0, KDialogBase::spacingHint());
+	TQVBoxLayout *layout = new TQVBoxLayout(this, /*margin=*/0, KDialogBase::spacingHint());
 	TQHBoxLayout *hLay;
 	TQLabel      *label;
 
@@ -697,7 +697,7 @@ NewNotesPage::NewNotesPage(TQWidget * parent, const char * name)
 	hLay->addWidget(label);
 	hLay->addWidget(m_newNotesPlace);
 	hLay->addStretch();
-	//tqlayout->addLayout(hLay);
+	//layout->addLayout(hLay);
 	label->hide();
 	m_newNotesPlace->hide();
 	connect( m_newNotesPlace, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()) );
@@ -726,7 +726,7 @@ NewNotesPage::NewNotesPage(TQWidget * parent, const char * name)
 	m_pushVisualize = new TQPushButton(i18n("&Visualize..."), this);
 	hLay->addWidget(m_pushVisualize);
 	hLay->addStretch();
-	tqlayout->addLayout(hLay);
+	layout->addLayout(hLay);
 	connect( m_pushVisualize, TQT_SIGNAL(clicked()), this, TQT_SLOT(visualize()) );
 
 	// View File Content:
@@ -736,13 +736,13 @@ NewNotesPage::NewNotesPage(TQWidget * parent, const char * name)
 	m_viewHtmlFileContent  = new TQCheckBox( i18n("&HTML page"),          buttonGroup );
 	m_viewImageFileContent = new TQCheckBox( i18n("&Image or animation"), buttonGroup );
 	m_viewSoundFileContent = new TQCheckBox( i18n("&Sound"),              buttonGroup );
-	tqlayout->addWidget(buttonGroup);
+	layout->addWidget(buttonGroup);
 	connect( m_viewTextFileContent,  TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) );
 	connect( m_viewHtmlFileContent,  TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) );
 	connect( m_viewImageFileContent, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) );
 	connect( m_viewSoundFileContent, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) );
 
-	tqlayout->insertStretch(-1);
+	layout->insertStretch(-1);
 	load();
 }
 
@@ -790,9 +790,9 @@ void NewNotesPage::visualize()
 NotesAppearancePage::NotesAppearancePage(TQWidget * parent, const char * name)
  : KCModule(parent, name)
 {
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, /*margin=*/0, KDialogBase::spacingHint());
+	TQVBoxLayout *layout = new TQVBoxLayout(this, /*margin=*/0, KDialogBase::spacingHint());
 	TQTabWidget *tabs = new TQTabWidget(this);
-	tqlayout->addWidget(tabs);
+	layout->addWidget(tabs);
 
 	m_soundLook       = new LinkLookEditWidget(this, i18n("Conference audio record"),                         "sound",       tabs);
 	m_fileLook        = new LinkLookEditWidget(this, i18n("Annual report"),                                   "document",    tabs);
@@ -838,7 +838,7 @@ ApplicationsPage::ApplicationsPage(TQWidget * parent, const char * name)
  : KCModule(parent, name)
 {
 	/* Applications page */
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, /*margin=*/0, KDialogBase::spacingHint());
+	TQVBoxLayout *layout = new TQVBoxLayout(this, /*margin=*/0, KDialogBase::spacingHint());
 
 	m_htmlUseProg  = new TQCheckBox(i18n("Open &text notes with a custom application:"), this);
 	m_htmlProg     = new RunCommandRequester("", i18n("Open text notes with:"), this);
@@ -890,16 +890,16 @@ ApplicationsPage::ApplicationsPage(TQWidget * parent, const char * name)
 	TQWhatsThis::add(m_animationProg, whatsthis);
 	TQWhatsThis::add(m_soundProg,     whatsthis);
 
-	tqlayout->addWidget(m_htmlUseProg);
-	tqlayout->addItem(hLayH);
-	tqlayout->addWidget(m_imageUseProg);
-	tqlayout->addItem(hLayI);
-	tqlayout->addWidget(m_animationUseProg);
-	tqlayout->addItem(hLayA);
-	tqlayout->addWidget(m_soundUseProg);
-	tqlayout->addItem(hLayS);
+	layout->addWidget(m_htmlUseProg);
+	layout->addItem(hLayH);
+	layout->addWidget(m_imageUseProg);
+	layout->addItem(hLayI);
+	layout->addWidget(m_animationUseProg);
+	layout->addItem(hLayA);
+	layout->addWidget(m_soundUseProg);
+	layout->addItem(hLayS);
 
-	tqlayout->addSpacing(KDialogBase::spacingHint());
+	layout->addSpacing(KDialogBase::spacingHint());
 
 	TQHBoxLayout *hLay = new TQHBoxLayout(0L, /*margin=*/0, /*spacing=*/0);
 	HelpLabel *hl1 = new HelpLabel(
@@ -918,7 +918,7 @@ ApplicationsPage::ApplicationsPage(TQWidget * parent, const char * name)
 		this);
 	hLay->addWidget(hl1);
 	hLay->addStretch();
-	tqlayout->addLayout(hLay);
+	layout->addLayout(hLay);
 
 	hLay = new TQHBoxLayout(0L, /*margin=*/0, /*spacing=*/0);
 	HelpLabel *hl2 = new HelpLabel(
@@ -938,14 +938,14 @@ ApplicationsPage::ApplicationsPage(TQWidget * parent, const char * name)
 		this);
 	hLay->addWidget(hl2);
 	hLay->addStretch();
-	tqlayout->addLayout(hLay);
+	layout->addLayout(hLay);
 
 	connect( m_htmlUseProg,      TQT_SIGNAL(toggled(bool)), m_htmlProg,      TQT_SLOT(setEnabled(bool)) );
 	connect( m_imageUseProg,     TQT_SIGNAL(toggled(bool)), m_imageProg,     TQT_SLOT(setEnabled(bool)) );
 	connect( m_animationUseProg, TQT_SIGNAL(toggled(bool)), m_animationProg, TQT_SLOT(setEnabled(bool)) );
 	connect( m_soundUseProg,     TQT_SIGNAL(toggled(bool)), m_soundProg,     TQT_SLOT(setEnabled(bool)) );
 
-	tqlayout->insertStretch(-1);
+	layout->insertStretch(-1);
 	load();
 }