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

1 files changed, 34 insertions, 34 deletions

diff --git a/knotes/knoteconfigdlg.cpp b/knotes/knoteconfigdlg.cpp
index 034a3239e..51e22fbfb 100644
--- a/knotes/knoteconfigdlg.cpp
+++ b/knotes/knoteconfigdlg.cpp
@@ -19,7 +19,7 @@
 *******************************************************************/
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqhgroupbox.h>
@@ -89,22 +89,22 @@ void KNoteConfigDlg::slotUpdateCaption()
 TQWidget *KNoteConfigDlg::makeDisplayPage( bool defaults )
 {
     TQWidget *displayPage = new TQWidget();
-    TQGridLayout *tqlayout = new TQGridLayout( displayPage, 2, 2,
+    TQGridLayout *layout = new TQGridLayout( displayPage, 2, 2,
                                            defaults ? marginHint() : 0, spacingHint() );
 
     TQLabel *label_FgColor = new TQLabel( i18n("&Text color:"), displayPage, "label_FgColor" );
-    tqlayout->addWidget( label_FgColor, 0, 0 );
+    layout->addWidget( label_FgColor, 0, 0 );
 
     KColorButton *kcfg_FgColor = new KColorButton( displayPage, "kcfg_FgColor" );
     label_FgColor->setBuddy( kcfg_FgColor );
-    tqlayout->addWidget( kcfg_FgColor, 0, 1 );
+    layout->addWidget( kcfg_FgColor, 0, 1 );
 
     TQLabel *label_BgColor = new TQLabel( i18n("&Background color:"), displayPage, "label_BgColor" );
-    tqlayout->addWidget( label_BgColor, 1, 0 );
+    layout->addWidget( label_BgColor, 1, 0 );
 
     KColorButton *kcfg_BgColor = new KColorButton( displayPage, "kcfg_BgColor" );
     label_BgColor->setBuddy( kcfg_BgColor );
-    tqlayout->addWidget( kcfg_BgColor, 1, 1 );
+    layout->addWidget( kcfg_BgColor, 1, 1 );
 
     TQCheckBox *kcfg_ShowInTaskbar = new TQCheckBox( i18n("&Show note in taskbar"),
                                                    displayPage, "kcfg_ShowInTaskbar" );
@@ -112,25 +112,25 @@ TQWidget *KNoteConfigDlg::makeDisplayPage( bool defaults )
     if ( defaults )
     {
         TQLabel *label_Width = new TQLabel( i18n("Default &width:"), displayPage, "label_Width" );
-        tqlayout->addWidget( label_Width, 2, 0 );
+        layout->addWidget( label_Width, 2, 0 );
 
         KIntNumInput *kcfg_Width = new KIntNumInput( displayPage, "kcfg_Width" );
         label_Width->setBuddy( kcfg_Width );
         kcfg_Width->setRange( 50, 2000, 10, false );
-        tqlayout->addWidget( kcfg_Width, 2, 1 );
+        layout->addWidget( kcfg_Width, 2, 1 );
 
         TQLabel *label_Height = new TQLabel( i18n("Default &height:"), displayPage, "label_Height" );
-        tqlayout->addWidget( label_Height, 3, 0 );
+        layout->addWidget( label_Height, 3, 0 );
 
         KIntNumInput *kcfg_Height = new KIntNumInput( displayPage, "kcfg_Height" );
         kcfg_Height->setRange( 50, 2000, 10, false );
         label_Height->setBuddy( kcfg_Height );
-        tqlayout->addWidget( kcfg_Height, 3, 1 );
+        layout->addWidget( kcfg_Height, 3, 1 );
 
-        tqlayout->addWidget( kcfg_ShowInTaskbar, 4, 0 );
+        layout->addWidget( kcfg_ShowInTaskbar, 4, 0 );
     }
     else
-        tqlayout->addWidget( kcfg_ShowInTaskbar, 2, 0 );
+        layout->addWidget( kcfg_ShowInTaskbar, 2, 0 );
 
     return displayPage;
 }
@@ -138,36 +138,36 @@ TQWidget *KNoteConfigDlg::makeDisplayPage( bool defaults )
 TQWidget *KNoteConfigDlg::makeEditorPage( bool defaults )
 {
     TQWidget *editorPage = new TQWidget();
-    TQGridLayout *tqlayout = new TQGridLayout( editorPage, 4, 3,
+    TQGridLayout *layout = new TQGridLayout( editorPage, 4, 3,
                                            defaults ? marginHint() : 0, spacingHint() );
 
     TQLabel *label_TabSize = new TQLabel( i18n( "&Tab size:" ), editorPage, "label_TabSize" );
-    tqlayout->addMultiCellWidget( label_TabSize, 0, 0, 0, 1 );
+    layout->addMultiCellWidget( label_TabSize, 0, 0, 0, 1 );
 
     KIntNumInput *kcfg_TabSize = new KIntNumInput( editorPage, "kcfg_TabSize" );
     kcfg_TabSize->setRange( 0, 40, 1, false );
     label_TabSize->setBuddy( kcfg_TabSize );
-    tqlayout->addWidget( kcfg_TabSize, 0, 2 );
+    layout->addWidget( kcfg_TabSize, 0, 2 );
 
     TQCheckBox *kcfg_AutoIndent = new TQCheckBox( i18n("Auto &indent"), editorPage, "kcfg_AutoIndent" );
-    tqlayout->addMultiCellWidget( kcfg_AutoIndent, 1, 1, 0, 1 );
+    layout->addMultiCellWidget( kcfg_AutoIndent, 1, 1, 0, 1 );
 
     TQCheckBox *kcfg_RichText = new TQCheckBox( i18n("&Rich text"), editorPage, "kcfg_RichText" );
-    tqlayout->addWidget( kcfg_RichText, 1, 2 );
+    layout->addWidget( kcfg_RichText, 1, 2 );
 
     TQLabel *label_Font = new TQLabel( i18n("Text font:"), editorPage, "label_Font" );
-    tqlayout->addWidget( label_Font, 3, 0 );
+    layout->addWidget( label_Font, 3, 0 );
 
     KFontRequester *kcfg_Font = new KFontRequester( editorPage, "kcfg_Font" );
-    kcfg_Font->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
-    tqlayout->addMultiCellWidget( kcfg_Font, 3, 3, 1, 2 );
+    kcfg_Font->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
+    layout->addMultiCellWidget( kcfg_Font, 3, 3, 1, 2 );
 
     TQLabel *label_TitleFont = new TQLabel( i18n("Title font:"), editorPage, "label_TitleFont" );
-    tqlayout->addWidget( label_TitleFont, 2, 0 );
+    layout->addWidget( label_TitleFont, 2, 0 );
 
     KFontRequester *kcfg_TitleFont = new KFontRequester( editorPage, "kcfg_TitleFont" );
-    kcfg_TitleFont->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
-    tqlayout->addMultiCellWidget( kcfg_TitleFont, 2, 2, 1, 2 );
+    kcfg_TitleFont->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
+    layout->addMultiCellWidget( kcfg_TitleFont, 2, 2, 1, 2 );
 
     return editorPage;
 }
@@ -184,14 +184,14 @@ TQWidget *KNoteConfigDlg::makeDefaultsPage()
 TQWidget *KNoteConfigDlg::makeActionsPage()
 {
     TQWidget *actionsPage = new TQWidget();
-    TQGridLayout *tqlayout = new TQGridLayout( actionsPage, 2, 2, 0, spacingHint() );
+    TQGridLayout *layout = new TQGridLayout( actionsPage, 2, 2, 0, spacingHint() );
 
     TQLabel *label_MailAction = new TQLabel( i18n("&Mail action:"), actionsPage, "label_MailAction" );
-    tqlayout->addWidget( label_MailAction, 0, 0 );
+    layout->addWidget( label_MailAction, 0, 0 );
 
     KLineEdit *kcfg_MailAction = new KLineEdit( actionsPage, "kcfg_MailAction" );
     label_MailAction->setBuddy( kcfg_MailAction );
-    tqlayout->addWidget( kcfg_MailAction, 0, 1 );
+    layout->addWidget( kcfg_MailAction, 0, 1 );
 
     return actionsPage;
 }
@@ -199,27 +199,27 @@ TQWidget *KNoteConfigDlg::makeActionsPage()
 TQWidget *KNoteConfigDlg::makeNetworkPage()
 {
     TQWidget *networkPage = new TQWidget();
-    TQGridLayout *tqlayout = new TQGridLayout( networkPage, 4, 2, 0, spacingHint() );
+    TQGridLayout *layout = new TQGridLayout( networkPage, 4, 2, 0, spacingHint() );
 
     TQGroupBox *incoming = new TQHGroupBox( i18n("Incoming Notes"), networkPage );
-    tqlayout->addMultiCellWidget( incoming, 0, 0, 0, 1 );
+    layout->addMultiCellWidget( incoming, 0, 0, 0, 1 );
 
     new TQCheckBox( i18n("Accept incoming notes"), incoming, "kcfg_ReceiveNotes" );
 
     TQGroupBox *outgoing = new TQHGroupBox( i18n("Outgoing Notes"), networkPage );
-    tqlayout->addMultiCellWidget( outgoing, 1, 1, 0, 1 );
+    layout->addMultiCellWidget( outgoing, 1, 1, 0, 1 );
 
     TQLabel *label_SenderID = new TQLabel( i18n("&Sender ID:"), outgoing, "label_SenderID" );
     KLineEdit *kcfg_SenderID = new KLineEdit( outgoing, "kcfg_SenderID" );
     label_SenderID->setBuddy( kcfg_SenderID );
 
     TQLabel *label_Port = new TQLabel( i18n("&Port:"), networkPage, "label_Port" );
-    tqlayout->addWidget( label_Port, 2, 0 );
+    layout->addWidget( label_Port, 2, 0 );
 
     KIntNumInput *kcfg_Port = new KIntNumInput( networkPage, "kcfg_Port" );
     kcfg_Port->setRange( 0, 65535, 1, false );
     label_Port->setBuddy( kcfg_Port );
-    tqlayout->addWidget( kcfg_Port, 2, 1 );
+    layout->addWidget( kcfg_Port, 2, 1 );
 
     return networkPage;
 }
@@ -227,17 +227,17 @@ TQWidget *KNoteConfigDlg::makeNetworkPage()
 TQWidget *KNoteConfigDlg::makeStylePage()
 {
     TQWidget *stylePage = new TQWidget();
-    TQGridLayout *tqlayout = new TQGridLayout( stylePage, 2, 2, 0, spacingHint() );
+    TQGridLayout *layout = new TQGridLayout( stylePage, 2, 2, 0, spacingHint() );
 
     TQLabel *label_Style = new TQLabel( i18n("&Style:"), stylePage, "label_Style" );
-    tqlayout->addWidget( label_Style, 0, 0 );
+    layout->addWidget( label_Style, 0, 0 );
 
     TQComboBox *kcfg_Style = new TQComboBox( stylePage, "kcfg_Style" );
     TQStringList list;
     list << "Plain" << "Fancy";
     kcfg_Style->insertStringList( list );
     label_Style->setBuddy( kcfg_Style );
-    tqlayout->addWidget( kcfg_Style, 0, 1 );
+    layout->addWidget( kcfg_Style, 0, 1 );
 
     return stylePage;
 }