Rename obsolete tq methods to standard names

cervisia/addremovedlg.cpp

@@ -40,18 +40,18 @@ AddRemoveDialog::AddRemoveDialog(ActionType action, TQWidget* parent, const char
 
     TQFrame* mainWidget = makeMainWidget();
 
-    TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
     TQLabel *textlabel = new TQLabel
         ( (action==Add)?       i18n("Add the following files to the repository:") :
           (action==AddBinary)? i18n("Add the following binary files to the repository:") :
                                i18n("Remove the following files from the repository:") ,
           mainWidget );
-    tqlayout->addWidget(textlabel);
+    layout->addWidget(textlabel);
 
     m_listBox = new TQListBox(mainWidget);
     m_listBox->setSelectionMode(TQListBox::NoSelection);
-    tqlayout->addWidget(m_listBox, 5);
+    layout->addWidget(m_listBox, 5);
 
     // Add warning message to dialog when user wants to remove a file
     if (action==Remove)
@@ -69,9 +69,9 @@ AddRemoveDialog::AddRemoveDialog(ActionType action, TQWidget* parent, const char
                                               "your local working copy."), mainWidget);
         warningLayout->addWidget(warningText);
 
-        tqlayout->addSpacing(5);
+        layout->addSpacing(5);
-        tqlayout->addLayout(warningLayout);
+        layout->addLayout(warningLayout);
-        tqlayout->addSpacing(5);
+        layout->addSpacing(5);
     }
 
     if( action == Remove )

cervisia/addrepositorydlg.cpp

@@ -40,10 +40,10 @@ AddRepositoryDialog::AddRepositoryDialog(KConfig& cfg, const TQString& repo,
 {
     TQFrame* mainWidget = makeMainWidget();
 
-    TQBoxLayout* tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout* layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
     TQLabel* repo_label = new TQLabel(i18n("&Repository:"), mainWidget);
-    tqlayout->addWidget(repo_label);
+    layout->addWidget(repo_label);
     
     repo_edit = new KLineEdit(mainWidget);
     repo_edit->setFocus();
@@ -53,33 +53,33 @@ AddRepositoryDialog::AddRepositoryDialog(KConfig& cfg, const TQString& repo,
         repo_edit->setText(repo);
         repo_edit->setEnabled(false);
     }
-    tqlayout->addWidget(repo_edit);
+    layout->addWidget(repo_edit);
     
     TQLabel* rsh_label = new TQLabel(i18n("Use remote &shell (only for :ext: repositories):"), mainWidget);
-    tqlayout->addWidget(rsh_label);
+    layout->addWidget(rsh_label);
     
     rsh_edit = new KLineEdit(mainWidget);
     rsh_label->setBuddy(rsh_edit);
-    tqlayout->addWidget(rsh_edit);
+    layout->addWidget(rsh_edit);
     
     TQLabel* server_label = new TQLabel(i18n("Invoke this program on the server side:"),
                                       mainWidget);
-    tqlayout->addWidget(server_label);
+    layout->addWidget(server_label);
     
     server_edit = new KLineEdit(mainWidget);
     server_label->setBuddy(server_edit);
-    tqlayout->addWidget(server_edit);
+    layout->addWidget(server_edit);
 
     TQHBox* compressionBox = new TQHBox(mainWidget);
     m_useDifferentCompression = new TQCheckBox(i18n("Use different &compression level:"), compressionBox);
     
     m_compressionLevel = new KIntNumInput(compressionBox);
     m_compressionLevel->setRange(0, 9, 1, false);
-    tqlayout->addWidget(compressionBox);
+    layout->addWidget(compressionBox);
     
     m_retrieveCvsignoreFile = new TQCheckBox(i18n("Download cvsignore file from "
                                             "server"), mainWidget);
-    tqlayout->addWidget(m_retrieveCvsignoreFile);
+    layout->addWidget(m_retrieveCvsignoreFile);
 
     connect( repo_edit, TQT_SIGNAL(textChanged(const TQString&)),
              this, TQT_SLOT(repoChanged()) );

cervisia/checkoutdlg.cpp

@@ -55,9 +55,9 @@ CheckoutDialog::CheckoutDialog(KConfig& cfg, CvsService_stub* service,
 
     TQFrame* mainWidget = makeMainWidget();
 
-    TQBoxLayout* tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout* layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
-    TQGridLayout* grid = new TQGridLayout(tqlayout);
+    TQGridLayout* grid = new TQGridLayout(layout);
     grid->setColStretch(0, 1);
     grid->setColStretch(1, 20);
     for( int i = 0; i < ((action==Checkout)? 4 : 10); ++i )

cervisia/commitdlg.cpp

@@ -61,10 +61,10 @@ CommitDialog::CommitDialog(KConfig& cfg, CvsService_stub* service,
 {
     TQFrame* mainWidget = makeMainWidget();
 
-    TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
     TQLabel *textlabel = new TQLabel( i18n("Commit the following &files:"), mainWidget );
-    tqlayout->addWidget(textlabel);
+    layout->addWidget(textlabel);
 
     m_fileList = new KListView(mainWidget);
     m_fileList->addColumn("");
@@ -75,30 +75,30 @@ CommitDialog::CommitDialog(KConfig& cfg, CvsService_stub* service,
              this, TQT_SLOT(fileSelected(TQListViewItem*)));
     connect( m_fileList, TQT_SIGNAL(selectionChanged()),
              this, TQT_SLOT(fileHighlighted()) );
-    tqlayout->addWidget(m_fileList, 5);
+    layout->addWidget(m_fileList, 5);
 
     TQLabel *archivelabel = new TQLabel(i18n("Older &messages:"), mainWidget);
-    tqlayout->addWidget(archivelabel);
+    layout->addWidget(archivelabel);
 
     combo = new TQComboBox(mainWidget);
     archivelabel->setBuddy(combo);
     connect( combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboActivated(int)) );
     // make sure that combobox is smaller than the screen
     combo->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
-    tqlayout->addWidget(combo);
+    layout->addWidget(combo);
 
     TQLabel *messagelabel = new TQLabel(i18n("&Log message:"), mainWidget);
-    tqlayout->addWidget(messagelabel);
+    layout->addWidget(messagelabel);
 
     edit = new Cervisia::LogMessageEdit(mainWidget);
     messagelabel->setBuddy(edit);
     edit->setCheckSpellingEnabled(true);
     edit->setFocus();
     edit->setMinimumSize(400, 100);
-    tqlayout->addWidget(edit, 10);
+    layout->addWidget(edit, 10);
 
     m_useTemplateChk = new TQCheckBox(i18n("Use log message &template"), mainWidget);
-    tqlayout->addWidget(m_useTemplateChk);
+    layout->addWidget(m_useTemplateChk);
     connect( m_useTemplateChk, TQT_SIGNAL(clicked()), this, TQT_SLOT(useTemplateClicked()) );
 
     checkForTemplateFile();

cervisia/diffdlg.cpp

@@ -51,30 +51,30 @@ DiffDialog::DiffDialog(KConfig& cfg, TQWidget *parent, const char *name, bool mo
 
     TQFrame* mainWidget = makeMainWidget();
 
-    TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
-    TQGridLayout *pairtqlayout = new TQGridLayout(tqlayout);
+    TQGridLayout *pairlayout = new TQGridLayout(layout);
-    pairtqlayout->setRowStretch(0, 0);
+    pairlayout->setRowStretch(0, 0);
-    pairtqlayout->setRowStretch(1, 1);
+    pairlayout->setRowStretch(1, 1);
-    pairtqlayout->setColStretch(1, 0);
+    pairlayout->setColStretch(1, 0);
-    pairtqlayout->addColSpacing(1, 16);
+    pairlayout->addColSpacing(1, 16);
-    pairtqlayout->setColStretch(0, 10);
+    pairlayout->setColStretch(0, 10);
-    pairtqlayout->setColStretch(2, 10);
+    pairlayout->setColStretch(2, 10);
 
     revlabel1 = new TQLabel(mainWidget);
-    pairtqlayout->addWidget(revlabel1, 0, 0);
+    pairlayout->addWidget(revlabel1, 0, 0);
 
     revlabel2 = new TQLabel(mainWidget);
-    pairtqlayout->addWidget(revlabel2, 0, 2);
+    pairlayout->addWidget(revlabel2, 0, 2);
 
     diff1 = new DiffView(cfg, true, false, mainWidget);
     diff2 = new DiffView(cfg, true, true, mainWidget);
     DiffZoomWidget *zoom = new DiffZoomWidget(cfg, mainWidget);
     zoom->setDiffView(diff2);
 
-    pairtqlayout->addWidget(diff1, 1, 0);
+    pairlayout->addWidget(diff1, 1, 0);
-    pairtqlayout->addWidget(zoom,  1, 1);
+    pairlayout->addWidget(zoom,  1, 1);
-    pairtqlayout->addWidget(diff2, 1, 2);
+    pairlayout->addWidget(diff2, 1, 2);
 
     diff1->setPartner(diff2);
     diff2->setPartner(diff1);
@@ -101,15 +101,15 @@ DiffDialog::DiffDialog(KConfig& cfg, TQWidget *parent, const char *name, bool mo
 
     connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(saveAsClicked()) );
 
-    TQBoxLayout *buttontqlayout = new TQHBoxLayout(tqlayout);
+    TQBoxLayout *buttonlayout = new TQHBoxLayout(layout);
-    buttontqlayout->addWidget(syncbox, 0);
+    buttonlayout->addWidget(syncbox, 0);
-    buttontqlayout->addStretch(4);
+    buttonlayout->addStretch(4);
-    buttontqlayout->addWidget(itemscombo);
+    buttonlayout->addWidget(itemscombo);
-    buttontqlayout->addStretch(1);
+    buttonlayout->addStretch(1);
-    buttontqlayout->addWidget(nofnlabel);
+    buttonlayout->addWidget(nofnlabel);
-    buttontqlayout->addStretch(1);
+    buttonlayout->addStretch(1);
-    buttontqlayout->addWidget(backbutton);
+    buttonlayout->addWidget(backbutton);
-    buttontqlayout->addWidget(forwbutton);
+    buttonlayout->addWidget(forwbutton);
 
     setHelp("diff");
 

cervisia/diffview.cpp

@@ -417,7 +417,7 @@ void DiffZoomWidget::setDiffView(DiffView *view)
 
 TQSize DiffZoomWidget::sizeHint() const
 {
-    return TQSize(25, tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent, this));
+    return TQSize(25, style().pixelMetric(TQStyle::PM_ScrollBarExtent, this));
 }
 
 
@@ -440,7 +440,7 @@ void DiffZoomWidget::paintEvent(TQPaintEvent *)
 
     // only y and height are important
     const TQRect scrollBarGroove(scrollBar->isVisible()
-                                ? tqstyle().querySubControlMetrics(TQStyle::CC_ScrollBar,
+                                ? style().querySubControlMetrics(TQStyle::CC_ScrollBar,
                                                                  scrollBar,
                                                                  TQStyle::SC_ScrollBarGroove)
                                 : rect());

cervisia/historydlg.cpp

@@ -145,7 +145,7 @@ HistoryDialog::HistoryDialog(KConfig& cfg, TQWidget *parent, const char *name)
 {
     TQFrame* mainWidget = makeMainWidget();
 
-    TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
     listview = new KListView(mainWidget);
     listview->setSelectionMode(TQListView::NoSelection);
@@ -159,7 +159,7 @@ HistoryDialog::HistoryDialog(KConfig& cfg, TQWidget *parent, const char *name)
     listview->addColumn(i18n("File"));
     listview->addColumn(i18n("Repo Path"));
     listview->setFocus();
-    tqlayout->addWidget(listview, 1);
+    layout->addWidget(listview, 1);
 
     commit_box = new TQCheckBox(i18n("Show c&ommit events"), mainWidget);
     commit_box->setChecked(true);
@@ -215,7 +215,7 @@ HistoryDialog::HistoryDialog(KConfig& cfg, TQWidget *parent, const char *name)
     connect( dirname_edit, TQT_SIGNAL(returnPressed()),
              this, TQT_SLOT(choiceChanged()) );
 
-    TQGridLayout *grid = new TQGridLayout(tqlayout);
+    TQGridLayout *grid = new TQGridLayout(layout);
     grid->setColStretch(0, 1);
     grid->setColStretch(1, 0);
     grid->setColStretch(2, 4);

cervisia/logdlg.cpp

@@ -110,7 +110,7 @@ LogDialog::LogDialog(KConfig& cfg, TQWidget *parent, const char *name)
     tags.setAutoDelete(true);
 
     TQWidget *mainWidget = new TQWidget(splitter);
-    TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
     for (int i = 0; i < 2; ++i)
     {
@@ -118,10 +118,10 @@ LogDialog::LogDialog(KConfig& cfg, TQWidget *parent, const char *name)
         {
             TQFrame *frame = new TQFrame(mainWidget);
             frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
-            tqlayout->addWidget(frame);
+            layout->addWidget(frame);
         }
 
-        TQGridLayout *grid = new TQGridLayout(tqlayout);
+        TQGridLayout *grid = new TQGridLayout(layout);
         grid->setRowStretch(0, 0);
         grid->setRowStretch(1, 0);
         grid->setRowStretch(2, 1);

cervisia/logmessageedit.cpp

@@ -76,7 +76,7 @@ void LogMessageEdit::keyPressEvent(TQKeyEvent* event)
     if( noModifier )
     {
         TQString keycode = event->text();
-        if( !keycode.isEmpty() && keycode.tqunicode()->isPrint() )
+        if( !keycode.isEmpty() && keycode.unicode()->isPrint() )
         {
             KTextEdit::keyPressEvent(event);
             tryCompletion();

cervisia/mergedlg.cpp

@@ -40,15 +40,15 @@ MergeDialog::MergeDialog(CvsService_stub* service,
       cvsService(service)
 {
     int const iComboBoxMinWidth(30 * fontMetrics().width('0'));
-    int const iWidgetIndent(tqstyle().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0) + 6);
+    int const iWidgetIndent(style().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0) + 6);
 
     TQFrame* mainWidget = makeMainWidget();
 
-    TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
     bybranch_button = new TQRadioButton(i18n("Merge from &branch:"), mainWidget);
     bybranch_button->setChecked(true);
-    tqlayout->addWidget(bybranch_button);
+    layout->addWidget(bybranch_button);
 
     branch_combo = new TQComboBox(true, mainWidget);
     branch_combo->setMinimumWidth(iComboBoxMinWidth);
@@ -57,13 +57,13 @@ MergeDialog::MergeDialog(CvsService_stub* service,
     connect( branch_button, TQT_SIGNAL(clicked()),
              this, TQT_SLOT(branchButtonClicked()) );
             
-    TQBoxLayout *branchedit_layout = new TQHBoxLayout(tqlayout);
+    TQBoxLayout *branchedit_layout = new TQHBoxLayout(layout);
     branchedit_layout->addSpacing(iWidgetIndent);
     branchedit_layout->addWidget(branch_combo, 2);
     branchedit_layout->addWidget(branch_button, 0);
     
     bytags_button = new TQRadioButton(i18n("Merge &modifications:"), mainWidget);
-    tqlayout->addWidget(bytags_button);
+    layout->addWidget(bytags_button);
 
     TQLabel *tag1_label = new TQLabel(i18n("between tag: "), mainWidget);
     tag1_combo = new TQComboBox(true, mainWidget);
@@ -77,7 +77,7 @@ MergeDialog::MergeDialog(CvsService_stub* service,
     connect( tag_button, TQT_SIGNAL(clicked()),
              this, TQT_SLOT(tagButtonClicked()) );
 
-    TQGridLayout *tagsedit_layout = new TQGridLayout(tqlayout);
+    TQGridLayout *tagsedit_layout = new TQGridLayout(layout);
     tagsedit_layout->addColSpacing(0, iWidgetIndent);
     tagsedit_layout->setColStretch(0, 0);
     tagsedit_layout->setColStretch(1, 1);

cervisia/misc.cpp

@@ -60,7 +60,7 @@ static int FindWhiteSpace(const TQString& str, int index)
     if( index < 0 || index >= length )
         return -1;
 
-    const TQChar* const startPos = str.tqunicode();
+    const TQChar* const startPos = str.unicode();
     const TQChar* const endPos   = startPos + length;
 
     const TQChar* pos = startPos + index;

cervisia/repositorydlg.cpp

@@ -186,7 +186,7 @@ RepositoryDialog::RepositoryDialog(KConfig& cfg, CvsService_stub* cvsService,
     m_loginButton  = actionbox->addButton(i18n("Login..."));
     m_logoutButton = actionbox->addButton(i18n("Logout"));
     actionbox->addStretch();
-    actionbox->tqlayout();
+    actionbox->layout();
     hbox->addWidget(actionbox, 0);
 
     m_loginButton->setEnabled(false);

cervisia/resolvedlg.cpp

@@ -106,27 +106,27 @@ ResolveDialog::ResolveDialog(KConfig& cfg, TQWidget *parent, const char *name)
 
     TQFrame* mainWidget = makeMainWidget();
 
-    TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
     TQSplitter *vertSplitter = new TQSplitter(Qt::Vertical, mainWidget);
 
     TQSplitter *splitter = new TQSplitter(Qt::Horizontal, vertSplitter);
 
     TQWidget *versionALayoutWidget = new TQWidget(splitter);
-    TQBoxLayout *versionAtqlayout = new TQVBoxLayout(versionALayoutWidget, 5);
+    TQBoxLayout *versionAlayout = new TQVBoxLayout(versionALayoutWidget, 5);
 
     TQLabel *revlabel1 = new TQLabel(i18n("Your version (A):"), versionALayoutWidget);
-    versionAtqlayout->addWidget(revlabel1);
+    versionAlayout->addWidget(revlabel1);
     diff1 = new DiffView(cfg, true, false, versionALayoutWidget);
-    versionAtqlayout->addWidget(diff1, 10);
+    versionAlayout->addWidget(diff1, 10);
 
     TQWidget* versionBLayoutWidget = new TQWidget(splitter);
-    TQBoxLayout *versionBtqlayout = new TQVBoxLayout(versionBLayoutWidget, 5);
+    TQBoxLayout *versionBlayout = new TQVBoxLayout(versionBLayoutWidget, 5);
 
     TQLabel *revlabel2 = new TQLabel(i18n("Other version (B):"), versionBLayoutWidget);
-    versionBtqlayout->addWidget(revlabel2);
+    versionBlayout->addWidget(revlabel2);
     diff2 = new DiffView(cfg, true, false, versionBLayoutWidget);
-    versionBtqlayout->addWidget(diff2, 10);
+    versionBlayout->addWidget(diff2, 10);
 
     diff1->setPartner(diff2);
     diff2->setPartner(diff1);
@@ -140,7 +140,7 @@ ResolveDialog::ResolveDialog(KConfig& cfg, TQWidget *parent, const char *name)
     merge = new DiffView(cfg, false, false, mergeLayoutWidget);
     mergeLayout->addWidget(merge, 10);
 
-    tqlayout->addWidget(vertSplitter);
+    layout->addWidget(vertSplitter);
 
     abutton = new TQPushButton("&A", mainWidget);
     connect( abutton, TQT_SIGNAL(clicked()), TQT_SLOT(aClicked()) );
@@ -166,17 +166,17 @@ ResolveDialog::ResolveDialog(KConfig& cfg, TQWidget *parent, const char *name)
     forwbutton = new TQPushButton("&>>", mainWidget);
     connect( forwbutton, TQT_SIGNAL(clicked()), TQT_SLOT(forwClicked()) );
 
-    TQBoxLayout *buttontqlayout = new TQHBoxLayout(tqlayout);
+    TQBoxLayout *buttonlayout = new TQHBoxLayout(layout);
-    buttontqlayout->addWidget(abutton, 1);
+    buttonlayout->addWidget(abutton, 1);
-    buttontqlayout->addWidget(bbutton, 1);
+    buttonlayout->addWidget(bbutton, 1);
-    buttontqlayout->addWidget(abbutton, 1);
+    buttonlayout->addWidget(abbutton, 1);
-    buttontqlayout->addWidget(babutton, 1);
+    buttonlayout->addWidget(babutton, 1);
-    buttontqlayout->addWidget(editbutton, 1);
+    buttonlayout->addWidget(editbutton, 1);
-    buttontqlayout->addStretch(1);
+    buttonlayout->addStretch(1);
-    buttontqlayout->addWidget(nofnlabel, 2);
+    buttonlayout->addWidget(nofnlabel, 2);
-    buttontqlayout->addStretch(1);
+    buttonlayout->addStretch(1);
-    buttontqlayout->addWidget(backbutton, 1);
+    buttonlayout->addWidget(backbutton, 1);
-    buttontqlayout->addWidget(forwbutton, 1);
+    buttonlayout->addWidget(forwbutton, 1);
 
     connect( this, TQT_SIGNAL(user2Clicked()), TQT_SLOT(saveClicked()) );
     connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(saveAsClicked()) );

cervisia/settingsdlg.cpp

@@ -236,24 +236,24 @@ void SettingsDialog::addGeneralPage()
 {
     TQFrame* generalPage = addPage(i18n("General"), TQString(),
                                   LoadIcon("misc"));
-    TQVBoxLayout* tqlayout = new TQVBoxLayout(generalPage, 0, KDialog::spacingHint());
+    TQVBoxLayout* layout = new TQVBoxLayout(generalPage, 0, KDialog::spacingHint());
 
     TQLabel *usernamelabel = new TQLabel( i18n("&User name for the change log editor:"), generalPage );
     usernameedit = new KLineEdit(generalPage);
     usernameedit->setFocus();
     usernamelabel->setBuddy(usernameedit);
 
-    tqlayout->addWidget(usernamelabel);
+    layout->addWidget(usernamelabel);
-    tqlayout->addWidget(usernameedit);
+    layout->addWidget(usernameedit);
 
     TQLabel *cvspathlabel = new TQLabel( i18n("&Path to CVS executable, or 'cvs':"), generalPage );
     cvspathedit = new KURLRequester(generalPage);
     cvspathlabel->setBuddy(cvspathedit);
 
-    tqlayout->addWidget(cvspathlabel);
+    layout->addWidget(cvspathlabel);
-    tqlayout->addWidget(cvspathedit);
+    layout->addWidget(cvspathedit);
 
-    tqlayout->addStretch();
+    layout->addStretch();
 }
 
 

cervisia/stringmatcher.cpp

@@ -133,7 +133,7 @@ unsigned int countMetaCharacters(const TQString& text)
 {
     unsigned int count(0);
 
-    const TQChar* pos(text.tqunicode());
+    const TQChar* pos(text.unicode());
     const TQChar* posEnd(pos + text.length());
     while (pos < posEnd)
     {

cervisia/tagdlg.cpp

@@ -47,7 +47,7 @@ TagDialog::TagDialog(ActionType action, CvsService_stub* service,
 
     TQFrame* mainWidget = makeMainWidget();
 
-    TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
     if (action == Delete)
         {
@@ -61,7 +61,7 @@ TagDialog::TagDialog(ActionType action, CvsService_stub* service,
             connect( tag_button, TQT_SIGNAL(clicked()),
                      this, TQT_SLOT(tagButtonClicked()) );
 
-            TQBoxLayout *tagedit_layout = new TQHBoxLayout(tqlayout);
+            TQBoxLayout *tagedit_layout = new TQHBoxLayout(layout);
             tagedit_layout->addWidget(tag_label);
             tagedit_layout->addWidget(tag_combo);
             tagedit_layout->addWidget(tag_button);
@@ -74,15 +74,15 @@ TagDialog::TagDialog(ActionType action, CvsService_stub* service,
 
             TQLabel *tag_label = new TQLabel(tag_edit, i18n("&Name of tag:"), mainWidget);
 
-            TQBoxLayout *tagedit_layout = new TQHBoxLayout(tqlayout);
+            TQBoxLayout *tagedit_layout = new TQHBoxLayout(layout);
             tagedit_layout->addWidget(tag_label);
             tagedit_layout->addWidget(tag_edit);
 
             branchtag_button = new TQCheckBox(i18n("Create &branch with this tag"), mainWidget);
-            tqlayout->addWidget(branchtag_button);
+            layout->addWidget(branchtag_button);
 
             forcetag_button = new TQCheckBox(i18n("&Force tag creation even if tag already exists"), mainWidget);
-            tqlayout->addWidget(forcetag_button);
+            layout->addWidget(forcetag_button);
 	}
 
     setHelp("taggingbranching");

cervisia/tooltip.cpp

@@ -72,12 +72,12 @@ TQString truncateLines(const TQString&      text,
     if (numberOfLines <= maxNumberOfLines)
         return text;
 
-    const TQChar* tqunicode(text.tqunicode());
+    const TQChar* unicode(text.unicode());
-    for (int count(maxNumberOfLines); count; ++tqunicode)
+    for (int count(maxNumberOfLines); count; ++unicode)
-        if (*tqunicode == newLine)
+        if (*unicode == newLine)
             --count;
 
-    return text.left(tqunicode - text.tqunicode() - 1);
+    return text.left(unicode - text.unicode() - 1);
 }
 
 

cervisia/updatedlg.cpp

@@ -40,15 +40,15 @@ UpdateDialog::UpdateDialog(CvsService_stub* service,
       cvsService(service)
 {
     int const iComboBoxMinWidth(40 * fontMetrics().width('0'));
-    int const iWidgetIndent(tqstyle().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0) + 6);
+    int const iWidgetIndent(style().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0) + 6);
 
     TQFrame* mainWidget = makeMainWidget();
 
-    TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
     bybranch_button = new TQRadioButton(i18n("Update to &branch: "), mainWidget);
     bybranch_button->setChecked(true);
-    tqlayout->addWidget(bybranch_button);
+    layout->addWidget(bybranch_button);
 
     branch_combo = new TQComboBox(true, mainWidget);
     branch_combo->setMinimumWidth(iComboBoxMinWidth);
@@ -57,13 +57,13 @@ UpdateDialog::UpdateDialog(CvsService_stub* service,
     connect( branch_button, TQT_SIGNAL(clicked()),
              this, TQT_SLOT(branchButtonClicked()) );
             
-    TQBoxLayout *branchedit_layout = new TQHBoxLayout(tqlayout);
+    TQBoxLayout *branchedit_layout = new TQHBoxLayout(layout);
     branchedit_layout->addSpacing(iWidgetIndent);
     branchedit_layout->addWidget(branch_combo);
     branchedit_layout->addWidget(branch_button);
     
     bytag_button = new TQRadioButton(i18n("Update to &tag: "), mainWidget);
-    tqlayout->addWidget(bytag_button);
+    layout->addWidget(bytag_button);
 
     tag_combo = new TQComboBox(true, mainWidget);
     tag_combo->setMinimumWidth(iComboBoxMinWidth);
@@ -72,17 +72,17 @@ UpdateDialog::UpdateDialog(CvsService_stub* service,
     connect( tag_button, TQT_SIGNAL(clicked()),
              this, TQT_SLOT(tagButtonClicked()) );
             
-    TQBoxLayout *tagedit_layout = new TQHBoxLayout(tqlayout);
+    TQBoxLayout *tagedit_layout = new TQHBoxLayout(layout);
     tagedit_layout->addSpacing(iWidgetIndent);
     tagedit_layout->addWidget(tag_combo);
     tagedit_layout->addWidget(tag_button);
     
     bydate_button = new TQRadioButton(i18n("Update to &date ('yyyy-mm-dd'):"), mainWidget);
-    tqlayout->addWidget(bydate_button);
+    layout->addWidget(bydate_button);
 
     date_edit = new KLineEdit(mainWidget);
 
-    TQBoxLayout *dateedit_layout = new TQHBoxLayout(tqlayout);
+    TQBoxLayout *dateedit_layout = new TQHBoxLayout(layout);
     dateedit_layout->addSpacing(iWidgetIndent);
     dateedit_layout->addWidget(date_edit);
 

cervisia/watchdlg.cpp

@@ -36,37 +36,37 @@ WatchDialog::WatchDialog(ActionType action, TQWidget *parent, const char *name)
 
     TQFrame* mainWidget = makeMainWidget();
 
-    TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
     TQLabel *textlabel = new TQLabel
 	( (action==Add)? i18n("Add watches for the following events:")
           :  i18n("Remove watches for the following events:"), mainWidget );
-    tqlayout->addWidget(textlabel, 0);
+    layout->addWidget(textlabel, 0);
 
     all_button = new TQRadioButton(i18n("&All"), mainWidget);
     all_button->setFocus();
     all_button->setChecked(true);
-    tqlayout->addWidget(all_button);
+    layout->addWidget(all_button);
     
     only_button = new TQRadioButton(i18n("&Only:"), mainWidget);
-    tqlayout->addWidget(only_button);
+    layout->addWidget(only_button);
 
-    TQGridLayout *eventstqlayout = new TQGridLayout(tqlayout);
+    TQGridLayout *eventslayout = new TQGridLayout(layout);
-    eventstqlayout->addColSpacing(0, 20);
+    eventslayout->addColSpacing(0, 20);
-    eventstqlayout->setColStretch(0, 0);
+    eventslayout->setColStretch(0, 0);
-    eventstqlayout->setColStretch(1, 1);
+    eventslayout->setColStretch(1, 1);
     
     commitbox = new TQCheckBox(i18n("&Commits"), mainWidget);
     commitbox->setEnabled(false);
-    eventstqlayout->addWidget(commitbox, 0, 1);
+    eventslayout->addWidget(commitbox, 0, 1);
     
     editbox = new TQCheckBox(i18n("&Edits"), mainWidget);
     editbox->setEnabled(false);
-    eventstqlayout->addWidget(editbox, 1, 1);
+    eventslayout->addWidget(editbox, 1, 1);
 
     uneditbox = new TQCheckBox(i18n("&Unedits"), mainWidget);
     uneditbox->setEnabled(false);
-    eventstqlayout->addWidget(uneditbox, 2, 1);
+    eventslayout->addWidget(uneditbox, 2, 1);
 
     TQButtonGroup* group = new TQButtonGroup(mainWidget);
     group->hide();

cervisia/watchersdlg.cpp

@@ -37,7 +37,7 @@ WatchersDialog::WatchersDialog(KConfig& cfg, TQWidget* parent, const char* name)
 {
     TQFrame* mainWidget = makeMainWidget();
 
-    TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
     table = new TQTable(mainWidget, "watchersTable");
     table->setNumCols(5);
@@ -57,7 +57,7 @@ WatchersDialog::WatchersDialog(KConfig& cfg, TQWidget* parent, const char* name)
     header->setLabel(3, i18n("Unedit"));
     header->setLabel(4, i18n("Commit"));
     
-    tqlayout->addWidget(table, 1);
+    layout->addWidget(table, 1);
 
     setWFlags(TQt::WDestructiveClose | getWFlags());
 

kapptemplate/kapp/apppref.cpp

@@ -25,8 +25,8 @@ ${APP_NAME}Preferences::${APP_NAME}Preferences()
 ${APP_NAME}PrefPageOne::${APP_NAME}PrefPageOne(TQWidget *parent)
     : TQFrame(parent)
 {
-    TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
+    TQHBoxLayout *layout = new TQHBoxLayout(this);
-    tqlayout->setAutoAdd(true);
+    layout->setAutoAdd(true);
 
     new TQLabel("Add something here", this);
 }
@@ -34,8 +34,8 @@ ${APP_NAME}PrefPageOne::${APP_NAME}PrefPageOne(TQWidget *parent)
 ${APP_NAME}PrefPageTwo::${APP_NAME}PrefPageTwo(TQWidget *parent)
     : TQFrame(parent)
 {
-    TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
+    TQHBoxLayout *layout = new TQHBoxLayout(this);
-    tqlayout->setAutoAdd(true);
+    layout->setAutoAdd(true);
 
     new TQLabel("Add something here", this);
 }

kapptemplate/kapp/appview.cpp

@@ -16,7 +16,7 @@ ${APP_NAME}View::${APP_NAME}View(TQWidget *parent)
     : TQWidget(parent),
       DCOPObject("${APP_NAME}Iface")
 {
-    // setup our tqlayout manager to automatically add our widgets
+    // setup our layout manager to automatically add our widgets
     TQHBoxLayout *top_layout = new TQHBoxLayout(this);
     top_layout->setAutoAdd(true);
 

kbabel/catalogmanager/catalogmanager.cpp

@@ -136,13 +136,13 @@ void CatalogManager::init()
 	, TQT_TQOBJECT(this), TQT_SLOT (updateSettings()));
 
    TQWidget *view = new TQWidget(this);
-   TQVBoxLayout* tqlayout= new TQVBoxLayout(view);
+   TQVBoxLayout* layout= new TQVBoxLayout(view);
-   tqlayout->setMargin(0);
+   layout->setMargin(0);
-   tqlayout->setSpacing(KDialog::spacingHint());
+   layout->setSpacing(KDialog::spacingHint());
 
    _catalogManager=new CatalogManagerView(_project, view,"catalog manager");
-   tqlayout->addWidget(_catalogManager);
+   layout->addWidget(_catalogManager);
-   tqlayout->setStretchFactor(_catalogManager,1);
+   layout->setStretchFactor(_catalogManager,1);
 
    connect(this,TQT_SIGNAL(settingsChanged(KBabel::CatManSettings))
             ,TQT_TQOBJECT(_catalogManager),TQT_SLOT(setSettings(KBabel::CatManSettings)));
@@ -162,7 +162,7 @@ void CatalogManager::init()
    KWin::setIcons(winId(),BarIcon("catalogmanager",32)
            ,SmallIcon("catalogmanager"));
 
-   TQHBoxLayout* hBoxL = new TQHBoxLayout(tqlayout);
+   TQHBoxLayout* hBoxL = new TQHBoxLayout(layout);
    _progressLabel = new TQLabel(view);
    hBoxL->addWidget(_progressLabel);
    _progressBar=new KProgress(view);

kbabel/catalogmanager/findinfilesdialog.cpp

@@ -48,7 +48,7 @@ FindInFilesDialog::FindInFilesDialog(bool forReplace, TQWidget* parent)
 		:FindDialog(forReplace, parent)
 {
 	TQGroupBox* box = new TQGroupBox(2, Qt::Horizontal, i18n("File Options"), mainWidget());
-	mainWidget()->tqlayout()->add(box);
+	mainWidget()->layout()->add(box);
 
 	_inAllFiles = new TQCheckBox(i18n("&In all files"),box);
 	_inMarked = new TQCheckBox(i18n("&Marked files"),box);

kbabel/catalogmanager/libcvs/cvsdialog.cpp

@@ -69,7 +69,7 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
 
   TQString temp;
 
-  TQVBoxLayout * tqlayout = new TQVBoxLayout( this, 6, 6, "MAIN LAYOUT" );
+  TQVBoxLayout * layout = new TQVBoxLayout( this, 6, 6, "MAIN LAYOUT" );
 
   // Set the label's text depending on the CVS command.
   switch ( cmd ) {
@@ -86,11 +86,11 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
       temp = i18n( "Get diff for the following files:" );
       break;
   }
-  tqlayout->addWidget( new TQLabel( temp, this ) );
+  layout->addWidget( new TQLabel( temp, this ) );
 
   // Widget for showing the list of files.
   filebox = new TQListBox( this );
-  tqlayout->addWidget( filebox );
+  layout->addWidget( filebox );
 
   // Add special widgets for 'cvs commit'.
   if ( cmd == CVS::Commit ) {
@@ -101,21 +101,21 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
     oldMessages = new TQComboBox( this );
     oldMessages->setDuplicatesEnabled( false );
     label->setBuddy( oldMessages );
-    tqlayout->addWidget( label );
+    layout->addWidget( label );
-    tqlayout->addWidget( oldMessages );
+    layout->addWidget( oldMessages );
 
     // Textfield for entering a log message.
     label = new TQLabel( i18n( "&Log message:" ), this );
     logedit = new TQTextEdit( this );
     label->setBuddy( logedit );
-    tqlayout->addWidget( label );
+    layout->addWidget( label );
-    tqlayout->addWidget( logedit );
+    layout->addWidget( logedit );
 
     label = new TQLabel( i18n( "E&ncoding:" ), this );
     m_encodingComboBox = new KComboBox( this );
     label->setBuddy( m_encodingComboBox );
-    tqlayout->addWidget( label );
+    layout->addWidget( label );
-    tqlayout->addWidget( m_encodingComboBox );
+    layout->addWidget( m_encodingComboBox );
     TQStringList encodingList;
     // The last encoding will be added at the top of the list, when the seetings will be read.
     encodingList << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
@@ -156,17 +156,17 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
 
   cancelBtn = new TQPushButton( i18n( "C&ancel" ), this );
   buttons->addWidget( cancelBtn );
-  tqlayout->addLayout( buttons );
+  layout->addLayout( buttons );
 
   TQFrame * line = new TQFrame( this );
   line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
-  tqlayout->addWidget( line );
+  layout->addWidget( line );
 
-  tqlayout->addWidget( new TQLabel( i18n( "Command output:" ), this ) );
+  layout->addWidget( new TQLabel( i18n( "Command output:" ), this ) );
 
   output = new TQTextEdit( this );
   output->setReadOnly( true );
-  tqlayout->addWidget( output );
+  layout->addWidget( output );
 
   resize( TQSize( 600, 450 ).expandedTo( minimumSizeHint( ) ) );
 

kbabel/catalogmanager/libsvn/svndialog.cpp

@@ -66,7 +66,7 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config
 
   TQString temp;
 
-  TQVBoxLayout * tqlayout = new TQVBoxLayout( this, 6, 6, "MAIN LAYOUT" );
+  TQVBoxLayout * layout = new TQVBoxLayout( this, 6, 6, "MAIN LAYOUT" );
 
   // Set the label's text depending on the SVN command.
   switch ( cmd ) {
@@ -89,11 +89,11 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config
       temp = i18n( "Get information for the following files:" );
       break;
   }
-  tqlayout->addWidget( new TQLabel( temp, this ) );
+  layout->addWidget( new TQLabel( temp, this ) );
 
   // Widget for showing the list of files.
   filebox = new TQListBox( this );
-  tqlayout->addWidget( filebox );
+  layout->addWidget( filebox );
 
   // Add special widgets for 'svn commit'.
   if ( cmd == SVN::Commit ) {
@@ -104,15 +104,15 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config
     oldMessages = new TQComboBox( this );
     oldMessages->setDuplicatesEnabled( false );
     label->setBuddy( oldMessages );
-    tqlayout->addWidget( label );
+    layout->addWidget( label );
-    tqlayout->addWidget( oldMessages );
+    layout->addWidget( oldMessages );
 
     // Textfield for entering a log message.
     label = new TQLabel( i18n( "&Log message:" ), this );
     logedit = new TQTextEdit( this );
     label->setBuddy( logedit );
-    tqlayout->addWidget( label );
+    layout->addWidget( label );
-    tqlayout->addWidget( logedit );
+    layout->addWidget( logedit );
 
     connect( oldMessages, TQT_SIGNAL( activated( int ) ),
       this, TQT_SLOT( slotComboActivated( int ) ) );
@@ -151,17 +151,17 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config
 
   cancelBtn = new TQPushButton( i18n( "C&ancel" ), this );
   buttons->addWidget( cancelBtn );
-  tqlayout->addLayout( buttons );
+  layout->addLayout( buttons );
 
   TQFrame * line = new TQFrame( this );
   line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
-  tqlayout->addWidget( line );
+  layout->addWidget( line );
 
-  tqlayout->addWidget( new TQLabel( i18n( "Command output:" ), this ) );
+  layout->addWidget( new TQLabel( i18n( "Command output:" ), this ) );
 
   output = new TQTextEdit( this );
   output->setReadOnly( true );
-  tqlayout->addWidget( output );
+  layout->addWidget( output );
 
   resize( TQSize( 600, 450 ).expandedTo( minimumSizeHint( ) ) );
 

kbabel/catalogmanager/multiroughtransdlg.cpp

@@ -58,9 +58,9 @@ MultiRoughTransDlg::MultiRoughTransDlg(KBabelDictBox *dict, TQPtrList<CatManList
     filesProgressbar->setTextEnabled(true);
     filesProgressbar->setFormat("%v/%m (%p%)");
     filesProgressbar->setTotalSteps(files.count());
-    TQHBoxLayout* mytqlayout= new TQHBoxLayout(bars->tqlayout());
+    TQHBoxLayout* mylayout= new TQHBoxLayout(bars->layout());
-    mytqlayout->add(label);
+    mylayout->add(label);
-    mytqlayout->add(filesProgressbar); 
+    mylayout->add(filesProgressbar); 
     
     msgButtonClicked(0);
 }

kbabel/catalogmanager/validateprogresswidget.ui

@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <grid>
                 <property name="name">

kbabel/catalogmanager/validationoptions.ui

@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <vbox>
                 <property name="name">

kbabel/commonui/cmdedit.cpp

@@ -45,38 +45,38 @@
 CmdEdit::CmdEdit(TQWidget* parent, const char* name)
        : TQWidget(parent,name)
 {
-    TQGridLayout* tqlayout = new TQGridLayout( this , 1 , 1 );
+    TQGridLayout* layout = new TQGridLayout( this , 1 , 1 );
-    tqlayout->setSpacing( KDialog::spacingHint() );
+    layout->setSpacing( KDialog::spacingHint() );
 
     TQLabel* nameLabel = new TQLabel( i18n("Command &Label:"), this);
     TQLabel* cmdLabel = new TQLabel( i18n("Co&mmand:"), this);
-    tqlayout->addWidget( nameLabel, 0 , 0 );
+    layout->addWidget( nameLabel, 0 , 0 );
-    tqlayout->addWidget( cmdLabel, 0 , 1 );
+    layout->addWidget( cmdLabel, 0 , 1 );
 
     _cmdNameEdit = new TQLineEdit( this , "cmdNameEdit" );
     _cmdNameEdit->setMaxLength(20);
     nameLabel->setBuddy(_cmdNameEdit);
-    tqlayout->addWidget( _cmdNameEdit , 1 , 0 );
+    layout->addWidget( _cmdNameEdit , 1 , 0 );
 
     _cmdEdit = new TQLineEdit( this , "cmdEdit" );
     cmdLabel->setBuddy(_cmdEdit);
-    tqlayout->addWidget( _cmdEdit , 1 , 1 );
+    layout->addWidget( _cmdEdit , 1 , 1 );
 
 
     _addButton = new TQPushButton( i18n("&Add"), this );
     _addButton->setEnabled(false);
-    tqlayout->addWidget( _addButton , 1 , 2 );
+    layout->addWidget( _addButton , 1 , 2 );
 
     _editButton = new TQPushButton( i18n("&Edit"), this );
     _editButton->setEnabled(false);
-    tqlayout->addWidget( _editButton , 3 , 2 );
+    layout->addWidget( _editButton , 3 , 2 );
 
     _removeButton = new TQPushButton( i18n("&Remove"), this );
     _removeButton->setEnabled(false);
-    tqlayout->addWidget( _removeButton , 4 , 2 );
+    layout->addWidget( _removeButton , 4 , 2 );
 
     TQHBoxLayout* hbox = new TQHBoxLayout();
-    tqlayout->addLayout(hbox,5,2);
+    layout->addLayout(hbox,5,2);
 
     _upButton = new TQToolButton(UpArrow,this);
     _upButton->setFixedSize(20,20);
@@ -90,21 +90,21 @@ CmdEdit::CmdEdit(TQWidget* parent, const char* name)
 
     _commandNames = new TQListBox( this , "commandNamesBox" );
     _commandNames->setMinimumSize(100, 100);
-    tqlayout->addMultiCellWidget( _commandNames , 3 , 6 , 0 , 0);
+    layout->addMultiCellWidget( _commandNames , 3 , 6 , 0 , 0);
 
     _commands = new TQListBox( this , "commandsBox" );
     _commands->setMinimumSize(160, 100);
-    tqlayout->addMultiCellWidget( _commands , 3 , 6 , 1 ,1 );
+    layout->addMultiCellWidget( _commands , 3 , 6 , 1 ,1 );
 
 
-    tqlayout->setColStretch(0,1);
+    layout->setColStretch(0,1);
-    tqlayout->setColStretch(1,2);
+    layout->setColStretch(1,2);
-    tqlayout->setColStretch(2,0);
+    layout->setColStretch(2,0);
 
-    tqlayout->addRowSpacing(2, KDialog::spacingHint());
+    layout->addRowSpacing(2, KDialog::spacingHint());
-    tqlayout->addRowSpacing(6, KDialog::spacingHint());
+    layout->addRowSpacing(6, KDialog::spacingHint());
 
-    setMinimumSize(tqlayout->sizeHint());
+    setMinimumSize(layout->sizeHint());
 
 
     connect(_addButton , TQT_SIGNAL(clicked()) , this , TQT_SLOT(addCmd()) ) ;

kbabel/commonui/diffpreferences.ui

@@ -72,7 +72,7 @@ in KBabel's main window.&lt;/p&gt;&lt;/qt&gt;</string>
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">

kbabel/commonui/finddialog.cpp

@@ -57,15 +57,15 @@ FindDialog::FindDialog(bool forReplace, TQWidget* parent)
 		, _regExpEditDialog(0), _replaceDlg(forReplace)
 {
 	TQWidget* page = new TQWidget(this);
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(page, 0, spacingHint());
+	TQVBoxLayout *layout = new TQVBoxLayout(page, 0, spacingHint());
 
 	TQLabel *label = new TQLabel(i18n("&Find:"),page);
-	tqlayout->addWidget(label);
+	layout->addWidget(label);
 
 	_findCombo = new KComboBox(true, page, "findCombo");
 	_findCombo->setMaxCount(10);
 	_findCombo->setInsertionPolicy(KComboBox::AtTop);
-	tqlayout->addWidget(_findCombo);
+	layout->addWidget(_findCombo);
 	label->setBuddy(_findCombo);
 
 	TQString msg=i18n("<qt><p><b>Find text</b></p>"
@@ -82,11 +82,11 @@ FindDialog::FindDialog(bool forReplace, TQWidget* parent)
                 setButtonOK(i18n("&Replace"));
 
 		_replaceLabel = new TQLabel(i18n("&Replace with:"),page);
-		tqlayout->addWidget(_replaceLabel);
+		layout->addWidget(_replaceLabel);
 		_replaceCombo = new KComboBox(true, page, "replaceCombo");
 		_replaceCombo->setMaxCount(10);
 		_replaceCombo->setInsertionPolicy(KComboBox::AtTop);
-		tqlayout->addWidget(_replaceCombo);
+		layout->addWidget(_replaceCombo);
 		_replaceLabel->setBuddy(_replaceCombo);
 
 	    	msg=i18n("<qt><p><b>Replace text</b></p>"
@@ -107,7 +107,7 @@ FindDialog::FindDialog(bool forReplace, TQWidget* parent)
 
 	_buttonGrp = new TQButtonGroup(3, Qt::Horizontal, i18n("Where to Search"), page);
 	connect(_buttonGrp,TQT_SIGNAL(clicked(int)), this, TQT_SLOT(inButtonsClicked(int)));
-	tqlayout->addWidget(_buttonGrp);
+	layout->addWidget(_buttonGrp);
 
 	_inMsgid = new TQCheckBox(i18n("&Msgid"),_buttonGrp);
 	_inMsgstr = new TQCheckBox(i18n("M&sgstr"),_buttonGrp);
@@ -119,7 +119,7 @@ FindDialog::FindDialog(bool forReplace, TQWidget* parent)
 
 
 	TQGroupBox* box = new TQGroupBox(2, Qt::Horizontal, i18n("Options"), page);
-	tqlayout->addWidget(box);
+	layout->addWidget(box);
 
 	_caseSensitive = new TQCheckBox(i18n("C&ase sensitive"),box);
 	_wholeWords = new TQCheckBox(i18n("O&nly whole words"),box);
@@ -536,10 +536,10 @@ ReplaceDialog::ReplaceDialog(TQWidget* parent)
                    , true,false,i18n("&Replace"),i18n("&Goto Next"),i18n("R&eplace All"))
 {
 	TQWidget* page = plainPage();
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(page, 0, spacingHint());
+	TQVBoxLayout *layout = new TQVBoxLayout(page, 0, spacingHint());
 
 	TQLabel *label = new TQLabel(i18n("Replace this string?"),page);
-	tqlayout->addWidget(label);
+	layout->addWidget(label);
 
 	connect(this,TQT_SIGNAL(user1Clicked()),this,TQT_SIGNAL(replace()));
 	connect(this,TQT_SIGNAL(user2Clicked()),this,TQT_SIGNAL(next()));

kbabel/commonui/projectprefwidgets.cpp

@@ -81,7 +81,7 @@ static TQSize sizeHintForWidget(const TQWidget* widget)
   //
   // The size is computed by adding the sizeHint().height() of all
   // widget children and taking the width of the widest child and adding
-  // tqlayout()->margin() and tqlayout()->spacing()
+  // layout()->margin() and layout()->spacing()
   //
 
   TQSize size;
@@ -110,7 +110,7 @@ static TQSize sizeHintForWidget(const TQWidget* widget)
   if( numChild > 0 )
   {
     size.setHeight( size.height() + widget->tqlayout()->spacing()*(numChild-1) );
-    size += TQSize( widget->tqlayout()->margin()*2, widget->tqlayout()->margin()*2 + 1 );
+    size += TQSize( widget->layout()->margin()*2, widget->layout()->margin()*2 + 1 );
   }
   else
   {
@@ -127,12 +127,12 @@ SavePreferences::SavePreferences(TQWidget *parent)
     :  KTabCtl(parent)
 {
     TQWidget* page = new TQWidget(this);
-    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
+    TQVBoxLayout* layout=new TQVBoxLayout(page);
-    tqlayout->setSpacing(KDialog::spacingHint());
+    layout->setSpacing(KDialog::spacingHint());
-    tqlayout->setMargin(KDialog::marginHint());
+    layout->setMargin(KDialog::marginHint());
 
     TQGroupBox* box=new TQGroupBox(1,Qt::Horizontal,page);
-    tqlayout->addWidget(box);
+    layout->addWidget(box);
 
     box->setMargin(KDialog::marginHint());
     _updateButton = new TQCheckBox(i18n("&Update header when saving"),box, "kcfg_AutoUpdate");
@@ -141,7 +141,7 @@ SavePreferences::SavePreferences(TQWidget *parent)
     _saveObsoleteButton = new TQCheckBox(i18n("Save &obsolete entries"),box, "kcfg_SaveObsolete");
     
     TQGroupBox* descBox=new TQGroupBox(1,Qt::Horizontal,i18n("De&scription"),page);
-    tqlayout->addWidget(descBox);
+    layout->addWidget(descBox);
     
     descBox->setMargin(KDialog::marginHint());
     _descriptionEdit = new TQLineEdit(descBox, "kcfg_DescriptionString");
@@ -149,7 +149,7 @@ SavePreferences::SavePreferences(TQWidget *parent)
     TQGroupBox* encodingBox = new TQGroupBox(1,Qt::Horizontal,i18n("Encoding")
                                   ,page);
     encodingBox->setMargin(KDialog::marginHint());
-    tqlayout->addWidget(encodingBox);
+    layout->addWidget(encodingBox);
     TQHBox *b = new TQHBox(encodingBox);
 
     TQLabel* tempLabel=new TQLabel(i18n("Default:"),b);
@@ -177,23 +177,23 @@ SavePreferences::SavePreferences(TQWidget *parent)
 
     _autoSaveBox = new TQGroupBox( 1, Qt::Horizontal, i18n( "Automatic Saving" ), page );
     _autoSaveBox->setMargin( KDialog::marginHint( ) );
-    tqlayout->addWidget( _autoSaveBox );
+    layout->addWidget( _autoSaveBox );
     _autoSaveDelay = new KIntNumInput( _autoSaveBox, "kcfg_AutoSaveDelay" );
     _autoSaveDelay->setRange( 0, 60 );
     _autoSaveDelay->setSuffix( i18n( "Short for minutes", " min" ) );
     _autoSaveDelay->setSpecialValueText( i18n( "No autosave" ) );
 
-    tqlayout->addStretch(1);
+    layout->addStretch(1);
     page->setMinimumSize(sizeHintForWidget(page));
     addTab(page, i18n("&General"));
     
     page = new TQWidget(this);
-    tqlayout=new TQVBoxLayout(page);
+    layout=new TQVBoxLayout(page);
-    tqlayout->setSpacing(KDialog::spacingHint());
+    layout->setSpacing(KDialog::spacingHint());
-    tqlayout->setMargin(KDialog::marginHint());
+    layout->setMargin(KDialog::marginHint());
 
     TQGroupBox* gridBox = new TQGroupBox(2,Qt::Horizontal,i18n("Fields to Update"),page);
-    tqlayout->addWidget(gridBox);
+    layout->addWidget(gridBox);
     gridBox->setMargin(KDialog::marginHint());
 
     _revisionButton = new TQCheckBox(i18n("Re&vision-Date"),gridBox, "kcfg_UpdateRevisionDate");
@@ -204,7 +204,7 @@ SavePreferences::SavePreferences(TQWidget *parent)
     _projectButton = new TQCheckBox(i18n("Pro&ject"),gridBox, "kcfg_UpdateProject");
 
     TQButtonGroup* dateBox = new TQButtonGroup(2,Qt::Horizontal,i18n("Format of Revision-Date"),page, "kcfg_DateFormat");
-    tqlayout->addWidget(dateBox);
+    layout->addWidget(dateBox);
     box->setMargin(KDialog::marginHint());
 
     // we remove/insert default date button to correctly map TQt::DateFormat to our Ids
@@ -225,7 +225,7 @@ SavePreferences::SavePreferences(TQWidget *parent)
     TQGroupBox* projectBox = new TQGroupBox(1,Qt::Horizontal,i18n("Project String")
                                   ,page);
     projectBox->setMargin(KDialog::marginHint());
-    tqlayout->addWidget(projectBox);
+    layout->addWidget(projectBox);
     b = new TQHBox(projectBox);
 
     tempLabel=new TQLabel(i18n("Project-Id:"),b);
@@ -234,31 +234,31 @@ SavePreferences::SavePreferences(TQWidget *parent)
     b->setSpacing(KDialog::spacingHint());
     tempLabel->setBuddy(_projectEdit);
     
-    tqlayout->addStretch(1);
+    layout->addStretch(1);
     page->setMinimumSize(sizeHintForWidget(page));
     addTab(page, i18n("&Header"));
     
     page = new TQWidget(this);
-    tqlayout=new TQVBoxLayout(page);
+    layout=new TQVBoxLayout(page);
-    tqlayout->setSpacing(KDialog::spacingHint());
+    layout->setSpacing(KDialog::spacingHint());
-    tqlayout->setMargin(KDialog::marginHint());
+    layout->setMargin(KDialog::marginHint());
 
     TQGroupBox* translatorCopyrightBox = new TQGroupBox(1,Qt::Horizontal, page);
     translatorCopyrightBox->setMargin(KDialog::marginHint());
     _translatorCopyrightButton = 
 	new TQCheckBox(i18n("Update &translator copyright")
 	    ,translatorCopyrightBox, "kcfg_UpdateTranslatorCopyright");
-    tqlayout->addWidget(translatorCopyrightBox);
+    layout->addWidget(translatorCopyrightBox);
 
     TQGroupBox* fsfBox=new TQButtonGroup(1,Qt::Horizontal,i18n("Free Software Foundation Copyright"),page, "kcfg_FSFCopyright");
-    tqlayout->addWidget(fsfBox);
+    layout->addWidget(fsfBox);
 
     fsfBox->setMargin(KDialog::marginHint());
     _removeFSFButton = new TQRadioButton(i18n("&Remove copyright if empty"),fsfBox);
     _updateFSFButton = new TQRadioButton(i18n("&Update copyright"),fsfBox);
     _nochangeFSFButton = new TQRadioButton(i18n("Do &not change"),fsfBox);
 
-    tqlayout->addStretch(1);
+    layout->addStretch(1);
     page->setMinimumSize(sizeHintForWidget(page));
     addTab(page, i18n("Cop&yright"));
 
@@ -402,18 +402,18 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje
          : TQWidget(parent)
 {
     TQWidget* page = this;
-    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
+    TQVBoxLayout* layout=new TQVBoxLayout(page);
-    tqlayout->setSpacing(KDialog::spacingHint());
+    layout->setSpacing(KDialog::spacingHint());
-    tqlayout->setMargin(KDialog::marginHint());
+    layout->setMargin(KDialog::marginHint());
 
     if( !project.isEmpty() )
     {
 	// show the project name in the widget at the top
-	tqlayout->addWidget(new TQLabel(i18n("<font size=\"+1\">Project: %1</font>").arg(project),page));
+	layout->addWidget(new TQLabel(i18n("<font size=\"+1\">Project: %1</font>").arg(project),page));
     }
 
     TQGroupBox* group = new TQGroupBox(2,Qt::Horizontal,page);
-    tqlayout->addWidget(group);
+    layout->addWidget(group);
     group->setMargin(KDialog::marginHint());
     
     TQLabel* tempLabel=new TQLabel(i18n("&Name:"),group);
@@ -462,7 +462,7 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje
 
 
     group = new TQGroupBox(1,Qt::Horizontal,page);
-    tqlayout->addWidget(group);
+    layout->addWidget(group);
     group->setMargin(KDialog::marginHint());
 
     hbox = new TQHBox(group);
@@ -534,7 +534,7 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje
 	    "GNU gettext tools for currently set language; just press the <b>Lookup</b> "
 	    "button.</p></qt>"));
 
-    tqlayout->addStretch(1);
+    layout->addStretch(1);
 
     page->setMinimumSize(sizeHintForWidget(page));
 
@@ -663,13 +663,13 @@ MiscPreferences::MiscPreferences(TQWidget *parent)
 {
     TQWidget* page = this;
 
-    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
+    TQVBoxLayout* layout=new TQVBoxLayout(page);
-    tqlayout->setSpacing(KDialog::spacingHint());
+    layout->setSpacing(KDialog::spacingHint());
-    tqlayout->setMargin(KDialog::marginHint());
+    layout->setMargin(KDialog::marginHint());
 
     TQGroupBox* box=new TQGroupBox(1,Qt::Horizontal,page);
     box->setMargin(KDialog::marginHint());
-    tqlayout->addWidget(box);
+    layout->addWidget(box);
 
     TQHBox *hbox = new TQHBox(box);
     hbox->setSpacing(KDialog::spacingHint());
@@ -715,7 +715,7 @@ MiscPreferences::MiscPreferences(TQWidget *parent)
     vbgroup->setTitle(i18n("Compression Method for Mail Attachments"));
     vbgroup->setRadioButtonExclusive(true);
     vbgroup->setMargin(KDialog::marginHint());
-    tqlayout->addWidget(vbgroup);
+    layout->addWidget(vbgroup);
 
     bzipButton = new TQRadioButton(i18n("tar/&bzip2"), vbgroup, "kcfg_BZipCompression");
     gzipButton = new TQRadioButton(i18n("tar/&gzip"), vbgroup);
@@ -723,7 +723,7 @@ MiscPreferences::MiscPreferences(TQWidget *parent)
     compressSingle = new TQCheckBox(i18n("&Use compression when sending "
 					"a single file"), vbgroup, "kcfg_CompressSingleFile");
 
-    tqlayout->addStretch(1);
+    layout->addStretch(1);
     page->setMinimumSize(sizeHintForWidget(page));
 }
 
@@ -794,30 +794,30 @@ SpellPreferences::SpellPreferences(TQWidget* parent)
          : TQWidget(parent)
 {
     TQWidget* page = this;
-    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
+    TQVBoxLayout* layout=new TQVBoxLayout(page);
-    tqlayout->setSpacing(KDialog::spacingHint());
+    layout->setSpacing(KDialog::spacingHint());
-    tqlayout->setMargin(KDialog::marginHint());
+    layout->setMargin(KDialog::marginHint());
 
 
     onFlyBtn = new TQCheckBox(i18n("On the &fly spellchecking"),page, "kcfg_OnFlySpellCheck");
-    tqlayout->addWidget(onFlyBtn);
+    layout->addWidget(onFlyBtn);
 
     TQWhatsThis::add(onFlyBtn, i18n("<qt><p><b>On the fly spellchecking</b></p>"
         "<p>Activate this to let KBabel spell check the text "
 	"as you type. Mispelled words will be colored by the error color.</p></qt>"));
 	
     spellConfig = new KSpellConfig(page,"spellConfigWidget",0,false);
-    tqlayout->addWidget(spellConfig);
+    layout->addWidget(spellConfig);
     remIgnoredBtn = new TQCheckBox(i18n("&Remember ignored words"),page, "kcfg_RememberIgnored");
-    tqlayout->addWidget(remIgnoredBtn);
+    layout->addWidget(remIgnoredBtn);
     
     connect( spellConfig, TQT_SIGNAL( configChanged() )
 	, this, TQT_SIGNAL ( settingsChanged() ) );
 
     TQLabel *tempLabel = new TQLabel(i18n("F&ile to store ignored words:"),page);
-    tqlayout->addWidget(tempLabel);
+    layout->addWidget(tempLabel);
     ignoreURLEdit = new KURLRequester(page, "kcfg_IgnoreURL");
-    tqlayout->addWidget(ignoreURLEdit);
+    layout->addWidget(ignoreURLEdit);
     tempLabel->setBuddy(ignoreURLEdit);
 
     connect(remIgnoredBtn,TQT_SIGNAL(toggled(bool)),ignoreURLEdit
@@ -833,7 +833,7 @@ SpellPreferences::SpellPreferences(TQWidget* parent)
     TQWhatsThis::add(tempLabel,msg);
     TQWhatsThis::add(ignoreURLEdit,msg);
 
-    tqlayout->addStretch(1);
+    layout->addStretch(1);
 
     page->setMinimumSize(sizeHintForWidget(page));
 
@@ -879,13 +879,13 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent)
 {
     TQWidget* page = this;
 
-    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
+    TQVBoxLayout* layout=new TQVBoxLayout(page);
-    tqlayout->setSpacing(KDialog::spacingHint());
+    layout->setSpacing(KDialog::spacingHint());
-    tqlayout->setMargin(KDialog::marginHint());
+    layout->setMargin(KDialog::marginHint());
 
     TQGroupBox* box=new TQGroupBox(1,Qt::Horizontal,page);
     box->setMargin(KDialog::marginHint());
-    tqlayout->addWidget(box);
+    layout->addWidget(box);
 
     TQLabel* label=new TQLabel(i18n("&Base folder of PO files:"),box);
     TQHBox* hbox = new TQHBox(box);
@@ -919,7 +919,7 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent)
 
     box=new TQGroupBox(1,Qt::Horizontal,page);
     box->setMargin(KDialog::marginHint());
-    tqlayout->addWidget(box);
+    layout->addWidget(box);
 
     _openWindowButton = new TQCheckBox(i18n("O&pen files in new window"),box, "kcfg_OpenWindow");
 
@@ -956,7 +956,7 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent)
         "so invalid PO files could be shown as good ones, "
         "even if Gettext tools would reject such files.</p></qt>") );
 
-    tqlayout->addStretch(1);
+    layout->addStretch(1);
 
     page->setMinimumSize(sizeHintForWidget(page));
 
@@ -981,13 +981,13 @@ DirCommandsPreferences::DirCommandsPreferences(TQWidget* parent)
 {
     TQWidget* page = this;
 
-    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
+    TQVBoxLayout* layout=new TQVBoxLayout(page);
-    tqlayout->setSpacing(KDialog::spacingHint());
+    layout->setSpacing(KDialog::spacingHint());
-    tqlayout->setMargin(KDialog::marginHint());
+    layout->setMargin(KDialog::marginHint());
 
     TQGroupBox* box = new TQGroupBox( 1 , Qt::Horizontal , i18n("Commands for Folders") , page );
     box->setMargin( KDialog::marginHint() );
-    tqlayout->addWidget( box );
+    layout->addWidget( box );
 
     _dirCmdEdit = new CmdEdit( box );
     new TQLabel( i18n("Replaceables:\n@PACKAGE@, @PODIR@, @POTDIR@\n"
@@ -1010,7 +1010,7 @@ DirCommandsPreferences::DirCommandsPreferences(TQWidget* parent)
 
 
 
-    tqlayout->addStretch(1);
+    layout->addStretch(1);
     page->setMinimumSize(sizeHintForWidget(page));
 
     setMinimumSize(sizeHint());
@@ -1044,13 +1044,13 @@ FileCommandsPreferences::FileCommandsPreferences(TQWidget* parent)
 {
     TQWidget* page = this;
 
-    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
+    TQVBoxLayout* layout=new TQVBoxLayout(page);
-    tqlayout->setSpacing(KDialog::spacingHint());
+    layout->setSpacing(KDialog::spacingHint());
-    tqlayout->setMargin(KDialog::marginHint());
+    layout->setMargin(KDialog::marginHint());
 
     TQGroupBox* box=new TQGroupBox( 1 , Qt::Horizontal , i18n("Commands for Files") , page );
     box->setMargin( KDialog::marginHint() );
-    tqlayout->addWidget( box );
+    layout->addWidget( box );
 
     _fileCmdEdit = new CmdEdit( box );
     new TQLabel( i18n("Replaceables:\n"
@@ -1074,7 +1074,7 @@ FileCommandsPreferences::FileCommandsPreferences(TQWidget* parent)
 
 
 
-    tqlayout->addStretch(1);
+    layout->addStretch(1);
     page->setMinimumSize(sizeHintForWidget(page));
 
     setMinimumSize(sizeHint());
@@ -1107,13 +1107,13 @@ ViewPreferences::ViewPreferences(TQWidget* parent)
 {
     TQWidget* page = this;
 
-    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
+    TQVBoxLayout* layout=new TQVBoxLayout(page);
-    tqlayout->setSpacing(KDialog::spacingHint());
+    layout->setSpacing(KDialog::spacingHint());
-    tqlayout->setMargin(KDialog::marginHint());
+    layout->setMargin(KDialog::marginHint());
 
     TQGroupBox* box=new TQGroupBox(2, Qt::Horizontal,i18n("Shown Columns"),page);
     box->setMargin(KDialog::marginHint());
-    tqlayout->addWidget(box);
+    layout->addWidget(box);
 
     _flagColumnCheckbox = new TQCheckBox( i18n("Fla&g"), box, "kcfg_ShowFlagColumn" );
     _fuzzyColumnCheckbox = new TQCheckBox( i18n("&Fuzzy"), box, "kcfg_ShowFuzzyColumn" );
@@ -1126,7 +1126,7 @@ ViewPreferences::ViewPreferences(TQWidget* parent)
     TQWhatsThis::add(box,i18n("<qt><p><b>Shown columns</b></p>\n"
      "<p></p></qt>"));
      
-    tqlayout->addStretch(1);
+    layout->addStretch(1);
 
     page->setMinimumSize(sizeHintForWidget(page));
 
@@ -1148,9 +1148,9 @@ void ViewPreferences::defaults(const CatManSettings& _settings)
 SourceContextPreferences::SourceContextPreferences(TQWidget* parent): TQWidget(parent)
 {
     TQWidget* page = this;
-    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
+    TQVBoxLayout* layout=new TQVBoxLayout(page);
-    tqlayout->setSpacing(KDialog::spacingHint());
+    layout->setSpacing(KDialog::spacingHint());
-    tqlayout->setMargin(KDialog::marginHint());
+    layout->setMargin(KDialog::marginHint());
     
     TQHBox* box = new TQHBox(page);
     box->setSpacing(KDialog::spacingHint());
@@ -1161,12 +1161,12 @@ SourceContextPreferences::SourceContextPreferences(TQWidget* parent): TQWidget(p
     _coderootEdit->setMode( mode );
     _coderootEdit->setMinimumSize( 250, _coderootEdit->sizeHint().height() );
     tempLabel->setBuddy( _coderootEdit );
-    tqlayout->addWidget(box);
+    layout->addWidget(box);
 												
     // FIXME: use KConfigXT    
     _pathsEditor = new KListEditor(page);
     _pathsEditor->setTitle(i18n("Path Patterns"));
-    tqlayout->addWidget(_pathsEditor);
+    layout->addWidget(_pathsEditor);
     
     connect ( _pathsEditor, TQT_SIGNAL (itemsChanged ())
 	, this, TQT_SIGNAL (itemsChanged ()));

kbabel/commonui/projectwizardwidget.ui

@@ -40,7 +40,7 @@ and also a type of the translation project.
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <grid>
                 <property name="name">

kbabel/commonui/projectwizardwidget2.ui

@@ -46,7 +46,7 @@ will not work.</string>
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -88,7 +88,7 @@ will not work.</string>
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <vbox>
                 <property name="name">

kbabel/commonui/roughtransdlg.cpp

@@ -187,9 +187,9 @@ RoughTransDlg::RoughTransDlg(KBabelDictBox *dict, Catalog *cat
     progressbar = new KProgress(mw,"progressbar");
     progressbar->setTextEnabled(true);
     progressbar->setFormat("%v/%m (%p%)");
-    TQHBoxLayout* pbtqlayout= new TQHBoxLayout(mainLayout);
+    TQHBoxLayout* pblayout= new TQHBoxLayout(mainLayout);
-    pbtqlayout->add(label);
+    pblayout->add(label);
-    pbtqlayout->add(progressbar);
+    pblayout->add(progressbar);
 
     transButton->setChecked(config->readBoolEntry("Translated",false));
     untransButton->setChecked(config->readBoolEntry("Untranslated",true));

kbabel/kbabel/charselectview.cpp

@@ -52,14 +52,14 @@ using namespace KBabel;
 CharacterSelectorView::CharacterSelectorView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project)
     : KBCatalogView(catalog,parent,project)
 {
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
+    TQVBoxLayout* layout = new TQVBoxLayout( this );
-    tqlayout->setResizeMode( TQLayout::Minimum );
+    layout->setResizeMode( TQLayout::Minimum );
 
-    tqlayout->setSpacing( KDialog::spacingHint() );
+    layout->setSpacing( KDialog::spacingHint() );
     
     TQHBox* bar = new TQHBox(this);
     bar->setSpacing( KDialog::spacingHint() );
-    tqlayout->addWidget (bar);
+    layout->addWidget (bar);
     
     TQLabel *lTable = new TQLabel( i18n( "Table:" ), bar );
     _tableNum = new TQSpinBox( 0, 255, 1, bar );
@@ -72,7 +72,7 @@ CharacterSelectorView::CharacterSelectorView(KBCatalog* catalog,TQWidget *parent
     _table->setNumRows(16);
     
     scroll->addChild(_table);
-    tqlayout->addWidget (scroll);
+    layout->addWidget (scroll);
     
     connect( _table, TQT_SIGNAL( doubleClicked() ), this, TQT_SLOT( emitChar() ) );
     connect( _tableNum, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( setTab(int) ));

kbabel/kbabel/commentview.cpp

@@ -67,7 +67,7 @@ CommentView::CommentView(KBCatalog* catalog,TQWidget *parent, Project::Ptr proje
 {
     setAcceptDrops(true);
 
-    TQVBoxLayout* tqlayout=new TQVBoxLayout(this);
+    TQVBoxLayout* layout=new TQVBoxLayout(this);
 
     commentEdit = new MsgMultiLineEdit(0, 0, this);
     commentEdit->setMinimumHeight(50);
@@ -77,12 +77,12 @@ CommentView::CommentView(KBCatalog* catalog,TQWidget *parent, Project::Ptr proje
 
     TQLabel* label=new TQLabel(commentEdit,i18n("&Comment:"),this);
 
-    TQHBoxLayout* hb=new TQHBoxLayout(tqlayout);
+    TQHBoxLayout* hb=new TQHBoxLayout(layout);
     hb->addSpacing(KDialog::marginHint());
     hb->addWidget(label);
 
-    tqlayout->addWidget(commentEdit);
+    layout->addWidget(commentEdit);
-    tqlayout->setStretchFactor(commentEdit,1);
+    layout->setStretchFactor(commentEdit,1);
 
     TQWhatsThis::add(this,
        i18n("<qt><p><b>Comment Editor</b></p>\n\

kbabel/kbabel/contextview.cpp

@@ -50,14 +50,14 @@ using namespace KBabel;
 ContextView::ContextView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project)
     : KBCatalogView(catalog,parent,project)
 {
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
+    TQVBoxLayout* layout = new TQVBoxLayout( this );
-    tqlayout->setResizeMode( TQLayout::Minimum );
+    layout->setResizeMode( TQLayout::Minimum );
 
     _textview = new TQTextView (this, "context textview");
     KCursor::setAutoHideCursor(_textview->viewport(),true);
     _textview->setReadOnly(true);
     
-    tqlayout->addWidget (_textview);
+    layout->addWidget (_textview);
 
     TQWhatsThis::add(this,
         i18n("<qt><p><b>PO Context</b></p>"

kbabel/kbabel/editordiffpreferences.ui

@@ -152,7 +152,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">

kbabel/kbabel/errorlistview.cpp

@@ -50,14 +50,14 @@ using namespace KBabel;
 ErrorListView::ErrorListView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project)
     : KBCatalogView(catalog,parent,project)
 {
-	TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
+	TQVBoxLayout* layout = new TQVBoxLayout( this );
-	tqlayout->setResizeMode( TQLayout::Minimum );
+	layout->setResizeMode( TQLayout::Minimum );
 
 	_textview = new TQTextView (this);
 	KCursor::setAutoHideCursor(_textview->viewport(),true);
 	_textview->setReadOnly(true);
 
-	tqlayout->addWidget(_textview);
+	layout->addWidget(_textview);
 
 	TQWhatsThis::add(this, i18n( "<qt><p><b>Error List</b></p>"
 			"<p>This window shows the list of errors found by validator tools "

kbabel/kbabel/kbabelview.cpp

@@ -307,7 +307,7 @@ void KBabelView::initDockWidgets()
     TQWidget *tempWidget=new TQWidget(this,"msgidWidget");
     tempWidget->setMinimumSize(350,150);
 
-    TQVBoxLayout *tqlayout=new TQVBoxLayout(tempWidget);
+    TQVBoxLayout *layout=new TQVBoxLayout(tempWidget);
 
     msgidLabel = new HidingMsgEdit(2, this, 0, tempWidget,"msgidLabel");
     msgidLabel->installEventFilter(this);
@@ -332,12 +332,12 @@ void KBabelView::initDockWidgets()
 
     TQLabel *label=new TQLabel(msgidLabel,i18n("O&riginal string (msgid):"),tempWidget);
 
-    TQHBoxLayout* hb=new TQHBoxLayout(tqlayout);
+    TQHBoxLayout* hb=new TQHBoxLayout(layout);
     hb->addSpacing(KDialog::marginHint());
     hb->addWidget(label);
 
-    tqlayout->addWidget(msgidLabel);
+    layout->addWidget(msgidLabel);
-    tqlayout->setStretchFactor(msgidLabel,1);
+    layout->setStretchFactor(msgidLabel,1);
 
     TQWhatsThis::add(tempWidget,
        i18n("<qt><p><b>Original String</b></p>\n\
@@ -382,7 +382,7 @@ of the currently displayed entry.</p></qt>"));
     tempWidget=new TQWidget(this,"msgstrWidget");
     tempWidget->setMinimumSize(350,150);
 
-    tqlayout=new TQVBoxLayout(tempWidget);
+    layout=new TQVBoxLayout(tempWidget);
 
     // if undefined number of plural forms, use 1
     int pf = _catalog->defaultNumberOfPluralForms();
@@ -395,7 +395,7 @@ of the currently displayed entry.</p></qt>"));
 
     label=new TQLabel(msgstrEdit,i18n("Trans&lated string (msgstr):"),tempWidget);
 
-    hb=new TQHBoxLayout(tqlayout);
+    hb=new TQHBoxLayout(layout);
     hb->setSpacing(KDialog::spacingHint());
 
     hb->addSpacing(KDialog::marginHint());
@@ -443,8 +443,8 @@ of the currently displayed entry.</p></qt>"));
        TQWhatsThis::add(_errorLed,ledMsg);
     }
 
-    tqlayout->addWidget(msgstrEdit);
+    layout->addWidget(msgstrEdit);
-    tqlayout->setStretchFactor(msgstrEdit,1);
+    layout->setStretchFactor(msgstrEdit,1);
 
     TQWhatsThis::add(tempWidget,
        i18n("<qt><p><b>Translation Editor</b></p>\n\

kbabel/kbabel/kbcataloglistview.cpp

@@ -38,7 +38,7 @@ KBCatalogListView::KBCatalogListView(KBCatalog* catalog, TQWidget *parent, KBabe
  : TQWidget(parent)
 {
     m_catalog= catalog;
-    TQVBoxLayout* tqlayout=new TQVBoxLayout(this);
+    TQVBoxLayout* layout=new TQVBoxLayout(this);
     
     m_listview = new KListView(this, "catalogListView");
     m_listview->addColumn(i18n("Id"));
@@ -49,8 +49,8 @@ KBCatalogListView::KBCatalogListView(KBCatalog* catalog, TQWidget *parent, KBabe
     m_listview->setAllColumnsShowFocus(true);
     m_listview->resize(this->size());
 
-    tqlayout->addWidget(m_listview);
+    layout->addWidget(m_listview);
-    tqlayout->setStretchFactor(m_listview,1);
+    layout->setStretchFactor(m_listview,1);
     
     connect(m_listview,TQT_SIGNAL(selectionChanged(TQListViewItem *)), this,TQT_SLOT(selectionChanged(TQListViewItem *)));
 }

kbabel/kbabel/mymultilineedit.cpp

@@ -992,7 +992,7 @@ void MsgMultiLineEdit::paintSpacePoints()
             int i = s.find( " " );
             while( (i >= 0) && (i < (int)s.length()-1) ) // -1 because text will end by EOLN
             {
-                TQPixmap* pm = ( s.at(i).tqunicode() == 0x00A0U ) ? wsnb : ws;
+                TQPixmap* pm = ( s.at(i).unicode() == 0x00A0U ) ? wsnb : ws;
                 TQRect r = mapToView( curpara, i );
                 r.moveBy( r.width()/2, (r.height() - fm.descent())/2 );
                 r.moveBy( -pm->rect().width()/2, -pm->rect().height()/2-1 );

kbabel/kbabel/searchpreferences.ui

@@ -51,7 +51,7 @@ in the toolbar pressed for a while.&lt;/p&gt;&lt;/qt&gt;</string>
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">

kbabel/kbabel/sourceview.cpp

@@ -48,11 +48,11 @@ using namespace KBabel;
 SourceView::SourceView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project)
     : KBCatalogView(catalog,parent,project)
 {
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
+    TQVBoxLayout* layout = new TQVBoxLayout( this );
-    tqlayout->setResizeMode( TQLayout::Minimum );
+    layout->setResizeMode( TQLayout::Minimum );
 
     _contextView = new SourceContext (this, project);
-    tqlayout->addWidget (_contextView);
+    layout->addWidget (_contextView);
     
     connect(_catalog, TQT_SIGNAL(signalFileOpened(bool)), this, TQT_SLOT(setDisabled(bool)));
 }

kbabel/kbabel/taglistview.cpp

@@ -47,12 +47,12 @@ using namespace KBabel;
 TagListView::TagListView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project)
     : KBCatalogView(catalog,parent,project)
 {
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
+    TQVBoxLayout* layout = new TQVBoxLayout( this );
-    tqlayout->setResizeMode( TQLayout::Minimum );
+    layout->setResizeMode( TQLayout::Minimum );
 
     _tagBox = new KListBox (this, "taglist textview");
     
-    tqlayout->addWidget (_tagBox);
+    layout->addWidget (_tagBox);
     
     connect(_tagBox,TQT_SIGNAL(selected(const TQString&))
             , this, TQT_SIGNAL(signalTagSelected(const TQString&)));

kbabel/kbabeldict/dictchooser.cpp

@@ -52,18 +52,18 @@ DictChooser::DictChooser(KBabelDictBox*b, TQStringList selected
     tempConfig.setAutoDelete(true);
 
     dictList = box->moduleInfos();
-    TQGridLayout *tqlayout = new TQGridLayout(this);
+    TQGridLayout *layout = new TQGridLayout(this);
-    tqlayout->setSpacing(KDialog::spacingHint());
+    layout->setSpacing(KDialog::spacingHint());
 
 
     TQLabel *label = new TQLabel(i18n("dictionary to not use","Do not use:"),this);
-    tqlayout->addWidget(label,0,0);
+    layout->addWidget(label,0,0);
 
     label = new TQLabel(i18n("dictionary to use","Use:"),this);
-    tqlayout->addWidget(label,0,2);
+    layout->addWidget(label,0,2);
 
     unselectedBox = new KListBox(this,"unselectedBox");
-    tqlayout->addWidget(unselectedBox,1,0);
+    layout->addWidget(unselectedBox,1,0);
 
 
     TQVBoxLayout *bLayout = new TQVBoxLayout();
@@ -74,10 +74,10 @@ DictChooser::DictChooser(KBabelDictBox*b, TQStringList selected
     unselectBtn->setEnabled(false);
     bLayout->addWidget(unselectBtn);
     bLayout->addStretch();
-    tqlayout->addLayout(bLayout,1,1);
+    layout->addLayout(bLayout,1,1);
 
     selectedBox = new KListBox(this,"selectedBox");
-    tqlayout->addWidget(selectedBox,1,2);
+    layout->addWidget(selectedBox,1,2);
 
 
     bLayout = new TQVBoxLayout();
@@ -90,7 +90,7 @@ DictChooser::DictChooser(KBabelDictBox*b, TQStringList selected
     configureBtn = new TQPushButton(i18n("Con&figure..."), this);
     bLayout->addWidget(configureBtn);
     bLayout->addStretch();
-    tqlayout->addLayout(bLayout,1,3);
+    layout->addLayout(bLayout,1,3);
 
 
     dictList.setAutoDelete(true);

kbabel/kbabeldict/kbabeldictbox.cpp

@@ -1410,7 +1410,7 @@ void KBabelDictBox::copy()
    }
    else
    {
-      TQClipboard *cb = KApplication::tqclipboard();
+      TQClipboard *cb = KApplication::clipboard();
       cb->setText(translation());
    }
 }

kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp

@@ -17,14 +17,14 @@
 PreferencesWidget::PreferencesWidget(TQWidget *parent, const char* name)
 		: PrefWidget(parent,name)
 {
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+	TQVBoxLayout *layout = new TQVBoxLayout(this);
 //	TQLabel *label = new TQLabel(i18n("Settings for KDE database search engine"),this);
-//	tqlayout->addWidget(label);
+//	layout->addWidget(label);
 
 	dbpw = new DBSearchEnginePref(this);
 	dbpw->dirInput->setMode(KFile::Directory | KFile::LocalOnly);
 	
-	tqlayout->addWidget(dbpw);
+	layout->addWidget(dbpw);
 	resize(TQSize(200,200).expandedTo(minimumSizeHint()));
 
 //    connect(dbpw->browseTB_3,TQT_SIGNAL(clicked()),TQT_SLOT(browse1()));

kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp

@@ -18,14 +18,14 @@
 KDB2PreferencesWidget::KDB2PreferencesWidget(TQWidget *parent, const char* name)
 		: PrefWidget(parent,name) 
 {
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+	TQVBoxLayout *layout = new TQVBoxLayout(this);
 //	TQLabel *label = new TQLabel(i18n("Settings for KDE Database Search Engine"),this);
-//	tqlayout->addWidget(label);
+//	layout->addWidget(label);
 
 	dbpw = new DBSearchEnginePrefWidget(this);
 	dbpw->dbDirectory->setMode(KFile::Directory | KFile::LocalOnly);
 	dbpw->show();	
-	tqlayout->addWidget(dbpw);
+	layout->addWidget(dbpw);
 	setMinimumSize(300,300);
 
 	standard();

kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp

@@ -47,10 +47,10 @@ AuxiliaryPreferencesWidget::AuxiliaryPreferencesWidget(TQWidget *parent, const c
         : PrefWidget(parent,name)
         , changed(false)
 {
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+    TQVBoxLayout *layout = new TQVBoxLayout(this);
         
     prefWidget = new PWidget(this);
-    tqlayout->addWidget(prefWidget);
+    layout->addWidget(prefWidget);
 
 
     connect(prefWidget->urlInput->lineEdit(),TQT_SIGNAL(textChanged(const TQString&))

kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp

@@ -48,10 +48,10 @@ CompendiumPreferencesWidget::CompendiumPreferencesWidget(TQWidget *parent, const
 		: PrefWidget(parent,name)
 		, changed(false)
 {
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+	TQVBoxLayout *layout = new TQVBoxLayout(this);
 		
 	prefWidget = new CompendiumPWidget(this);
-	tqlayout->addWidget(prefWidget);
+	layout->addWidget(prefWidget);
 
 	connect(prefWidget->caseBtn, TQT_SIGNAL(toggled(bool))
 					, this, TQT_SLOT(setChanged()));

kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp

@@ -50,10 +50,10 @@ TmxCompendiumPreferencesWidget::TmxCompendiumPreferencesWidget(TQWidget *parent,
 		: PrefWidget(parent,name)
 		, changed(false)
 {
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+	TQVBoxLayout *layout = new TQVBoxLayout(this);
 		
 	prefWidget = new TmxCompendiumPWidget(this);
-	tqlayout->addWidget(prefWidget);
+	layout->addWidget(prefWidget);
 
 	connect(prefWidget->caseBtn, TQT_SIGNAL(toggled(bool))
 					, this, TQT_SLOT(setChanged()));

kbugbuster/gui/centralwidget.cpp

@@ -52,7 +52,7 @@ CentralWidget::CentralWidget( const TQCString &initialPackage,
                               const char * name )
   : TQWidget( parent, name )
 {
-    // Master tqlayout
+    // Master layout
     ( new TQVBoxLayout( this, 0,
                        KDialog::spacingHint() ) )->setAutoAdd( true );
 

kbugbuster/gui/cwbugdetails.cpp

@@ -53,7 +53,7 @@ CWBugDetails::~CWBugDetails()
 
 void CWBugDetails::setBug( const Bug &bug, const BugDetails &details )
 {
-    TQColorGroup cg = m_bugDesc->view()->tqpalette().active();
+    TQColorGroup cg = m_bugDesc->view()->palette().active();
     TQString text =
         "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">\n"
         "<html><head><title></title></head>\n"

kbugbuster/gui/cwloadingwidget.h

@@ -37,7 +37,7 @@ class CWLoadingWidget : public TQFrame
 
 public:
     /**
-     * Use WidgetMode to specify the tqlayout for the background images
+     * Use WidgetMode to specify the layout for the background images
      * TopFrame loads and uses the logo and horizontal bars,
      * BottomFrame loads the tools and the translucent block.
      */

kbugbuster/gui/msginputdialog.cpp

@@ -51,23 +51,23 @@ MsgInputDialog::MsgInputDialog(MsgInputDialog::MessageType type, const Bug &bug,
 
   if ( mType == Reply ) {
     TQWidget *r = new TQWidget( w );
-    TQHBoxLayout* rtqlayout = new TQHBoxLayout( r );
+    TQHBoxLayout* rlayout = new TQHBoxLayout( r );
 
     TQLabel *rlabel = new TQLabel( i18n("&Recipient:"),r );
     TQFont f = r->font();
     f.setBold( true );
     r->setFont( f );
-    rtqlayout->add( rlabel );
+    rlayout->add( rlabel );
 
     mRecipient = new TQComboBox( r );
     mRecipient->insertItem( i18n("Normal (bugs.kde.org & Maintainer & kde-bugs-dist)"), BugCommand::Normal );
     mRecipient->insertItem( i18n("Maintonly (bugs.kde.org & Maintainer)"), BugCommand::Maintonly );
     mRecipient->insertItem( i18n("Quiet (bugs.kde.org only)"), BugCommand::Quiet );
     rlabel->setBuddy( mRecipient );
-    rtqlayout->add( mRecipient );
+    rlayout->add( mRecipient );
 
     TQSpacerItem *rspacer= new TQSpacerItem( 1,1,TQSizePolicy::Expanding );
-    rtqlayout->addItem( rspacer );
+    rlayout->addItem( rspacer );
 
     // Reply currently only replies to the bug tracking system
     r->hide();

kbugbuster/gui/preferencesdialog.cpp

@@ -79,15 +79,15 @@ void PreferencesDialog::setupServerPage()
   TQFrame *topFrame = addPage( i18n("Servers"), 0,
                                 DesktopIcon( "gohome", KIcon::SizeMedium ) );
 
-  TQBoxLayout *tqlayout = new TQVBoxLayout( topFrame );
+  TQBoxLayout *layout = new TQVBoxLayout( topFrame );
-  tqlayout->setSpacing( spacingHint() );
+  layout->setSpacing( spacingHint() );
 
   mServerList = new ServerListView( topFrame );
-  tqlayout->addWidget( mServerList );
+  layout->addWidget( mServerList );
 
   TQHBox *buttonBox = new TQHBox( topFrame );
   buttonBox->setSpacing( spacingHint() );
-  tqlayout->addWidget( buttonBox );
+  layout->addWidget( buttonBox );
 
   TQPushButton *addButton = new TQPushButton( i18n("Add Server..."), buttonBox );
   connect( addButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addServer() ) );
@@ -100,7 +100,7 @@ void PreferencesDialog::setupServerPage()
 
   TQPushButton *button = new TQPushButton( i18n("Select Server From List..."),
                                          topFrame );
-  tqlayout->addWidget( button );
+  layout->addWidget( button );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( selectServer() ) );
   connect( mServerList, TQT_SIGNAL( doubleClicked ( TQListViewItem *)), this, TQT_SLOT( editServer()));
 }
@@ -110,34 +110,34 @@ void PreferencesDialog::setupAdvancedPage()
   TQFrame *topFrame = addPage( i18n("Advanced"), 0,
                                 DesktopIcon( "misc", KIcon::SizeMedium ) );
 
-  TQBoxLayout *tqlayout = new TQVBoxLayout( topFrame );
+  TQBoxLayout *layout = new TQVBoxLayout( topFrame );
-  tqlayout->setSpacing( spacingHint() );
+  layout->setSpacing( spacingHint() );
 
   TQButtonGroup *mailGroup = new TQButtonGroup( 1,Qt::Horizontal,
                                               i18n( "Mail Client" ), topFrame );
-  tqlayout->addWidget( mailGroup );
+  layout->addWidget( mailGroup );
 
   mKMailButton = new TQRadioButton( i18n( "&KMail" ), mailGroup );
   mDirectButton = new TQRadioButton( i18n( "D&irect" ), mailGroup );
   mSendmailButton = new TQRadioButton( i18n( "&Sendmail" ), mailGroup );
 
   mShowClosedCheckBox = new TQCheckBox( i18n( "Show closed bugs" ), topFrame );
-  tqlayout->addWidget( mShowClosedCheckBox );
+  layout->addWidget( mShowClosedCheckBox );
 
   mShowWishesCheckBox = new TQCheckBox( i18n( "Show wishes" ), topFrame );
-  tqlayout->addWidget( mShowWishesCheckBox );
+  layout->addWidget( mShowWishesCheckBox );
 
   mShowVotedCheckBox = new TQCheckBox(  i18n( "Show bugs with number of votes greater than:" ), topFrame );
-  tqlayout->addWidget( mShowVotedCheckBox );
+  layout->addWidget( mShowVotedCheckBox );
 
   mMinVotesInput = new KIntNumInput( topFrame );
   mMinVotesInput->setMinValue( 0 );
   connect( mShowVotedCheckBox, TQT_SIGNAL(toggled(bool)),
            mMinVotesInput, TQT_SLOT(setEnabled(bool)) );
-  tqlayout->addWidget( mMinVotesInput );
+  layout->addWidget( mMinVotesInput );
 
   mSendBccCheckBox = new TQCheckBox( i18n( "Send BCC to myself" ), topFrame );
-  tqlayout->addWidget( mSendBccCheckBox );
+  layout->addWidget( mSendBccCheckBox );
 }
 
 void PreferencesDialog::setDefaults()

kcachegrind/kcachegrind/callgraphview.cpp

@@ -376,7 +376,7 @@ TQString GraphOptions::layoutString(Layout l)
     return TQString("TopDown");
 }
 
-GraphOptions::Layout GraphOptions::tqlayout(TQString s)
+GraphOptions::Layout GraphOptions::layout(TQString s)
 {
     if (s == TQString("Circular")) return Circular;
     if (s == TQString("LeftRight")) return LeftRight;
@@ -562,10 +562,10 @@ void GraphExporter::writeDot()
 
   *stream << "digraph \"callgraph\" {\n";
 
-  if (_go->tqlayout() == LeftRight) {
+  if (_go->layout() == LeftRight) {
       *stream << TQString("  rankdir=LR;\n");
   }
-  else if (_go->tqlayout() == Circular) {
+  else if (_go->layout() == Circular) {
     TraceFunction *f = 0;
     switch(_item->type()) {
     case TraceItem::Function:
@@ -1095,7 +1095,7 @@ void CanvasNode::drawShape(TQPainter& p)
   r.setRect(r.x()+2, r.y()+2, r.width()-4, r.height()-4);
 
   if (StoredDrawParams::selected() && _view->hasFocus()) {
-    _view->tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, r,
+    _view->style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, r,
 				  _view->colorGroup());
   }
 
@@ -1589,7 +1589,7 @@ void CallGraphView::keyPressEvent(TQKeyEvent* e)
 	TraceFunction* f = 0;
 	TraceCall* c = 0;
 
-	// rotate arrow key meaning for LeftRight tqlayout
+	// rotate arrow key meaning for LeftRight layout
 	int key = e->key();
 	if (_layout == LeftRight) {
 	    switch(key) {
@@ -2701,7 +2701,7 @@ void CallGraphView::readViewConfig(KConfig* c,
     _clusterGroups   = g->readBoolEntry("ClusterGroups",
 					DEFAULT_CLUSTERGROUPS);
     _detailLevel     = g->readNumEntry("DetailLevel", DEFAULT_DETAILLEVEL);
-    _layout          = GraphOptions::tqlayout(g->readEntry("Layout",
+    _layout          = GraphOptions::layout(g->readEntry("Layout",
 					   layoutString(DEFAULT_LAYOUT)));
     _zoomPosition    = zoomPos(g->readEntry("ZoomPosition",
 					    zoomPosString(DEFAULT_ZOOMPOS)));

kcachegrind/kcachegrind/callgraphview.h

@@ -167,10 +167,10 @@ class GraphOptions
     virtual bool expandCycles() = 0;
     virtual bool clusterGroups() = 0;
     virtual int detailLevel() = 0;
-    virtual Layout tqlayout() = 0;
+    virtual Layout layout() = 0;
 
     static TQString layoutString(Layout);
-    static Layout tqlayout(TQString);
+    static Layout layout(TQString);
 };
 
 /* Graph Options Storage */
@@ -188,7 +188,7 @@ class StorableGraphOptions: public GraphOptions
     virtual bool expandCycles() { return _expandCycles; }
     virtual bool clusterGroups() { return _clusterGroups; }
     virtual int detailLevel() { return _detailLevel; }
-    virtual Layout tqlayout() { return _layout; }
+    virtual Layout layout() { return _layout; }
 
     // setters
     void setMaxCallerDepth(int d) { _maxCallerDepth = d; }

kcachegrind/kcachegrind/configdlgbase.ui

@@ -42,7 +42,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout10</cstring>
+                            <cstring>layout10</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -381,7 +381,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout8</cstring>
+                            <cstring>layout8</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -425,7 +425,7 @@
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout11</cstring>
+                            <cstring>layout11</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -469,7 +469,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="0" column="2">
                                 <property name="name">
-                                    <cstring>tqlayout10</cstring>
+                                    <cstring>layout10</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">

kcachegrind/kcachegrind/dumpselectionbase.ui

@@ -477,7 +477,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout3</cstring>
+                                <cstring>layout3</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -586,7 +586,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout7</cstring>
+                                <cstring>layout7</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -642,7 +642,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout2</cstring>
+                                <cstring>layout2</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -868,7 +868,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout4</cstring>
+                                <cstring>layout4</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -962,7 +962,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout6</cstring>
+                                <cstring>layout6</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -1031,7 +1031,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout6</cstring>
+                                <cstring>layout6</cstring>
                             </property>
                             <hbox>
                                 <property name="name">

kcachegrind/kcachegrind/functionselectionbase.ui

@@ -27,7 +27,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">

kcachegrind/kcachegrind/toplevel.cpp

@@ -452,14 +452,14 @@ void TopLevel::createLayoutActions()
                         TQT_TQOBJECT(this), TQT_SLOT(layoutDuplicate()),
                         actionCollection(), "layout_duplicate" );
   hint = i18n("<b>Duplicate Current Layout</b>"
-              "<p>Make a copy of the current tqlayout.</p>");
+              "<p>Make a copy of the current layout.</p>");
   action->setWhatsThis( hint );
 
   action = new KAction( i18n( "&Remove" ), KShortcut(),
                         TQT_TQOBJECT(this), TQT_SLOT(layoutRemove()),
                         actionCollection(), "layout_remove" );
   hint = i18n("<b>Remove Current Layout</b>"
-              "<p>Delete current tqlayout and make the previous active.</p>");
+              "<p>Delete current layout and make the previous active.</p>");
   action->setWhatsThis( hint );
 
   action = new KAction( i18n( "&Go to Next" ),

kcachegrind/kcachegrind/treemap.cpp

@@ -2178,7 +2178,7 @@ void TreeMapWidget::drawTreeMap()
 
   if (hasFocus()) {
     TQPainter p(this);
-    tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p,
+    style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p,
                            TQRect(0, 0, TQWidget::width(), TQWidget::height()),
                            colorGroup() );
   }

kcachegrind/kcachegrind/treemap.h

@@ -379,7 +379,7 @@ private:
   int _sortTextNo;
   bool _sortAscending;
 
-  // temporary tqlayout
+  // temporary layout
   TQRect _rect;
   TQPtrList<TQRect>* _freeRects;
   int _depth;

kioslave/svn/ksvnd/commitdlg.ui

@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -42,7 +42,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">

kioslave/svn/svnhelper/subversioncheckout.ui

@@ -32,7 +32,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout8</cstring>
+                <cstring>layout8</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -131,7 +131,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>tqlayout4</cstring>
+                        <cstring>layout4</cstring>
                     </property>
                     <hbox>
                         <property name="name">

kioslave/svn/svnhelper/subversionswitch.ui

@@ -32,7 +32,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout8</cstring>
+                <cstring>layout8</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -131,7 +131,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>tqlayout4</cstring>
+                        <cstring>layout4</cstring>
                     </property>
                     <hbox>
                         <property name="name">

kompare/komparepart/kompareconnectwidget.cpp

@@ -68,7 +68,7 @@ KompareConnectWidgetFrame::~KompareConnectWidgetFrame()
 
 TQSize KompareConnectWidgetFrame::sizeHint() const
 {
-	return TQSize(50, tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent ) );
+	return TQSize(50, style().pixelMetric( TQStyle::PM_ScrollBarExtent ) );
 }
 
 static int kMouseOffset;

kompare/komparepart/komparesplitter.cpp

@@ -44,20 +44,20 @@ KompareSplitter::KompareSplitter( ViewSettings *settings, TQWidget * parent,
 
 	// Set up the scrollFrame
 	scrollFrame->setFrameStyle( TQFrame::NoFrame | TQFrame::Plain );
-	scrollFrame->setLineWidth(scrollFrame->tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth));
+	scrollFrame->setLineWidth(scrollFrame->style().pixelMetric(TQStyle::PM_DefaultFrameWidth));
-	TQGridLayout *pairtqlayout = new TQGridLayout(scrollFrame, 2, 2, 0);
+	TQGridLayout *pairlayout = new TQGridLayout(scrollFrame, 2, 2, 0);
 	m_vScroll = new TQScrollBar( Qt::Vertical, scrollFrame );
-	pairtqlayout->addWidget( m_vScroll, 0, 1 );
+	pairlayout->addWidget( m_vScroll, 0, 1 );
 	m_hScroll = new TQScrollBar( Qt::Horizontal, scrollFrame );
-	pairtqlayout->addWidget( m_hScroll, 1, 0 );
+	pairlayout->addWidget( m_hScroll, 1, 0 );
 
 	new KompareListViewFrame(true, m_settings, this, "source");
 	new KompareListViewFrame(false, m_settings, this, "destination");
-	pairtqlayout->addWidget( this, 0, 0 );
+	pairlayout->addWidget( this, 0, 0 );
 
 	// set up our looks
 	setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
-	setLineWidth( tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) );
+	setLineWidth( style().pixelMetric( TQStyle::PM_DefaultFrameWidth ) );
 
 	setHandleWidth(50);
 	setChildrenCollapsible( false );

kompare/libdialogpages/diffpage.cpp

@@ -203,19 +203,19 @@ void DiffPage::slotExcludeFileToggled( bool on )
 void DiffPage::addDiffTab()
 {
 	TQWidget* page   = new TQWidget( this );
-	TQVBoxLayout* tqlayout = new TQVBoxLayout( page );
+	TQVBoxLayout* layout = new TQVBoxLayout( page );
-	tqlayout->setSpacing( KDialog::spacingHint() );
+	layout->setSpacing( KDialog::spacingHint() );
-	tqlayout->setMargin( KDialog::marginHint() );
+	layout->setMargin( KDialog::marginHint() );
 
 	// add diff program selector
 	m_diffProgramGroup = new TQVButtonGroup( i18n( "Diff Program" ), page );
-	tqlayout->addWidget( m_diffProgramGroup );
+	layout->addWidget( m_diffProgramGroup );
 	m_diffProgramGroup->setMargin( KDialog::marginHint() );
 
 	m_diffURLRequester = new KURLRequester( m_diffProgramGroup, "diffURLRequester" );
 	TQWhatsThis::add( m_diffURLRequester, i18n( "You can select a different diff program here. On Solaris the standard diff program does not support all the options that the GNU version does. This way you can select that version." ) );
 
-	tqlayout->addStretch( 1 );
+	layout->addStretch( 1 );
 	page->setMinimumSize( sizeHintForWidget( page ) );
 
 	addTab( page, i18n( "&Diff" ) );
@@ -224,14 +224,14 @@ void DiffPage::addDiffTab()
 void DiffPage::addFormatTab()
 {
 	TQWidget* page   = new TQWidget( this );
-	TQVBoxLayout* tqlayout = new TQVBoxLayout( page );
+	TQVBoxLayout* layout = new TQVBoxLayout( page );
-	tqlayout->setSpacing( KDialog::spacingHint() );
+	layout->setSpacing( KDialog::spacingHint() );
-	tqlayout->setMargin( KDialog::marginHint() );
+	layout->setMargin( KDialog::marginHint() );
 
 	// add diff modes
 	m_modeButtonGroup = new TQVButtonGroup( i18n( "Output Format" ), page );
 	TQWhatsThis::add( m_modeButtonGroup, i18n( "Select the format of the output generated by diff. Unified is the one that is used most frequently because it is very readable. The KDE developers like this format the best so use it for sending patches." ) );
-	tqlayout->addWidget( m_modeButtonGroup );
+	layout->addWidget( m_modeButtonGroup );
 	m_modeButtonGroup->setMargin( KDialog::marginHint() );
 
 	TQRadioButton* radioButton;
@@ -245,7 +245,7 @@ void DiffPage::addFormatTab()
 
 	// #lines of context (loc)
 	TQHGroupBox* groupBox = new TQHGroupBox( i18n( "Lines of Context" ), page );
-	tqlayout->addWidget( groupBox );
+	layout->addWidget( groupBox );
 	groupBox->setMargin( KDialog::marginHint() );
 
 	TQLabel* label = new TQLabel( i18n( "Number of context lines:" ), groupBox );
@@ -253,7 +253,7 @@ void DiffPage::addFormatTab()
 	TQWhatsThis::add( m_locSpinBox, i18n( "The number of context lines is normally 2 or 3. This makes the diff readable and applicable in most cases. More than 3 lines will only bloat the diff unnecessarily." ) );
 	label->setBuddy( m_locSpinBox );
 
-	tqlayout->addStretch( 1 );
+	layout->addStretch( 1 );
 	page->setMinimumSize( sizeHintForWidget( page ) );
 
 	addTab( page, i18n( "&Format" ) );
@@ -262,13 +262,13 @@ void DiffPage::addFormatTab()
 void DiffPage::addOptionsTab()
 {
 	TQWidget* page   = new TQWidget( this );
-	TQVBoxLayout* tqlayout = new TQVBoxLayout( page );
+	TQVBoxLayout* layout = new TQVBoxLayout( page );
-	tqlayout->setSpacing( KDialog::spacingHint() );
+	layout->setSpacing( KDialog::spacingHint() );
-	tqlayout->setMargin( KDialog::marginHint() );
+	layout->setMargin( KDialog::marginHint() );
 
 	// add diff options
 	TQVButtonGroup* optionButtonGroup     = new TQVButtonGroup( i18n( "General" ), page );
-	tqlayout->addWidget( optionButtonGroup );
+	layout->addWidget( optionButtonGroup );
 	optionButtonGroup->setMargin( KDialog::marginHint() );
 
 	m_smallerCheckBox     = new TQCheckBox( i18n( "&Look for smaller changes" ), optionButtonGroup );
@@ -278,7 +278,7 @@ void DiffPage::addOptionsTab()
 	m_caseCheckBox        = new TQCheckBox( i18n( "&Ignore changes in case" ), optionButtonGroup );
 	TQToolTip::add( m_caseCheckBox, i18n( "This corresponds to the -i diff option." ) );
 
-	TQHBoxLayout* groupLayout = new TQHBoxLayout( tqlayout, -1, "regexp_horizontal_layout" );
+	TQHBoxLayout* groupLayout = new TQHBoxLayout( layout, -1, "regexp_horizontal_layout" );
 	groupLayout->setMargin( KDialog::marginHint() );
 
 	m_ignoreRegExpCheckBox = new TQCheckBox( i18n( "Ignore regexp:" ), page );
@@ -298,7 +298,7 @@ void DiffPage::addOptionsTab()
 	}
 
 	TQVButtonGroup* moreOptionButtonGroup = new TQVButtonGroup( i18n( "Whitespace" ), page );
-	tqlayout->addWidget( moreOptionButtonGroup );
+	layout->addWidget( moreOptionButtonGroup );
 	moreOptionButtonGroup->setMargin( KDialog::marginHint() );
 
 	m_tabsCheckBox        = new TQCheckBox( i18n( "E&xpand tabs to spaces in output" ), moreOptionButtonGroup );
@@ -312,7 +312,7 @@ void DiffPage::addOptionsTab()
 	m_ignoreTabExpansionCheckBox = new TQCheckBox( i18n( "Igno&re changes due to tab expansion" ), moreOptionButtonGroup );
 	TQToolTip::add( m_ignoreTabExpansionCheckBox, i18n( "This option corresponds to the -E diff option." ) );
 
-	tqlayout->addStretch( 1 );
+	layout->addStretch( 1 );
 	page->setMinimumSize( sizeHintForWidget( page ) );
 
 	addTab( page, i18n( "O&ptions" ) );
@@ -321,16 +321,16 @@ void DiffPage::addOptionsTab()
 void DiffPage::addExcludeTab()
 {
 	TQWidget* page = new TQWidget( this );
-	TQVBoxLayout* tqlayout = new TQVBoxLayout( page );
+	TQVBoxLayout* layout = new TQVBoxLayout( page );
-	tqlayout->setSpacing( KDialog::spacingHint() );
+	layout->setSpacing( KDialog::spacingHint() );
-	tqlayout->setMargin( KDialog::marginHint() );
+	layout->setMargin( KDialog::marginHint() );
 
 	TQHGroupBox* excludeFilePatternGroupBox = new TQHGroupBox( i18n( "File Pattern to Exclude" ), page );
 	m_excludeFilePatternCheckBox = new TQCheckBox( "", excludeFilePatternGroupBox );
 	TQToolTip::add( m_excludeFilePatternCheckBox, i18n( "If this is checked you can enter a shell pattern in the text box on the right or select entries from the list." ) );
 	m_excludeFilePatternEditListBox = new KEditListBox( excludeFilePatternGroupBox, "exclude_file_pattern_editlistbox", false, KEditListBox::Add|KEditListBox::Remove );
 	TQToolTip::add( m_excludeFilePatternEditListBox, i18n( "Here you can enter or remove a shell pattern or select one or more entries from the list." ) );
-	tqlayout->addWidget( excludeFilePatternGroupBox );
+	layout->addWidget( excludeFilePatternGroupBox );
 
 
 	connect( m_excludeFilePatternCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotExcludeFilePatternToggled(bool)));
@@ -342,11 +342,11 @@ void DiffPage::addExcludeTab()
 	TQToolTip::add( m_excludeFileURLComboBox, i18n( "Here you can enter the URL of a file with shell patterns to ignore during the comparison of the folders." ) );
 	m_excludeFileURLRequester = new KURLRequester( m_excludeFileURLComboBox, excludeFileNameGroupBox, "exclude_file_name_urlrequester" );
 	TQToolTip::add( m_excludeFileURLRequester, i18n( "Any file you select in the dialog that pops up when you click it will be put in the dialog to the left of this button." ) );
-	tqlayout->addWidget( excludeFileNameGroupBox );
+	layout->addWidget( excludeFileNameGroupBox );
 
 	connect( m_excludeFileCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotExcludeFileToggled(bool)));
 
-	tqlayout->addStretch( 1 );
+	layout->addStretch( 1 );
 	page->setMinimumSize( sizeHintForWidget( page ) );
 
 	addTab( page, i18n( "&Exclude" ) );

kompare/libdialogpages/filespage.cpp

@@ -34,9 +34,9 @@
 FilesPage::FilesPage( TQWidget* parent ) : PageBase( parent ), m_URLChanged( false )
 {
 	TQWidget* page = new TQWidget( this );
-	TQVBoxLayout* tqlayout = new TQVBoxLayout( page );
+	TQVBoxLayout* layout = new TQVBoxLayout( page );
-	tqlayout->setSpacing( KDialog::spacingHint() );
+	layout->setSpacing( KDialog::spacingHint() );
-	tqlayout->setMargin( KDialog::marginHint() );
+	layout->setMargin( KDialog::marginHint() );
 
 	m_firstGB = new TQGroupBox( 1, Qt::Vertical, "You have to set this moron :)", page );
 	m_firstURLComboBox = new KURLComboBox( KURLComboBox::Both, true, m_firstGB, "SourceURLComboBox" );
@@ -54,11 +54,11 @@ FilesPage::FilesPage( TQWidget* parent ) : PageBase( parent ), m_URLChanged( fal
 	m_encodingComboBox = new TQComboBox( false, m_thirdGB, "encoding_combobox" );
 	m_encodingComboBox->insertStringList( KGlobal::charsets()->availableEncodingNames() );
 
-	tqlayout->addWidget( m_firstGB );
+	layout->addWidget( m_firstGB );
-	tqlayout->addWidget( m_secondGB );
+	layout->addWidget( m_secondGB );
-	tqlayout->addWidget( m_thirdGB );
+	layout->addWidget( m_thirdGB );
 
-	tqlayout->addStretch( 1 );
+	layout->addStretch( 1 );
 	page->setMinimumSize( sizeHintForWidget( page ) );
 
 	addTab( page, i18n( "&Files" ) );

kompare/libdialogpages/pagebase.cpp

@@ -38,7 +38,7 @@ TQSize PageBase::sizeHintForWidget( TQWidget* widget )
 	//
 	// The size is computed by adding the sizeHint().height() of all
 	// widget children and taking the width of the widest child and adding
-	// tqlayout()->margin() and tqlayout()->spacing()
+	// layout()->margin() and layout()->spacing()
 	//
 
 	// this code in this method has been ripped out of a file in kbabel
@@ -73,7 +73,7 @@ TQSize PageBase::sizeHintForWidget( TQWidget* widget )
 	if( numChild > 0 )
 	{
 		size.setHeight( size.height() + widget->tqlayout()->spacing()*(numChild-1) );
-		size += TQSize( widget->tqlayout()->margin()*2, widget->tqlayout()->margin()*2 + 1 );
+		size += TQSize( widget->layout()->margin()*2, widget->layout()->margin()*2 + 1 );
 	}
 	else
 	{

kompare/libdialogpages/viewpage.cpp

@@ -36,20 +36,20 @@
 ViewPage::ViewPage( TQWidget* parent ) : PageBase( parent )
 {
 	TQWidget*     page;
-	TQVBoxLayout* tqlayout;
+	TQVBoxLayout* layout;
 	TQGroupBox*   colorGroupBox;
 	TQHGroupBox*  snolGroupBox;
 	TQHGroupBox*  tabGroupBox;
 	TQLabel*      label;
 
 	page   = new TQWidget( this );
-	tqlayout = new TQVBoxLayout( page );
+	layout = new TQVBoxLayout( page );
-	tqlayout->setSpacing( KDialog::spacingHint() );
+	layout->setSpacing( KDialog::spacingHint() );
-	tqlayout->setMargin( KDialog::marginHint() );
+	layout->setMargin( KDialog::marginHint() );
 
 	// add a groupbox
 	colorGroupBox = new TQGroupBox( 2, Qt::Horizontal, i18n( "Colors" ), page );
-	tqlayout->addWidget( colorGroupBox );
+	layout->addWidget( colorGroupBox );
 	colorGroupBox->setMargin( KDialog::marginHint() );
 
 	// add the removeColor
@@ -74,7 +74,7 @@ ViewPage::ViewPage( TQWidget* parent ) : PageBase( parent )
 
 	// scroll number of lines (snol)
 	snolGroupBox = new TQHGroupBox( i18n( "Mouse Wheel" ), page );
-	tqlayout->addWidget( snolGroupBox );
+	layout->addWidget( snolGroupBox );
 	snolGroupBox->setMargin( KDialog::marginHint() );
 
 	label            = new TQLabel( i18n( "Number of lines:" ), snolGroupBox );
@@ -84,25 +84,25 @@ ViewPage::ViewPage( TQWidget* parent ) : PageBase( parent )
 	// Temporarily here for testing...
 	// number of spaces for a tab character stuff
 	tabGroupBox = new TQHGroupBox( i18n( "Tabs to Spaces" ), page );
-	tqlayout->addWidget( tabGroupBox );
+	layout->addWidget( tabGroupBox );
 	tabGroupBox->setMargin( KDialog::marginHint() );
 
 	label = new TQLabel( i18n( "Number of spaces to convert a tab character to:" ), tabGroupBox );
 	m_tabSpinBox = new TQSpinBox( 1, 16, 1, tabGroupBox );
 	label->setBuddy( m_tabSpinBox );
 
-	tqlayout->addStretch( 1 );
+	layout->addStretch( 1 );
 	page->setMinimumSize( sizeHintForWidget( page ) );
 
 	addTab( page, i18n( "A&ppearance" ) );
 
 	page   = new TQWidget( this );
-	tqlayout = new TQVBoxLayout( page );
+	layout = new TQVBoxLayout( page );
-	tqlayout->setSpacing( KDialog::spacingHint() );
+	layout->setSpacing( KDialog::spacingHint() );
-	tqlayout->setMargin( KDialog::marginHint() );
+	layout->setMargin( KDialog::marginHint() );
 
 	TQHGroupBox* gb = new TQHGroupBox( i18n( "Text Font" ), page );
-	tqlayout->addWidget( gb );
+	layout->addWidget( gb );
 	gb->setMargin( KDialog::marginHint() );
 
 	label = new TQLabel( i18n( "Font:" ), gb );
@@ -113,7 +113,7 @@ ViewPage::ViewPage( TQWidget* parent ) : PageBase( parent )
 	m_fontSizeSpinBox = new TQSpinBox( 6, 24, 1, gb, "fontsize" );
 	label->setBuddy( m_fontSizeSpinBox );
 
-	tqlayout->addStretch( 1 );
+	layout->addStretch( 1 );
 	page->setMinimumSize( sizeHintForWidget( page ) );
 
 	addTab( page, i18n( "&Fonts" ) );

kompare/libdiff2/difference.h

@@ -130,7 +130,7 @@ public:
 protected:
 	void calculateHash()
 	{
-		unsigned short const* str = reinterpret_cast<unsigned short const*>( m_string.tqunicode() );
+		unsigned short const* str = reinterpret_cast<unsigned short const*>( m_string.unicode() );
 		const unsigned int len = m_string.length();
 
 		m_hash = 1315423911;

kompare/libdiff2/levenshteintable.cpp

@@ -113,8 +113,8 @@ unsigned int LevenshteinTable::createTable( DifferenceString* source, Difference
 	unsigned int m = s.length();
 	unsigned int n = d.length();
 
-	const TQChar* sq = s.tqunicode();
+	const TQChar* sq = s.unicode();
-	const TQChar* dq = d.tqunicode();
+	const TQChar* dq = d.unicode();
 
 	if ( m == 1 )
 		return --n;

kompare/tests/cvsdiff/context.diff

@@ -12,7 +12,7 @@ diff -c -r1.2 dcopfind.cpp
   
 ! bool findObject( const char* app, const char* obj, const char* func, int argc, char** args )
   {
-      QString f = func; // Qt is better with tqunicode strings, so use one.
+      QString f = func; // Qt is better with unicode strings, so use one.
       int left = f.find( '(' );
 --- 36,42 ----
   static bool bAppIdOnly = 0;
@@ -20,7 +20,7 @@ diff -c -r1.2 dcopfind.cpp
   
 ! bool findObject( const char* app, const char* obj, const char* func, QCStringList args )
   {
-      QString f = func; // Qt is better with tqunicode strings, so use one.
+      QString f = func; // Qt is better with unicode strings, so use one.
       int left = f.find( '(' );
 ***************
 *** 118,124 ****

kompare/tests/cvsdiff/contextm.diff

@@ -82,7 +82,7 @@ diff -c -r1.26 dcop.cpp
 ! void callFunction( const char* app, const char* obj, const char* func, int argc, char** args )
   {
 - 
-      QString f = func; // Qt is better with tqunicode strings, so use one.
+      QString f = func; // Qt is better with unicode strings, so use one.
       int left = f.find( '(' );
       int right = f.find( ')' );
 --- 146,153 ----
@@ -91,7 +91,7 @@ diff -c -r1.26 dcop.cpp
   
 ! void callFunction( const char* app, const char* obj, const char* func, const QCStringList args )
   {
-      QString f = func; // Qt is better with tqunicode strings, so use one.
+      QString f = func; // Qt is better with unicode strings, so use one.
       int left = f.find( '(' );
       int right = f.find( ')' );
 ***************
@@ -747,7 +747,7 @@ diff -c -r1.2 dcopfind.cpp
   
 ! bool findObject( const char* app, const char* obj, const char* func, int argc, char** args )
   {
-      QString f = func; // Qt is better with tqunicode strings, so use one.
+      QString f = func; // Qt is better with unicode strings, so use one.
       int left = f.find( '(' );
 --- 36,42 ----
   static bool bAppIdOnly = 0;
@@ -755,7 +755,7 @@ diff -c -r1.2 dcopfind.cpp
   
 ! bool findObject( const char* app, const char* obj, const char* func, QCStringList args )
   {
-      QString f = func; // Qt is better with tqunicode strings, so use one.
+      QString f = func; // Qt is better with unicode strings, so use one.
       int left = f.find( '(' );
 ***************
 *** 118,124 ****

kompare/tests/cvsdiff/unified.diff

@@ -12,7 +12,7 @@ diff -u -r1.2 dcopfind.cpp
 -bool findObject( const char* app, const char* obj, const char* func, int argc, char** args )
 +bool findObject( const char* app, const char* obj, const char* func, QCStringList args )
  {
-     QString f = func; // Qt is better with tqunicode strings, so use one.
+     QString f = func; // Qt is better with unicode strings, so use one.
      int left = f.find( '(' );
 @@ -118,7 +118,7 @@
  	f = fc;

kompare/tests/cvsdiff/unifiedm.diff

@@ -66,7 +66,7 @@ diff -u -r1.26 dcop.cpp
 +void callFunction( const char* app, const char* obj, const char* func, const QCStringList args )
  {
 -
-     QString f = func; // Qt is better with tqunicode strings, so use one.
+     QString f = func; // Qt is better with unicode strings, so use one.
      int left = f.find( '(' );
      int right = f.find( ')' );
 @@ -136,7 +163,7 @@
@@ -668,7 +668,7 @@ diff -u -r1.2 dcopfind.cpp
 -bool findObject( const char* app, const char* obj, const char* func, int argc, char** args )
 +bool findObject( const char* app, const char* obj, const char* func, QCStringList args )
  {
-     QString f = func; // Qt is better with tqunicode strings, so use one.
+     QString f = func; // Qt is better with unicode strings, so use one.
      int left = f.find( '(' );
 @@ -118,7 +118,7 @@
  	f = fc;

kompare/tests/diff/contextm.diff

@@ -78,7 +78,7 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp
 ! void callFunction( const char* app, const char* obj, const char* func, int argc, char** args )
   {
 - 
-      QString f = func; // Qt is better with tqunicode strings, so use one.
+      QString f = func; // Qt is better with unicode strings, so use one.
       int left = f.find( '(' );
       int right = f.find( ')' );
 --- 146,153 ----
@@ -87,7 +87,7 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp
   
 ! void callFunction( const char* app, const char* obj, const char* func, const QCStringList args )
   {
-      QString f = func; // Qt is better with tqunicode strings, so use one.
+      QString f = func; // Qt is better with unicode strings, so use one.
       int left = f.find( '(' );
       int right = f.find( ')' );
 ***************
@@ -737,7 +737,7 @@ diff -cr dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp
   
 ! bool findObject( const char* app, const char* obj, const char* func, int argc, char** args )
   {
-      QString f = func; // Qt is better with tqunicode strings, so use one.
+      QString f = func; // Qt is better with unicode strings, so use one.
       int left = f.find( '(' );
 --- 36,42 ----
   static bool bAppIdOnly = 0;
@@ -745,7 +745,7 @@ diff -cr dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp
   
 ! bool findObject( const char* app, const char* obj, const char* func, QCStringList args )
   {
-      QString f = func; // Qt is better with tqunicode strings, so use one.
+      QString f = func; // Qt is better with unicode strings, so use one.
       int left = f.find( '(' );
 ***************
 *** 118,124 ****

kompare/tests/diff/unifiedm.diff

@@ -62,7 +62,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp
 +void callFunction( const char* app, const char* obj, const char* func, const QCStringList args )
  {
 -
-     QString f = func; // Qt is better with tqunicode strings, so use one.
+     QString f = func; // Qt is better with unicode strings, so use one.
      int left = f.find( '(' );
      int right = f.find( ')' );
 @@ -136,7 +163,7 @@
@@ -659,7 +659,7 @@ diff -aur dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp
 -bool findObject( const char* app, const char* obj, const char* func, int argc, char** args )
 +bool findObject( const char* app, const char* obj, const char* func, QCStringList args )
  {
-     QString f = func; // Qt is better with tqunicode strings, so use one.
+     QString f = func; // Qt is better with unicode strings, so use one.
      int left = f.find( '(' );
 @@ -118,7 +118,7 @@
  	f = fc;

kspy/spy.cpp

@@ -47,10 +47,10 @@ extern "C"
 Spy::Spy( TQWidget *parent, const char *name )
   : TQWidget( parent, name )
 {
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 11, 6 );
+  TQVBoxLayout *layout = new TQVBoxLayout( this, 11, 6 );
 
   TQSplitter *div = new TQSplitter( this );
-  tqlayout->addWidget( div );
+  layout->addWidget( div );
 
   TQVBox *leftPane = new TQVBox( div );
 

kuiviewer/kuiviewer_part.cpp

@@ -205,7 +205,7 @@ void KUIViewerPart::slotGrab()
 	return;
     }
 
-    TQClipboard *clipboard = TQApplication::tqclipboard();
+    TQClipboard *clipboard = TQApplication::clipboard();
     clipboard->setPixmap(TQPixmap::grabWidget(m_widget));
 }
 

poxml/lauri.po

@@ -299,7 +299,7 @@ msgstr "Der schlimme Teil"
 msgid "Ending Text:"
 msgstr "Ende:"
 
-#. Tag: literaltqlayout
+#. Tag: literallayout
 #: lauri.xml:143
 #, no-c-format
 msgid ""

poxml/lauri.xml

@@ -165,7 +165,7 @@ editor.</action></para>
 <para>
   Ending Text:
 
-<literaltqlayout>
+<literallayout>
 Matthias Hoelzer
 KDE-Verein i.G.
 Account-Nr. 2798296
@@ -180,7 +180,7 @@ SWIFT-Address: BYLA DE 77
 print "$b4 /path/to/KDE/libs/libpng.a $af\n"; \
 you see it here
 whereever
-</literaltqlayout>
+</literallayout>
 </para>
 <para>
 <screen>

poxml/parser.cpp

@@ -44,7 +44,7 @@ static const char *cuttingtags[] = {"bridgehead", "trans_comment", "para", "titl
                                     "revdescription", "glossentry", "partinfo", 
 				    "segmentedlist", "segtitle", "seg", "seglistitem", "screenco",
                                     0};
-static const char *literaltags[] = {"literaltqlayout", "synopsis", "screen",
+static const char *literaltags[] = {"literallayout", "synopsis", "screen",
 				    "programlisting", 0};
 
 bool StructureParser::fatalError ( const TQXmlParseException &e )

scheck/scheck.cpp

@@ -729,7 +729,7 @@ static void renderViolations(const TQValueVector<StyleGuideViolation>& violation
 		// str.setLength() always does a deep copy, so the replacement code below is safe.
 		parStr.setLength( len );
 		// compatible behaviour to the old implementation. Replace tabs by spaces
-		TQChar *chr = (TQChar*)parStr.tqunicode();
+		TQChar *chr = (TQChar*)parStr.unicode();
 		int l = len;
 		while ( l-- )
 		{
@@ -894,7 +894,7 @@ StyleCheckStyle::~StyleCheckStyle()
 //We walk down the widget tree until we find something we render, and sic KAccelManager in programmer's mode on those
 void StyleCheckStyle::accelManageRecursive(TQWidget* widget)
 {
-	if (&widget->tqstyle() == this)
+	if (&widget->style() == this)
 	{
 		KAcceleratorManager::manage(widget, true);
 		return;
@@ -1058,7 +1058,7 @@ void StyleCheckStyle::drawPrimitive( PrimitiveElement pe,
 
 			if ( sunken )
 				kDrawBeButton( p, x, y, w, h, cg, true,
-						&cg.tqbrush(TQColorGroup::Mid) );
+						&cg.brush(TQColorGroup::Mid) );
 
 			else if ( flags & Style_MouseOver ) {
 				TQBrush brush(cg.button().light(110));
@@ -1071,7 +1071,7 @@ void StyleCheckStyle::drawPrimitive( PrimitiveElement pe,
 
 			else
 				kDrawBeButton(p, x, y, w, h, cg, false,
-							  &cg.tqbrush(TQColorGroup::Button));
+							  &cg.brush(TQColorGroup::Button));
 			break;
 		}
 

scripts/fixheaders

@@ -53,7 +53,7 @@ $lastdir = '.';
  'variable `class QFile \S*\' has initializer but incomplete type' => "qfile",
  'implicit declaration of function `int ICON\(\.\.\.\)' => "kiconloader",
  '`QMessageBox\' undeclared \(first use this function\)' => "qmessagebox",
- 'no matching function for call to `QBoxLayout::QBoxLayout' => "qtqlayout",
+ 'no matching function for call to `QBoxLayout::QBoxLayout' => "qlayout",
  '`QUriDrag\' undeclared \(first use this function\)' => "qdragobject",
  '`kdDebug\' undeclared \(first use this function\)' => "kdebug",
  '`kdWarning\' undeclared \(first use this function\)' => "kdebug",

scripts/kde-devel-gdb

@@ -25,7 +25,7 @@ define printqstringdata
     set $i=0
     set $d = (QStringData *)$arg0
     while $i < $d->len
-        printf "%c", (char)($d->tqunicode[$i++].ucs & 0xff)
+        printf "%c", (char)($d->unicode[$i++].ucs & 0xff)
     end
     printf "\n"
 end
@@ -57,7 +57,7 @@ define printqstring_utf8
    set $i=0
    set $s = $arg0
    while $i < $s.d->len
-     set $uc = (unsigned short) $s.d->tqunicode[$i++].ucs
+     set $uc = (unsigned short) $s.d->unicode[$i++].ucs
      if ( $uc < 0x80 )
        printf "%c", (unsigned char)($uc & 0x7f)
      else

umbrello/umbrello/autolayout/_graph.h

@@ -15,7 +15,7 @@
 #ifndef AUTOLAYOUTGRAPH_H
 #define AUTOLAYOUTGRAPH_H
 #include "baseinclude.h"
-namespace Autotqlayout {
+namespace Autolayout {
 
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>

umbrello/umbrello/autolayout/autolayoutdlg.cpp

@@ -99,10 +99,10 @@ void AutolayoutDlg::slotSaveSettings()
 }
 
 
-void AutolayoutDlg::slotDoAutotqlayout()
+void AutolayoutDlg::slotDoAutolayout()
 {
 
-    Autotqlayout::Autolayouter* a=getAutolayouter();;
+    Autolayout::Autolayouter* a=getAutolayouter();;
 
     a->setAssociationAsEdges( associationAsEdges);
     a->setAssociationWeight( associationWeight );
@@ -116,7 +116,7 @@ void AutolayoutDlg::slotDoAutotqlayout()
     a->setNoteConnectionWeight( 1);
     a->setNoteConnectionsAsEdges(true);
     a->setShapeSeparation( shapeSeparation);
-    a->autotqlayout( view);
+    a->autolayout( view);
     delete a;
     a=0;
     accept();
@@ -165,18 +165,18 @@ void AutolayoutDlg::slotSelectAlgorithm( const TQString& _algname)
 
 }
 
-Autotqlayout::Autolayouter * AutolayoutDlg::getAutolayouter( )
+Autolayout::Autolayouter * AutolayoutDlg::getAutolayouter( )
 {
     const TQString text = algorithmCOB->currentText();
-    kDebug() << "Autotqlayout Algorithm " << algname << " found " << text << endl;
+    kDebug() << "Autolayout Algorithm " << algname << " found " << text << endl;
     if (text == "dot")
-        return new Autotqlayout::DotAutolayouter();
+        return new Autolayout::DotAutolayouter();
     if (text == "circo")
-        return new Autotqlayout::CircoAutolayouter();
+        return new Autolayout::CircoAutolayouter();
     if (text ==  "neato")
-        return new Autotqlayout::NeatoAutolayouter();
+        return new Autolayout::NeatoAutolayouter();
-    kError() << "Autotqlayout Algorithm not found" << endl;
+    kError() << "Autolayout Algorithm not found" << endl;
-    return new Autotqlayout::DotAutolayouter();
+    return new Autolayout::DotAutolayouter();
 }
 
 

umbrello/umbrello/autolayout/autolayoutdlg.h

@@ -37,7 +37,7 @@ class AutolayoutDlg : public MyDialog1
     virtual void slotSetShapeSeparation(int i);
     virtual void slotReloadSettings();
     virtual void slotSaveSettings();
-    virtual void slotDoAutotqlayout();
+    virtual void slotDoAutolayout();
     void readConfig(KConfig*);
     void writeConfig(KConfig*);
     virtual void slotSelectAlgorithm(const TQString&);
@@ -57,7 +57,7 @@ class AutolayoutDlg : public MyDialog1
     int shapeSeparation;
     KConfig* config;
     TQString algname;
-    Autotqlayout::Autolayouter* getAutolayouter();
+    Autolayout::Autolayouter* getAutolayouter();
 
 };
 

umbrello/umbrello/autolayout/autolayouter.cpp

@@ -13,11 +13,11 @@
  ***************************************************************************/
 #include "autolayouter.h"
 
-namespace Autotqlayout {
+namespace Autolayout {
 
 
 
-void Autolayouter::autotqlayout( UMLView * v )
+void Autolayouter::autolayout( UMLView * v )
 {
     setCanvas(v);
     setGraph(v);
@@ -25,5 +25,5 @@ void Autolayouter::autotqlayout( UMLView * v )
     updateView(v);
 }
 
-}  // end namespace Autotqlayout
+}  // end namespace Autolayout
 

umbrello/umbrello/autolayout/autolayouter.h

@@ -13,10 +13,10 @@
 #define AUTOLAYOUTAUTOLAYOUTER_H
 #include "baseinclude.h"
 
-namespace Autotqlayout {
+namespace Autolayout {
 
 /**
-This is the super class of any class which encapsulate an autotqlayout algorithm
+This is the super class of any class which encapsulate an autolayout algorithm
 
 
 @author Dimitri Ognibene <ognibened @yahoo.it>
@@ -47,14 +47,14 @@ public:
 
     virtual void setShapeSeparation(int i)=0;
 
-    virtual void autotqlayout(UMLView* v);
+    virtual void autolayout(UMLView* v);
 protected:
     virtual void run()=0;
     virtual void updateView(UMLView*)=0;
-    virtual Autotqlayout::Canvas* getCanvas()=0;
+    virtual Autolayout::Canvas* getCanvas()=0;
-    virtual Autotqlayout::Graph* getGraph()=0;
+    virtual Autolayout::Graph* getGraph()=0;
-    virtual Autotqlayout::Graph* setGraph(UMLView* view)=0;
+    virtual Autolayout::Graph* setGraph(UMLView* view)=0;
-    virtual Autotqlayout::Canvas* setCanvas(UMLView* view)=0;
+    virtual Autolayout::Canvas* setCanvas(UMLView* view)=0;
 
 
 };

umbrello/umbrello/autolayout/autolayouteradapter.cpp

@@ -12,18 +12,18 @@
 #include "autolayouteradapter.h"
 
 
-namespace Autotqlayout
+namespace Autolayout
   {
 
   AutolayouterAdapter::AutolayouterAdapter()
-      : Autotqlayout::Autolayouter()
+      : Autolayout::Autolayouter()
     {}
 
 
   AutolayouterAdapter::~AutolayouterAdapter()
   {}}
 
-void Autotqlayout::AutolayouterAdapter::addRelationship( AssociationWidget * a )
+void Autolayout::AutolayouterAdapter::addRelationship( AssociationWidget * a )
   {
   int weight;
   switch (a->getAssocType())
@@ -71,60 +71,60 @@ void Autotqlayout::AutolayouterAdapter::addRelationship( AssociationWidget * a )
   getGraph()->addEdge(a->getWidgetID(Uml::A).c_str(),a->getWidgetID(Uml::B).c_str(),weight);
   }
 
-void Autotqlayout::AutolayouterAdapter::setAssociationWeight( int i )
+void Autolayout::AutolayouterAdapter::setAssociationWeight( int i )
   {
   associationWeight=i;
   }
 
-void Autotqlayout::AutolayouterAdapter::setDependenciesWeight( int i )
+void Autolayout::AutolayouterAdapter::setDependenciesWeight( int i )
   {
   dependenciesWeight=i;
   }
 
-void Autotqlayout::AutolayouterAdapter::setGeneralizationWeight( int i )
+void Autolayout::AutolayouterAdapter::setGeneralizationWeight( int i )
   {
   generalizationWeight=i;
   }
 
-void Autotqlayout::AutolayouterAdapter::setGeneralizationAsEdges( bool b )
+void Autolayout::AutolayouterAdapter::setGeneralizationAsEdges( bool b )
   {
   genralizationAsEdges=b;
   }
 
-void Autotqlayout::AutolayouterAdapter::setDependenciesAsEdges( bool b )
+void Autolayout::AutolayouterAdapter::setDependenciesAsEdges( bool b )
   {
   dependenciesAsEdges=b;
   }
 
-void Autotqlayout::AutolayouterAdapter::setAssociationAsEdges( bool b )
+void Autolayout::AutolayouterAdapter::setAssociationAsEdges( bool b )
   {
   associationAsEdges=b;
   }
 
-void Autotqlayout::AutolayouterAdapter::setCompressShapes( bool b )
+void Autolayout::AutolayouterAdapter::setCompressShapes( bool b )
   {
   compressShapes=b;
   }
 
-void Autotqlayout::AutolayouterAdapter::setCenterDiagram( bool b )
+void Autolayout::AutolayouterAdapter::setCenterDiagram( bool b )
   {
   centerDiagram=b;
   }
 
-void Autotqlayout::AutolayouterAdapter::setClusterizeHierarchies( bool b )
+void Autolayout::AutolayouterAdapter::setClusterizeHierarchies( bool b )
   {
   clusterizeHierarchies=b;
   }
 
-void Autotqlayout::AutolayouterAdapter::setShapeSeparation( int i )
+void Autolayout::AutolayouterAdapter::setShapeSeparation( int i )
   {
   shapeSeparation=i;
   }
 
-Autotqlayout::Graph  * Autotqlayout::AutolayouterAdapter::setGraph( UMLView * view )
+Autolayout::Graph  * Autolayout::AutolayouterAdapter::setGraph( UMLView * view )
   {
   if (! view) return 0;
-  Autotqlayout::Graph * g=getGraph();
+  Autolayout::Graph * g=getGraph();
   if (g&&g->empty())
     {
     UMLWidgetList list = view->getWidgetList();
@@ -151,7 +151,7 @@ Autotqlayout::Graph  * Autotqlayout::AutolayouterAdapter::setGraph( UMLView * vi
   return g;
   }
 
-void Autotqlayout::AutolayouterAdapter::updateView( UMLView* view )
+void Autolayout::AutolayouterAdapter::updateView( UMLView* view )
   {
 if (! view) return ;
 UMLWidgetList list = view->getWidgetList();
@@ -175,17 +175,17 @@ UMLWidgetList list = view->getWidgetList();
       }
   }
 
-Autotqlayout::Canvas * Autotqlayout::AutolayouterAdapter::setCanvas( UMLView* view )
+Autolayout::Canvas * Autolayout::AutolayouterAdapter::setCanvas( UMLView* view )
   {
-  return canvas=new Autotqlayout::SimpleCanvas(view->getCanvasWidth(),view->getCanvasHeight());
+  return canvas=new Autolayout::SimpleCanvas(view->getCanvasWidth(),view->getCanvasHeight());
   }
 
-void Autotqlayout::AutolayouterAdapter::setNoteConnectionWeight( int i )
+void Autolayout::AutolayouterAdapter::setNoteConnectionWeight( int i )
 {
 noteConnectionWeight=i;
 }
 
-void Autotqlayout::AutolayouterAdapter::setNoteConnectionsAsEdges( bool b )
+void Autolayout::AutolayouterAdapter::setNoteConnectionsAsEdges( bool b )
 {
 noteConnectionAsEdges=b;
 }

umbrello/umbrello/autolayout/autolayouteradapter.h

@@ -17,13 +17,13 @@
 #include "../umlnamespace.h"
 
 
-namespace Autotqlayout
+namespace Autolayout
 {
 
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
 */
-class AutolayouterAdapter : virtual public Autotqlayout::Autolayouter
+class AutolayouterAdapter : virtual public Autolayout::Autolayouter
 {
 public:
     AutolayouterAdapter();

umbrello/umbrello/autolayout/canvas.h

@@ -15,7 +15,7 @@
 #ifndef AUTOLAYOUTCANVAS_H
 #define AUTOLAYOUTCANVAS_H
 
-namespace Autotqlayout {
+namespace Autolayout {
 
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>

umbrello/umbrello/autolayout/diagram.h

@@ -21,7 +21,7 @@
 @author Dimitri Ognibene <ognibened @yahoo.it>
 Umbrello UML Modeller Authors
 */
-namespace Autotqlayout{
+namespace Autolayout{
 class Diagram//: public virtual Graph, public virtual Canvas{
 {
 private:
@@ -39,7 +39,7 @@ public:
 
     void addNode(const char *name, int width,int heigt);
     void addEdge(const char* nodea,const char*nodeb);
-    void autotqlayout();
+    void autolayout();
     void save();
     Node getNode(const char*);
 

umbrello/umbrello/autolayout/dotautolayouter.cpp

@@ -15,10 +15,10 @@
 
 #include <graphviz/dotprocs.h>
 
-namespace Autotqlayout {
+namespace Autolayout {
 
 DotAutolayouter::DotAutolayouter()
-        : Autotqlayout::GraphvizAutolayouter()
+        : Autolayout::GraphvizAutolayouter()
 {
 }
 
@@ -32,10 +32,10 @@ DotAutolayouter::~DotAutolayouter()
 void DotAutolayouter::run()
 {
     //#ifndef internal_renderizer
-    /* bind graph to GV context - currently must be done before tqlayout */
+    /* bind graph to GV context - currently must be done before layout */
     //  gvBindContext(gvc,g);
     //#endif
-    // do tqlayout
+    // do layout
     //dot_layout();
     dot_layout( gg->_agraph );
 }

umbrello/umbrello/autolayout/dotautolayouter.h

@@ -17,12 +17,12 @@
 #include "baseinclude.h"
 #include "graphvizautolayouter.h"
 
-namespace Autotqlayout {
+namespace Autolayout {
 
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
 */
-class DotAutolayouter : virtual public Autotqlayout::GraphvizAutolayouter
+class DotAutolayouter : virtual public Autolayout::GraphvizAutolayouter
 {
 public:
     DotAutolayouter();

umbrello/umbrello/autolayout/graphvizautolayouter.cpp

@@ -15,10 +15,10 @@
 
 #include <graphviz/graph.h>
 
-namespace Autotqlayout {
+namespace Autolayout {
 
 GraphvizAutolayouter::GraphvizAutolayouter()
-        : Autotqlayout::AutolayouterAdapter()
+        : Autolayout::AutolayouterAdapter()
 {
     gg = new GraphvizGraph();
 }
@@ -44,7 +44,7 @@ void GraphvizAutolayouter::setShapeSeparation( int i )
     gg->setShapeSeparation(i);
 }
 
-Autotqlayout::Canvas * GraphvizAutolayouter::setCanvas( UMLView * view )
+Autolayout::Canvas * GraphvizAutolayouter::setCanvas( UMLView * view )
 {
     Canvas* canvas= AutolayouterAdapter::setCanvas(view);
     gg->setCanvas(canvas);

umbrello/umbrello/autolayout/graphvizautolayouter.h

@@ -15,13 +15,13 @@
 #include "autolayouteradapter.h"
 #include "graphvizgraph.h"
 
-namespace Autotqlayout
+namespace Autolayout
 {
 
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
 */
-class GraphvizAutolayouter : virtual public Autotqlayout::AutolayouterAdapter
+class GraphvizAutolayouter : virtual public Autolayout::AutolayouterAdapter
 {
 public:
     GraphvizAutolayouter();

umbrello/umbrello/autolayout/graphvizgraph.cpp

@@ -23,7 +23,7 @@ char* _strcpy(const char* name)
     a=strcpy(a,name);
     return a;
 }
-namespace Autotqlayout
+namespace Autolayout
 {
 
 /**
@@ -31,7 +31,7 @@ namespace Autotqlayout
  * @return
  */
 GraphvizGraph::GraphvizGraph()
-        : Autotqlayout::Graph()
+        : Autolayout::Graph()
 {
     aginit();
     empty_flag=true;
@@ -96,7 +96,7 @@ void GraphvizGraph::addNode(const char* name, int width, int height)
 }
 
 
-void Autotqlayout::GraphvizGraph::setCompressShapes( bool b )
+void Autolayout::GraphvizGraph::setCompressShapes( bool b )
 {
     if (empty())
     {
@@ -105,7 +105,7 @@ void Autotqlayout::GraphvizGraph::setCompressShapes( bool b )
     }
 }
 
-void Autotqlayout::GraphvizGraph::setCenterDiagram( bool b )
+void Autolayout::GraphvizGraph::setCenterDiagram( bool b )
 {
     if (empty())
     {
@@ -114,7 +114,7 @@ void Autotqlayout::GraphvizGraph::setCenterDiagram( bool b )
     }
 }
 
-void Autotqlayout::GraphvizGraph::setShapeSeparation( int i )
+void Autolayout::GraphvizGraph::setShapeSeparation( int i )
 {
     char* a;
     asprintf(&a,"%f",((float) i)/10.0);
@@ -122,22 +122,22 @@ void Autotqlayout::GraphvizGraph::setShapeSeparation( int i )
     free (a);
 }
 
-bool Autotqlayout::GraphvizGraph::empty( )
+bool Autolayout::GraphvizGraph::empty( )
 {
     return empty_flag;
 }
 
-Autotqlayout::Node* Autotqlayout::GraphvizGraph::getNode( const char * arg1 )
+Autolayout::Node* Autolayout::GraphvizGraph::getNode( const char * arg1 )
 {
     char *a = _strcpy(arg1);
-    Autotqlayout::GraphvizNode* b=
+    Autolayout::GraphvizNode* b=
-        new Autotqlayout::GraphvizNode(agnode(_agraph,a));
+        new Autolayout::GraphvizNode(agnode(_agraph,a));
     delete[](a);
     nodelist.push_back(b);
     return b;
 }
 
-void GraphvizGraph::setCanvas( Autotqlayout::Canvas * canvas)
+void GraphvizGraph::setCanvas( Autolayout::Canvas * canvas)
 {
     char buf[100];
     sprintf(buf,"%f,%f",((float)canvas->getMaxX()/DPI),((float)canvas->getMaxY()/DPI));
@@ -146,5 +146,5 @@ void GraphvizGraph::setCanvas( Autotqlayout::Canvas * canvas)
     agraphattr(_agraph, "page", buf);
 }
 
-}  // end namespace Autotqlayout
+}  // end namespace Autolayout
 

umbrello/umbrello/autolayout/graphvizgraph.h

@@ -21,13 +21,13 @@
 #include <deque>
 #include <graphviz/types.h>
 
-namespace Autotqlayout
+namespace Autolayout
 {
 
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
 */
-class GraphvizGraph : virtual public Autotqlayout::Graph
+class GraphvizGraph : virtual public Autolayout::Graph
 {
 public:
     GraphvizGraph();

umbrello/umbrello/autolayout/graphviznode.cpp

@@ -17,7 +17,7 @@
 #include <graphviz/types.h>
 #include <graphviz/graph.h>
 
-namespace Autotqlayout {
+namespace Autolayout {
 
 
 
@@ -40,7 +40,7 @@ int GraphvizNode::getY()
 
 }
 
-Autotqlayout::GraphvizNode::GraphvizNode( Agnode_t * node )
+Autolayout::GraphvizNode::GraphvizNode( Agnode_t * node )
 {
     n=node;
 }

umbrello/umbrello/autolayout/graphviznode.h

@@ -18,12 +18,12 @@
 
 class Agnode_t;
 
-namespace Autotqlayout {
+namespace Autolayout {
 
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
 */
-class GraphvizNode : virtual public Autotqlayout::Node
+class GraphvizNode : virtual public Autolayout::Node
 {
 
     GraphvizNode (Agnode_t* n);

umbrello/umbrello/autolayout/newautolayoutdialog.ui

@@ -203,7 +203,7 @@
                                 <string>Weight</string>
                             </property>
                             <property name="whatsThis" stdset="0">
-                                <string>Select the weight that the autotqlayout algoritm must use to compare association with other relationships like Generalization and Dependence</string>
+                                <string>Select the weight that the autolayout algoritm must use to compare association with other relationships like Generalization and Dependence</string>
                             </property>
                         </widget>
                     </widget>
@@ -258,7 +258,7 @@
                                 <string>Weight</string>
                             </property>
                             <property name="whatsThis" stdset="0">
-                                <string>Select the weight that the autotqlayout algoritm must use to compare association with other relationships like Generalization and Dependence</string>
+                                <string>Select the weight that the autolayout algoritm must use to compare association with other relationships like Generalization and Dependence</string>
                             </property>
                         </widget>
                     </widget>
@@ -313,7 +313,7 @@
                                 <string>Weight</string>
                             </property>
                             <property name="whatsThis" stdset="0">
-                                <string>Select the weight that the autotqlayout algoritm must use to compare association with other relationships like Generalization and Dependence</string>
+                                <string>Select the weight that the autolayout algoritm must use to compare association with other relationships like Generalization and Dependence</string>
                             </property>
                         </widget>
                     </widget>
@@ -339,7 +339,7 @@
         </spacer>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout9</cstring>
+                <cstring>layout9</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -513,7 +513,7 @@
         <sender>buttonOk</sender>
         <signal>clicked()</signal>
         <receiver>MyDialog1</receiver>
-        <slot>slotDoAutotqlayout()</slot>
+        <slot>slotDoAutolayout()</slot>
     </connection>
     <connection>
         <sender>restoreDefaultsBTN</sender>
@@ -535,7 +535,7 @@
     </connection>
 </connections>
 <Q_SLOTS>
-    <slot>slotDoAutotqlayout()</slot>
+    <slot>slotDoAutolayout()</slot>
     <slot>slotSaveSettings()</slot>
     <slot>slotReloadSettings()</slot>
     <slot>slotSetClusterizeHierarchies(bool b)</slot>

umbrello/umbrello/autolayout/node.h

@@ -15,7 +15,7 @@
 #ifndef AUTOLAYOUTNODE_H
 #define AUTOLAYOUTNODE_H
 
-namespace Autotqlayout {
+namespace Autolayout {
 
 /**
 @author Umbrello UML Modeller Authors

umbrello/umbrello/autolayout/simplecanvas.cpp

@@ -13,7 +13,7 @@
  ***************************************************************************/
 #include "simplecanvas.h"
 
-namespace Autotqlayout {
+namespace Autolayout {
 
 
 

umbrello/umbrello/autolayout/simplecanvas.h

@@ -17,7 +17,7 @@
 
 #include "canvas.h"
 #include <tqrect.h>
-namespace Autotqlayout {
+namespace Autolayout {
 
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>

umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui

@@ -41,7 +41,7 @@
             </property>
             <widget class="TQLayoutWidget" row="0" column="0">
                 <property name="name">
-                    <cstring>tqlayout4</cstring>
+                    <cstring>layout4</cstring>
                 </property>
                 <grid>
                     <property name="name">
@@ -166,7 +166,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>tqlayout17</cstring>
+                        <cstring>layout17</cstring>
                     </property>
                     <grid>
                         <property name="name">

umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp

@@ -428,7 +428,7 @@ void JavaClassifierCodeDocument::updateContent( )
 
     // NOW create document in sections..
     // now we want to populate the body of our class
-    // our tqlayout is the following general groupings of code blocks:
+    // our layout is the following general groupings of code blocks:
 
     // start java classifier document
 

umbrello/umbrello/codegenerators/javacodegenerationformbase.ui

@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -74,7 +74,7 @@
                         </property>
                         <widget class="TQLayoutWidget" row="0" column="0">
                             <property name="name">
-                                <cstring>tqlayout2</cstring>
+                                <cstring>layout2</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -117,7 +117,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="1" column="0">
                             <property name="name">
-                                <cstring>tqlayout4</cstring>
+                                <cstring>layout4</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -163,7 +163,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="2" column="0">
                             <property name="name">
-                                <cstring>tqlayout4</cstring>
+                                <cstring>layout4</cstring>
                             </property>
                             <grid>
                                 <property name="name">

umbrello/umbrello/codegenerators/pythonwriter.cpp

@@ -418,7 +418,7 @@ const TQStringList PythonWriter::reservedKeywords() const {
         << "TypeError"
         << "UnboundLocalError"
         << "unichr"
-        << "tqunicode"
+        << "unicode"
         << "UnicodeError"
         << "UserWarning"
         << "ValueError"

umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp

@@ -435,7 +435,7 @@ void RubyClassifierCodeDocument::updateContent( )
 
     // NOW create document in sections..
     // now we want to populate the body of our class
-    // our tqlayout is the following general groupings of code blocks:
+    // our layout is the following general groupings of code blocks:
 
     // start ruby classifier document
 

umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui

@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -45,7 +45,7 @@
                         </property>
                         <widget class="TQLayoutWidget" row="0" column="0">
                             <property name="name">
-                                <cstring>tqlayout2</cstring>
+                                <cstring>layout2</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -88,7 +88,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="1" column="0">
                             <property name="name">
-                                <cstring>tqlayout4</cstring>
+                                <cstring>layout4</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -134,7 +134,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="2" column="0">
                             <property name="name">
-                                <cstring>tqlayout4</cstring>
+                                <cstring>layout4</cstring>
                             </property>
                             <grid>
                                 <property name="name">

umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp

@@ -175,7 +175,7 @@ int Lexer::toInt( const Token& token )
 	int i = s[0] == 'L' ? 2 : 1; // wide char ?
 	if( s[i] == '\\' ){
 	    // escaped char
-	    int c = s[i+1].tqunicode();
+	    int c = s[i+1].unicode();
 	    switch( c ) {
 	    case '0':
 		return 0;
@@ -186,7 +186,7 @@ int Lexer::toInt( const Token& token )
 		return c;
 	    }
 	} else {
-	    return s[i].tqunicode();
+	    return s[i].unicode();
 	}
     } else {
 	return 0;
@@ -465,7 +465,7 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline )
 	tk.setStartPosition( startLine, startColumn );
 	tk.setEndPosition( m_currentLine, m_currentColumn );
     } else {
-	tk = CREATE_TOKEN( ch.tqunicode(), currentPosition(), 1 );
+	tk = CREATE_TOKEN( ch.unicode(), currentPosition(), 1 );
 	nextChar();
 	tk.setStartPosition( startLine, startColumn );
 	tk.setEndPosition( m_currentLine, m_currentColumn );
@@ -808,7 +808,7 @@ int Lexer::macroPrimary()
 {
     readWhiteSpaces( false );
     int result = 0;
-    switch( currentChar().tqunicode() ) {
+    switch( currentChar().unicode() ) {
     case '(':
 	nextChar();
 	result = macroExpression();

umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp

@@ -71,7 +71,7 @@ const HashEntry* Lookup::findEntry( const struct HashTable *table,
 const HashEntry* Lookup::findEntry( const struct HashTable *table,
 				    const TQString &s )
 {
-    return findEntry( table, s.tqunicode(), s.length() );
+    return findEntry( table, s.unicode(), s.length() );
 }
 
 int Lookup::find(const struct HashTable *table,
@@ -85,7 +85,7 @@ int Lookup::find(const struct HashTable *table,
 
 int Lookup::find(const struct HashTable *table, const TQString &s)
 {
-  return find(table, s.tqunicode(), s.length());
+  return find(table, s.unicode(), s.length());
 }
 
 unsigned int Lookup::hash(const TQChar *c, unsigned int len)
@@ -100,7 +100,7 @@ unsigned int Lookup::hash(const TQChar *c, unsigned int len)
 
 unsigned int Lookup::hash(const TQString &key)
 {
-    return hash(key.tqunicode(), key.length());
+    return hash(key.unicode(), key.length());
 }
 
 unsigned int Lookup::hash(const char *s)

umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp

@@ -294,7 +294,7 @@ TQString URLUtil::envExpand ( const TQString& str )
       if (pos < 0)
         pos = len;
 
-      char* ret = getenv( TQConstString(str.tqunicode()+1, pos-1).string().local8Bit().data() );
+      char* ret = getenv( TQConstString(str.unicode()+1, pos-1).string().local8Bit().data() );
 
       if (ret)
       {

umbrello/umbrello/dialog_utils.cpp

@@ -25,15 +25,15 @@
 
 namespace Dialog_Utils {
 
-TQLineEdit* makeLabeledEditField(TQGroupBox *containingBox, TQGridLayout *tqlayout, int row,
+TQLineEdit* makeLabeledEditField(TQGroupBox *containingBox, TQGridLayout *layout, int row,
                                 TQLabel * &label, const TQString& labelText,
                                 TQLineEdit * &editField,
                                 const TQString& editFieldText /* = TQString() */)
 {
     label = new TQLabel(labelText, containingBox);
-    tqlayout->addWidget(label, row, 0);
+    layout->addWidget(label, row, 0);
     editField = new TQLineEdit(editFieldText, containingBox);
-    tqlayout->addWidget(editField, row, 1 );
+    layout->addWidget(editField, row, 1 );
     label->setBuddy(editField);
     return editField;
 }

umbrello/umbrello/dialog_utils.h

@@ -31,7 +31,7 @@ namespace Dialog_Utils {
  * Create a labeled text lineedit widget.
  *
  * @param containingBox         The containing TQGroupBox.
- * @param tqlayout                The TQGridLayout to use.
+ * @param layout                The TQGridLayout to use.
  * @param row                   The row number within the TQGridLayout.
  * @param label                 The TQLabel object allocated (return value)
  * @param labelText             The label text.
@@ -39,7 +39,7 @@ namespace Dialog_Utils {
  * @param editFieldText         Initialization text in the editField (optional.)
  * @return a pointer to the TQLineEdit so you can setFocus() if necessary
  */
-TQLineEdit* makeLabeledEditField(TQGroupBox *containingBox, TQGridLayout *tqlayout, int row,
+TQLineEdit* makeLabeledEditField(TQGroupBox *containingBox, TQGridLayout *layout, int row,
                                 TQLabel * &label, const TQString& labelText,
                                 TQLineEdit * &editField,
                                 const TQString& editFieldText = TQString());

umbrello/umbrello/dialogs/activitypage.cpp

@@ -37,7 +37,7 @@ void ActivityPage::setupPage() {
 
     m_pActivityGB = new TQGroupBox(i18n("Activities"), this );
 
-    // vertical box tqlayout for the activity lists, arrow buttons and the button box
+    // vertical box layout for the activity lists, arrow buttons and the button box
     TQVBoxLayout* listVBoxLayout = new TQVBoxLayout( m_pActivityGB );
     listVBoxLayout -> setMargin(margin);
     listVBoxLayout -> setSpacing ( 10 );

umbrello/umbrello/dialogs/assocpage.cpp

@@ -25,12 +25,12 @@ AssocPage::AssocPage(TQWidget *parent, UMLView * v, UMLObject * o) : TQWidget(pa
     m_pAssocGB = new TQGroupBox(i18n("Associations"), this);
     mainLayout -> addWidget(m_pAssocGB);
 
-    TQHBoxLayout * tqlayout = new TQHBoxLayout(m_pAssocGB);
+    TQHBoxLayout * layout = new TQHBoxLayout(m_pAssocGB);
-    tqlayout -> setSpacing(10);
+    layout -> setSpacing(10);
-    tqlayout -> setMargin(margin);
+    layout -> setMargin(margin);
 
     m_pAssocLB = new TQListBox(m_pAssocGB);
-    tqlayout -> addWidget(m_pAssocLB);
+    layout -> addWidget(m_pAssocLB);
     setMinimumSize(310, 330);
     fillListBox();
     m_pMenu = 0;

umbrello/umbrello/dialogs/assocrolepage.cpp

@@ -228,7 +228,7 @@ void AssocRolePage::constructWidget() {
     // m_pDocB-> setEnabled(false);
     m_pDocB->setWordWrap(TQMultiLineEdit::WidgetWidth);
 
-    // add group boxes to main tqlayout 
+    // add group boxes to main layout 
     mainLayout -> addWidget( propsAGB, 0, 0);
     mainLayout -> addWidget( scopeABG, 1, 0);
     mainLayout -> addWidget(changeABG, 2, 0);

umbrello/umbrello/dialogs/classifierlistpage.cpp

@@ -60,11 +60,11 @@ ClassifierListPage::ClassifierListPage(TQWidget* parent, UMLClassifier* classifi
     int margin = fontMetrics().height();
     setMinimumSize(310,330);
 
-    //main tqlayout contains our two group boxes, the list and the documentation
+    //main layout contains our two group boxes, the list and the documentation
     TQVBoxLayout* mainLayout = new TQVBoxLayout( this );
     mainLayout->setSpacing(10);
 
-    //top group box, contains a vertical tqlayout with list box above and buttons below
+    //top group box, contains a vertical layout with list box above and buttons below
     m_pItemListGB = new TQGroupBox(typeName, this );
     TQVBoxLayout* listVBoxLayout = new TQVBoxLayout( m_pItemListGB );
     listVBoxLayout->setMargin(margin);

umbrello/umbrello/dialogs/codegenerationoptionsbase.ui

@@ -55,7 +55,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout1</cstring>
+                            <cstring>layout1</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -270,7 +270,7 @@ generator wants to use as output file already exists:</string>
                     </property>
                     <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>tqlayout8</cstring>
+                            <cstring>layout8</cstring>
                         </property>
                         <grid>
                             <property name="name">

umbrello/umbrello/dialogs/codeviewerdialogbase.ui

@@ -29,7 +29,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <grid>
                 <property name="name">

umbrello/umbrello/dialogs/codevieweroptionsbase.ui

@@ -161,7 +161,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>tqlayout4</cstring>
+                        <cstring>layout4</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -192,7 +192,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="4">
                             <property name="name">
-                                <cstring>tqlayout3</cstring>
+                                <cstring>layout3</cstring>
                             </property>
                             <grid>
                                 <property name="name">

umbrello/umbrello/dialogs/diagrampropertiespage.ui

@@ -70,7 +70,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout20</cstring>
+                        <cstring>layout20</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -78,7 +78,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout6</cstring>
+                                <cstring>layout6</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -164,7 +164,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout7</cstring>
+                        <cstring>layout7</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -172,7 +172,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout6</cstring>
+                                <cstring>layout6</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -229,7 +229,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout8</cstring>
+                        <cstring>layout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -318,7 +318,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout10</cstring>
+                        <cstring>layout10</cstring>
                     </property>
                     <hbox>
                         <property name="name">

umbrello/umbrello/dialogs/overwritedialogue.cpp

@@ -26,14 +26,14 @@ OverwriteDialogue::OverwriteDialogue(
         bool applyToAllRemaining, TQWidget* parent, const char* name) :
 KDialogBase(Plain, i18n("Destination File Already Exists"), Ok|Apply|Cancel, Yes, parent, name) {
 
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( plainPage(), 0, spacingHint() );
+    TQVBoxLayout* layout = new TQVBoxLayout( plainPage(), 0, spacingHint() );
 
     TQLabel* dialogueLabel = new TQLabel(i18n("The file %1 already exists in %2.\n\nUmbrello can overwrite the file, generate a similar\nfile name or not generate this file.").arg(fileName).arg(outputDirectory), plainPage() );
-    tqlayout->addWidget(dialogueLabel);
+    layout->addWidget(dialogueLabel);
 
     m_applyToAllRemaining = new TQCheckBox( i18n("&Apply to all remaining files"), plainPage() );
     m_applyToAllRemaining->setChecked(applyToAllRemaining);
-    tqlayout->addWidget(m_applyToAllRemaining);
+    layout->addWidget(m_applyToAllRemaining);
 
     setButtonText(KDialogBase::Ok, i18n("&Overwrite"));
     setButtonText(KDialogBase::Apply, i18n("&Generate Similar File Name"));

umbrello/umbrello/dialogs/pkgcontentspage.cpp

@@ -29,12 +29,12 @@ PkgContentsPage::PkgContentsPage(TQWidget *parent, UMLPackage *pkg)
     m_pContentGB = new TQGroupBox(i18n("Contained Items"), this);
     mainLayout -> addWidget(m_pContentGB);
 
-    TQHBoxLayout * tqlayout = new TQHBoxLayout(m_pContentGB);
+    TQHBoxLayout * layout = new TQHBoxLayout(m_pContentGB);
-    tqlayout -> setSpacing(10);
+    layout -> setSpacing(10);
-    tqlayout -> setMargin(margin);
+    layout -> setMargin(margin);
 
     m_pContentLB = new TQListBox(m_pContentGB);
-    tqlayout -> addWidget(m_pContentLB);
+    layout -> addWidget(m_pContentLB);
     setMinimumSize(310, 330);
     fillListBox();
     m_pMenu = 0;

umbrello/umbrello/dialogs/umlrolepropertiesbase.ui

@@ -14,7 +14,7 @@
     </property>
     <widget class="TQLayoutWidget">
         <property name="name">
-            <cstring>tqlayout6</cstring>
+            <cstring>layout6</cstring>
         </property>
         <property name="geometry">
             <rect>
@@ -37,7 +37,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <property name="geometry">
                         <rect>
@@ -111,7 +111,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>tqlayout2</cstring>
+                            <cstring>layout2</cstring>
                         </property>
                         <grid>
                             <property name="name">

umbrello/umbrello/uml.cpp

@@ -225,8 +225,8 @@ void UMLApp::initActions() {
                                 TQT_TQOBJECT(this), TQT_SLOT( slotClassDiagram() ), actionCollection(), "new_class_diagram" );
 
 #if defined (HAVE_DOT)
-    autotqlayout = new KAction(i18n("&Autotqlayout..."),0,0,TQT_TQOBJECT(this),TQT_SLOT(slotAutotqlayout()),
+    autolayout = new KAction(i18n("&Autolayout..."),0,0,TQT_TQOBJECT(this),TQT_SLOT(slotAutolayout()),
-                             actionCollection(),"autotqlayout");
+                             actionCollection(),"autolayout");
 #endif
     sequenceDiagram= new KAction( i18n( "&Sequence Diagram..." ), SmallIconSet("umbrello_diagram_sequence"), 0,
                                   TQT_TQOBJECT(this), TQT_SLOT( slotSequenceDiagram() ), actionCollection(), "new_sequence_diagram" );
@@ -842,7 +842,7 @@ void UMLApp::slotEditCopy() {
 
 void UMLApp::slotEditPaste() {
     slotStatusMsg(i18n("Inserting clipboard contents..."));
-    TQMimeSource* data = TQApplication::tqclipboard()->data();
+    TQMimeSource* data = TQApplication::clipboard()->data();
     UMLClipboard clipboard;
     setCursor(KCursor::waitCursor());
     if(!clipboard.paste(data)) {
@@ -977,7 +977,7 @@ void UMLApp::enableRedo(bool enable) {
 
 /** initialize the QT's global clipboard support for the application */
 void UMLApp::initClip() {
-    TQClipboard* clip = TQApplication::tqclipboard();
+    TQClipboard* clip = TQApplication::clipboard();
     connect(clip, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipDataChanged()));
 
     // Don't poll the X11 clipboard every second. This is a little expensive and resulted
@@ -1007,7 +1007,7 @@ bool UMLApp::canDecode(const TQMimeSource* mimeSource) {
 }
 
 void UMLApp::slotClipDataChanged() {
-    TQMimeSource * data = TQApplication::tqclipboard()->data();
+    TQMimeSource * data = TQApplication::clipboard()->data();
 
     //Pass the MimeSource to the Doc
     editPaste->setEnabled( data && canDecode(data) );
@@ -1075,7 +1075,7 @@ bool UMLApp::editCutCopy( bool bFromView ) {
     TQMimeSource * clipdata = 0;
 
     if ((clipdata = clipboard.copy(bFromView)) != 0) {
-        TQClipboard* clip = TQApplication::tqclipboard();
+        TQClipboard* clip = TQApplication::clipboard();
         clip->setData(clipdata);//the global clipboard takes ownership of the clipdata memory
         connect(clip, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipDataChanged()));
         return true;
@@ -1679,7 +1679,7 @@ void UMLApp::slotMoveTabRight() {
     //m_tabWidget->moveTab( m_tabWidget->currentPageIndex(), m_tabWidget->currentPageIndex() + 1 );
 }
 
-void UMLApp::slotAutotqlayout(){
+void UMLApp::slotAutolayout(){
 #ifdef HAVE_DOT
 /*
     TQDialog* d = new AutolayoutDlg(getCurrentView());

umbrello/umbrello/uml.h

@@ -535,7 +535,7 @@ public slots:
     /**
      * Autolayouts the current class diagram
      */
-    void slotAutotqlayout();
+    void slotAutolayout();
 
     /**
      * Changes the statusbar contents for the standard label
@@ -959,7 +959,7 @@ private:
     KAction* deleteSelectedWidget;
     KAction* deleteDiagram;
 #ifdef HAVE_DOT
-    KAction* autotqlayout;
+    KAction* autolayout;
 #endif
 
     KAction* changeTabLeft;