diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core.h | 2 | ||||
| -rw-r--r-- | src/generalinfowidgetbase.ui | 4 | ||||
| -rw-r--r-- | src/mimewarningdialog.ui | 2 | ||||
| -rw-r--r-- | src/newui/dmainwindow.cpp | 6 | ||||
| -rw-r--r-- | src/newui/dmainwindow.h | 2 | ||||
| -rw-r--r-- | src/pluginselectdialogbase.ui | 2 | ||||
| -rw-r--r-- | src/profileengine/editor/addprofilewidget.ui | 2 | ||||
| -rw-r--r-- | src/profileengine/editor/profileeditorbase.ui | 2 | ||||
| -rw-r--r-- | src/profileengine/lib/profile.cpp | 6 | ||||
| -rw-r--r-- | src/projectsession.cpp | 6 | ||||
| -rw-r--r-- | src/settingswidget.ui | 2 | ||||
| -rw-r--r-- | src/simplemainwindow.cpp | 2 | ||||
| -rw-r--r-- | src/toplevel.cpp | 2 | ||||
| -rw-r--r-- | src/toplevel.h | 2 |
14 files changed, 21 insertions, 21 deletions
@@ -28,7 +28,7 @@ public: /** * Setup shourtcut tips. For every KAction with a shortcut, - * appends the shortcut string, in tqparenthesis, to the + * appends the shortcut string, in parenthesis, to the * actions's tooltip. If tooltip already has any text in * parens, it's removed and shortcut is added instead. * diff --git a/src/generalinfowidgetbase.ui b/src/generalinfowidgetbase.ui index 9d515c0e..f253e41a 100644 --- a/src/generalinfowidgetbase.ui +++ b/src/generalinfowidgetbase.ui @@ -233,8 +233,8 @@ Placed in the AUTHORS file</string> <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in declaration">ksqueezedtextlabel.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/src/mimewarningdialog.ui b/src/mimewarningdialog.ui index 2c44566c..87b92349 100644 --- a/src/mimewarningdialog.ui +++ b/src/mimewarningdialog.ui @@ -250,5 +250,5 @@ <slot>accept()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/src/newui/dmainwindow.cpp b/src/newui/dmainwindow.cpp index fb7dd14a..2343b044 100644 --- a/src/newui/dmainwindow.cpp +++ b/src/newui/dmainwindow.cpp @@ -83,7 +83,7 @@ void DMainWindow::createToolWindows() void DMainWindow::addWidget(TQWidget *widget, const TQString &title) { -// tqinvalidateActiveTabWidget(); +// invalidateActiveTabWidget(); if (m_firstRemoved && m_activeTabWidget == m_tabs.first()) { m_central->addDock(0, 0, m_activeTabWidget); @@ -175,14 +175,14 @@ DTabWidget *DMainWindow::splitHorizontal() DTabWidget *DMainWindow::splitVertical() { -// tqinvalidateActiveTabWidget(); +// invalidateActiveTabWidget(); int row = m_central->indexOf(m_activeTabWidget).first; m_activeTabWidget = createTab(); m_central->addDock(row, m_central->numCols(row), m_activeTabWidget); return m_activeTabWidget; } -void DMainWindow::tqinvalidateActiveTabWidget() +void DMainWindow::invalidateActiveTabWidget() { /* TQWidget *focused = m_central->tqfocusWidget(); kdDebug(9000) << "tqinvalidate: " << focused << endl; diff --git a/src/newui/dmainwindow.h b/src/newui/dmainwindow.h index dc7b1c42..f20cfec9 100644 --- a/src/newui/dmainwindow.h +++ b/src/newui/dmainwindow.h @@ -107,7 +107,7 @@ protected: TQWidget *m_currentWidget; private slots: - void tqinvalidateActiveTabWidget(); + void invalidateActiveTabWidget(); }; diff --git a/src/pluginselectdialogbase.ui b/src/pluginselectdialogbase.ui index acad67b1..1f69a9ca 100644 --- a/src/pluginselectdialogbase.ui +++ b/src/pluginselectdialogbase.ui @@ -172,7 +172,7 @@ <Q_SLOTS> <slot access="protected">saveAsDefault()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurllabel.h</includehint> </includehints> diff --git a/src/profileengine/editor/addprofilewidget.ui b/src/profileengine/editor/addprofilewidget.ui index dccb234e..a44765ab 100644 --- a/src/profileengine/editor/addprofilewidget.ui +++ b/src/profileengine/editor/addprofilewidget.ui @@ -117,5 +117,5 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/src/profileengine/editor/profileeditorbase.ui b/src/profileengine/editor/profileeditorbase.ui index 094eeffd..d8ad68d3 100644 --- a/src/profileengine/editor/profileeditorbase.ui +++ b/src/profileengine/editor/profileeditorbase.ui @@ -657,7 +657,7 @@ <slot>addDisabled()</slot> <slot>delDisabled()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>klistview.h</includehint> diff --git a/src/profileengine/lib/profile.cpp b/src/profileengine/lib/profile.cpp index 39d247bf..5c94d566 100644 --- a/src/profileengine/lib/profile.cpp +++ b/src/profileengine/lib/profile.cpp @@ -104,10 +104,10 @@ void Profile::save() Profile::EntryList Profile::list(List type) { - EntryList tqparentList; + EntryList parentList; if (m_parent) - tqparentList = m_parent->list(type); - EntryList list = tqparentList; + parentList = m_parent->list(type); + EntryList list = parentList; for (EntryList::iterator it = list.begin(); it != list.end(); ++it) (*it).derived = true; TQStringList &personalList = listByType(type); diff --git a/src/projectsession.cpp b/src/projectsession.cpp index ae54bbfa..cddf5d77 100644 --- a/src/projectsession.cpp +++ b/src/projectsession.cpp @@ -221,8 +221,8 @@ void ProjectSession::recreateViews(KURL& url, TQDomElement docEl, bool activate) } //// // restore focus //// if (pFocusedView != 0L) { -//// if (pFocusedView->tqparentWidget()->inherits("QextMdiChildView")) { -//// ((QextMdiChildView*)pFocusedView->tqparentWidget())->activate(); +//// if (pFocusedView->parentWidget()->inherits("QextMdiChildView")) { +//// ((QextMdiChildView*)pFocusedView->parentWidget())->activate(); //// } //// pFocusedView->setFocus(); //// } @@ -349,7 +349,7 @@ bool ProjectSession::saveToFile( const TQString & sessionFileName, const TQValue TQDomElement viewEl = domdoc.createElement( "View"+viewIdStr); docEl.appendChild( viewEl); // focus? -//// viewEl.setAttribute("Focus", (((CEditWidget*)pView->tqparentWidget()) == m_pDocViewMan->currentEditView())); +//// viewEl.setAttribute("Focus", (((CEditWidget*)pView->parentWidget()) == m_pDocViewMan->currentEditView())); viewEl.setAttribute("Type", "???"); TQDomElement viewPropertiesEl = domdoc.createElement("AdditionalSettings"); diff --git a/src/settingswidget.ui b/src/settingswidget.ui index df44b1d5..305f7e4e 100644 --- a/src/settingswidget.ui +++ b/src/settingswidget.ui @@ -517,7 +517,7 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp index bca7766a..cbbb1543 100644 --- a/src/simplemainwindow.cpp +++ b/src/simplemainwindow.cpp @@ -70,7 +70,7 @@ SimpleMainWindow::SimpleMainWindow(TQWidget* tqparent, const char *name) SimpleMainWindow::~ SimpleMainWindow( ) { - TopLevel::tqinvalidateInstance( this ); + TopLevel::invalidateInstance( this ); } void SimpleMainWindow::init() diff --git a/src/toplevel.cpp b/src/toplevel.cpp index cecfa36d..048b325c 100644 --- a/src/toplevel.cpp +++ b/src/toplevel.cpp @@ -28,7 +28,7 @@ KDevMainWindow *TopLevel::getInstance() return s_instance; } -void TopLevel::tqinvalidateInstance(KDevMainWindow *instance) +void TopLevel::invalidateInstance(KDevMainWindow *instance) { if ( s_instance == instance ) s_instance = 0; diff --git a/src/toplevel.h b/src/toplevel.h index c91d5be2..8eb0243a 100644 --- a/src/toplevel.h +++ b/src/toplevel.h @@ -16,7 +16,7 @@ public: static KDevMainWindow *getInstance(); //!< Get a pointer to the single KDevTopLevel object static bool mainWindowValid(); - static void tqinvalidateInstance(KDevMainWindow *instance); //!< Signal that the object has been (or is about to be) destroyed + static void invalidateInstance(KDevMainWindow *instance); //!< Signal that the object has been (or is about to be) destroyed private: |