diff options
| -rw-r--r-- | kdialogd3/kdialogd.cpp | 4 | ||||
| -rw-r--r-- | tqt/kqt3.cpp | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/kdialogd3/kdialogd.cpp b/kdialogd3/kdialogd.cpp index a0ca4db..f957a68 100644 --- a/kdialogd3/kdialogd.cpp +++ b/kdialogd3/kdialogd.cpp @@ -471,7 +471,7 @@ void KDialogDClient::initDialog(const TQString &caption, KDialogBase *d, unsigne KWin::setState(itsDlg->winId(), NET::Modal); KWin::WindowInfo wi(KWin::windowInfo(xid, NET::WMGeometry, NET::WM2UserTime)); - TQRect geom(wi.tqgeometry()); + TQRect geom(wi.geometry()); int rx=geom.x(), ry=geom.y(); @@ -586,7 +586,7 @@ void KDialogDFileDialog::slotOk() good=!KIO::NetAccess::exists(urls.first(), false, this) || KMessageBox::Continue==KMessageBox::warningContinueCancel(this, i18n("File %1 exists.\nDo you want to replace it?") - .tqarg(urls.first().prettyURL()), + .arg(urls.first().prettyURL()), i18n("File Exists"), KGuiItem(i18n("Replace"), "filesaveas"), TQString(), KMessageBox::Notify|KMessageBox::PlainCaption); diff --git a/tqt/kqt3.cpp b/tqt/kqt3.cpp index 80a9b0d..8ceb265 100644 --- a/tqt/kqt3.cpp +++ b/tqt/kqt3.cpp @@ -188,7 +188,7 @@ static void kde2TQtFilter(const TQString &orig, TQString *sel) // HACK HACK HACK!!! // KGtk versions <=0.9.1 used this copied TQFileDialogPrivate to access the file filters -// newer versions walk the file dialogs tqchildren... +// newer versions walk the file dialogs children... class TQFileDialogPrivate { public: ~TQFileDialogPrivate(); @@ -224,12 +224,12 @@ static const TQString getFilters(TQFileDialog *dlg, bool scribusSave=false) #else if(dlg) { - const TQObjectList tqchildren=((TQObject *)dlg)->childrenListObject(); + const TQObjectList children=((TQObject *)dlg)->childrenListObject(); - if(!tqchildren.isEmpty()) + if(!children.isEmpty()) { - TQObjectList::ConstIterator it(tqchildren.begin()), - end(tqchildren.end()); + TQObjectList::ConstIterator it(children.begin()), + end(children.end()); for(; it!=end; ++it) if(::tqqt_cast<TQComboBox *>(*it) && 0==qstrcmp((*it)->name(), "file types")) @@ -261,12 +261,12 @@ static TQString getCurrentFileName(TQFileDialog *dlg) { if(dlg) { - const TQObjectList tqchildren=((TQObject *)dlg)->childrenListObject(); + const TQObjectList children=((TQObject *)dlg)->childrenListObject(); - if(!tqchildren.isEmpty()) + if(!children.isEmpty()) { - TQObjectList::ConstIterator it(tqchildren.begin()), - end(tqchildren.end()); + TQObjectList::ConstIterator it(children.begin()), + end(children.end()); for(; it!=end; ++it) if(::tqqt_cast<TQLineEdit *>(*it)) // && 0==qstrcmp((*it)->name(), "name/filter editor")) |