Rename obsolete tq methods to standard names

3 files changed, 16 insertions, 16 deletions

diff --git a/kipi-plugins/kameraklient/cameraselection.cpp b/kipi-plugins/kameraklient/cameraselection.cpp
index 3e90a11..f4122b7 100644
--- a/kipi-plugins/kameraklient/cameraselection.cpp
+++ b/kipi-plugins/kameraklient/cameraselection.cpp
@@ -86,9 +86,9 @@ CameraSelection::CameraSelection(TQWidget* parent)
     TQGroupBox* mainBox = new TQGroupBox(page);
     mainBox->setTitle(i18n("Camera Configuration"));
     mainBox->setColumnLayout(0, Qt::Vertical );
-    mainBox->tqlayout()->setSpacing( 5 );
-    mainBox->tqlayout()->setMargin( 5 );
-    TQGridLayout* mainBoxLayout = new TQGridLayout(mainBox->tqlayout());
+    mainBox->layout()->setSpacing( 5 );
+    mainBox->layout()->setMargin( 5 );
+    TQGridLayout* mainBoxLayout = new TQGridLayout(mainBox->layout());
     mainBoxLayout->setAlignment(TQt::AlignTop);
 
     listView_ = new TQListView( mainBox );
@@ -99,8 +99,8 @@ CameraSelection::CameraSelection(TQWidget* parent)
     portButtonGroup_ = new TQVButtonGroup(mainBox);
     portButtonGroup_->setTitle(i18n("Camera Port Type"));
     portButtonGroup_->setRadioButtonExclusive(true);
-    portButtonGroup_->tqlayout()->setSpacing(5);
-    portButtonGroup_->tqlayout()->setMargin(5);
+    portButtonGroup_->layout()->setSpacing(5);
+    portButtonGroup_->layout()->setMargin(5);
 
     usbButton_ = new TQRadioButton(portButtonGroup_);
     usbButton_->setText( i18n("USB"));
@@ -113,9 +113,9 @@ CameraSelection::CameraSelection(TQWidget* parent)
     TQGroupBox* portPathBox = new TQGroupBox(mainBox);
     portPathBox->setTitle( i18n("Camera Port Path"));
     portPathBox->setColumnLayout(0, Qt::Vertical );
-    portPathBox->tqlayout()->setSpacing( 5 );
-    portPathBox->tqlayout()->setMargin( 5 );
-    TQVBoxLayout* portPathBoxLayout = new TQVBoxLayout( portPathBox->tqlayout() );
+    portPathBox->layout()->setSpacing( 5 );
+    portPathBox->layout()->setMargin( 5 );
+    TQVBoxLayout* portPathBoxLayout = new TQVBoxLayout( portPathBox->layout() );
     portPathBoxLayout->setAlignment( TQt::AlignTop );
 
     TQLabel* portPathLabel_ = new TQLabel( portPathBox);
diff --git a/kipi-plugins/kameraklient/savefiledialog.cpp b/kipi-plugins/kameraklient/savefiledialog.cpp
index 3e973a1..7b41afa 100644
--- a/kipi-plugins/kameraklient/savefiledialog.cpp
+++ b/kipi-plugins/kameraklient/savefiledialog.cpp
@@ -47,11 +47,11 @@ SavefileDialog::SavefileDialog(const TQString& file, TQWidget *parent, const cha
     bbox->addButton(i18n("Overwrite All"), TQT_TQOBJECT(this), TQT_SLOT(slot_overwriteAll()), true);
     TQPushButton *cancelBtn = bbox->addButton(i18n("&Cancel"), TQT_TQOBJECT(this), TQT_SLOT(reject()), true);
     cancelBtn->setDefault(true);
-    bbox->tqlayout();
-    TQGridLayout *tqlayout = new TQGridLayout(this, 0, 0, 15);
-    tqlayout->addMultiCellWidget(descLbl, 0, 0, 0, 3);
-    tqlayout->addMultiCellWidget(renameEdit, 3, 3, 0, 3);
-    tqlayout->addMultiCellWidget(bbox, 4, 4, 0, 3);
+    bbox->layout();
+    TQGridLayout *layout = new TQGridLayout(this, 0, 0, 15);
+    layout->addMultiCellWidget(descLbl, 0, 0, 0, 3);
+    layout->addMultiCellWidget(renameEdit, 3, 3, 0, 3);
+    layout->addMultiCellWidget(bbox, 4, 4, 0, 3);
 }
 
 SavefileDialog::~SavefileDialog() {
diff --git a/kipi-plugins/kameraklient/setupcamera.cpp b/kipi-plugins/kameraklient/setupcamera.cpp
index 5677182..0192045 100644
--- a/kipi-plugins/kameraklient/setupcamera.cpp
+++ b/kipi-plugins/kameraklient/setupcamera.cpp
@@ -90,10 +90,10 @@ SetupCamera::SetupCamera(TQWidget* parent, const char* name)
         
     TQGroupBox* groupBox = new TQGroupBox(page, "groupBox");
     groupBox->setColumnLayout(0, Qt::Vertical);
-    groupBox->tqlayout()->setSpacing(5);
-    groupBox->tqlayout()->setMargin(5);
+    groupBox->layout()->setSpacing(5);
+    groupBox->layout()->setMargin(5);
     
-    TQGridLayout* groupBoxLayout = new TQGridLayout(groupBox->tqlayout());
+    TQGridLayout* groupBoxLayout = new TQGridLayout(groupBox->layout());
     groupBoxLayout->setAlignment( TQt::AlignTop );
     listView_ = new TQListView( groupBox );
     listView_->addColumn(i18n("Model"));