Rename a number of old tq methods that are no longer tq specific

1 files changed, 11 insertions, 11 deletions

diff --git a/kalarm/templatedlg.cpp b/kalarm/templatedlg.cpp
index fa176f8b9..a493e0ed7 100644
--- a/kalarm/templatedlg.cpp
+++ b/kalarm/templatedlg.cpp
@@ -20,7 +20,7 @@
 
 #include "kalarm.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqwhatsthis.h>
 
@@ -50,34 +50,34 @@ TemplateDlg::TemplateDlg(TQWidget* parent, const char* name)
 	TQBoxLayout* topLayout = new TQHBoxLayout(topWidget);
 	topLayout->setSpacing(spacingHint());
 
-	TQBoxLayout* tqlayout = new TQVBoxLayout(topLayout);
+	TQBoxLayout* layout = new TQVBoxLayout(topLayout);
 	mTemplateList = new TemplateListView(true, i18n("The list of alarm templates"), topWidget);
 	mTemplateList->setSelectionMode(TQListView::Extended);
-	mTemplateList->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+	mTemplateList->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
 	connect(mTemplateList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged()));
-	tqlayout->addWidget(mTemplateList);
+	layout->addWidget(mTemplateList);
 
-	tqlayout = new TQVBoxLayout(topLayout);
+	layout = new TQVBoxLayout(topLayout);
 	TQPushButton* button = new TQPushButton(i18n("&New..."), topWidget);
 	connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(slotNew()));
 	TQWhatsThis::add(button, i18n("Create a new alarm template"));
-	tqlayout->addWidget(button);
+	layout->addWidget(button);
 
 	mEditButton = new TQPushButton(i18n("&Edit..."), topWidget);
 	connect(mEditButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEdit()));
 	TQWhatsThis::add(mEditButton, i18n("Edit the currently highlighted alarm template"));
-	tqlayout->addWidget(mEditButton);
+	layout->addWidget(mEditButton);
 
 	mCopyButton = new TQPushButton(i18n("Co&py"), topWidget);
 	connect(mCopyButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotCopy()));
 	TQWhatsThis::add(mCopyButton,
 	      i18n("Create a new alarm template based on a copy of the currently highlighted template"));
-	tqlayout->addWidget(mCopyButton);
+	layout->addWidget(mCopyButton);
 
 	mDeleteButton = new TQPushButton(i18n("&Delete"), topWidget);
 	connect(mDeleteButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDelete()));
 	TQWhatsThis::add(mDeleteButton, i18n("Delete the currently highlighted alarm template"));
-	tqlayout->addWidget(mDeleteButton);
+	layout->addWidget(mDeleteButton);
 
 	KAccel* accel = new KAccel(this);
 	accel->insert(KStdAccel::SelectAll, TQT_TQOBJECT(mTemplateList), TQT_SLOT(slotSelectAll()));
@@ -192,14 +192,14 @@ void TemplateDlg::slotDelete()
 		return;
 
 	int warnErr = 0;
-	KAlarm::UpdatetqStatus status = KAlarm::UPDATE_OK;
+	KAlarm::UpdateStatus status = KAlarm::UPDATE_OK;
 	TQValueList<KAEvent> events;
 	AlarmCalendar::templateCalendar()->startUpdate();    // prevent multiple saves of the calendar until we're finished
 	for (TQValueList<EventListViewItemBase*>::Iterator it = items.begin();  it != items.end();  ++it)
 	{
 		TemplateListViewItem* item = (TemplateListViewItem*)(*it);
 		events.append(item->event());
-		KAlarm::UpdatetqStatus st = KAlarm::deleteTemplate(item->event());
+		KAlarm::UpdateStatus st = KAlarm::deleteTemplate(item->event());
 		if (st != KAlarm::UPDATE_OK)
 		{
 			status = st;