diff options
Diffstat (limited to 'src/common/gui')
-rw-r--r-- | src/common/gui/container.cpp | 8 | ||||
-rw-r--r-- | src/common/gui/container.h | 6 | ||||
-rw-r--r-- | src/common/gui/dialog.h | 2 | ||||
-rw-r--r-- | src/common/gui/editlistbox.cpp | 2 | ||||
-rw-r--r-- | src/common/gui/editlistbox.h | 2 | ||||
-rw-r--r-- | src/common/gui/hexword_gui.cpp | 4 | ||||
-rw-r--r-- | src/common/gui/hexword_gui.h | 4 | ||||
-rw-r--r-- | src/common/gui/key_gui.h | 2 | ||||
-rw-r--r-- | src/common/gui/list_view.cpp | 16 | ||||
-rw-r--r-- | src/common/gui/misc_gui.h | 2 | ||||
-rw-r--r-- | src/common/gui/pfile_ext.cpp | 8 | ||||
-rw-r--r-- | src/common/gui/purl_gui.cpp | 4 |
12 files changed, 30 insertions, 30 deletions
diff --git a/src/common/gui/container.cpp b/src/common/gui/container.cpp index b5917dc..8a747d3 100644 --- a/src/common/gui/container.cpp +++ b/src/common/gui/container.cpp @@ -55,19 +55,19 @@ void Container::initLayout() setFrame(_type); } -void Container::addWidget(TQWidget *w, uint startRow, uint endRow, uint startCol, uint endCol, int alignment) +void Container::addWidget(TQWidget *w, uint startRow, uint endRow, uint startCol, uint endCol, int tqalignment) { Q_ASSERT( startRow<=endRow ); Q_ASSERT( startCol<=endCol ); w->show(); - _gridLayout->addMultiCellWidget(w, startRow, endRow, startCol, endCol, alignment); + _gridLayout->addMultiCellWidget(w, startRow, endRow, startCol, endCol, tqalignment); } -void Container::addLayout(TQLayout *l, uint startRow, uint endRow, uint startCol, uint endCol, int alignment) +void Container::addLayout(TQLayout *l, uint startRow, uint endRow, uint startCol, uint endCol, int tqalignment) { Q_ASSERT( startRow<=endRow ); Q_ASSERT( startCol<=endCol ); - _gridLayout->addMultiCellLayout(l, startRow, endRow, startCol, endCol, alignment); + _gridLayout->addMultiCellLayout(l, startRow, endRow, startCol, endCol, tqalignment); } //---------------------------------------------------------------------------- diff --git a/src/common/gui/container.h b/src/common/gui/container.h index d377561..af3e5a6 100644 --- a/src/common/gui/container.h +++ b/src/common/gui/container.h @@ -12,7 +12,7 @@ #include <tqframe.h> #include <tqwidgetstack.h> #include <tqtabwidget.h> -#include <layout.h> +#include <tqlayout.h> class PopupButton; @@ -26,8 +26,8 @@ public: Container(TQWidget *parent = 0, Type type = Flat); Container(TQWidgetStack *stack, uint index, Type type = Flat); Container(TQTabWidget *tabw, const TQString &title, Type type = Flat); - void addWidget(TQWidget *widget, uint startRow, uint endRow, uint startCol, uint endCol, int alignment = 0); - void addLayout(TQLayout *layout, uint startRow, uint endRow, uint startCol, uint endCol, int alignment = 0); + void addWidget(TQWidget *widget, uint startRow, uint endRow, uint startCol, uint endCol, int tqalignment = 0); + void addLayout(TQLayout *tqlayout, uint startRow, uint endRow, uint startCol, uint endCol, int tqalignment = 0); uint numRows() const { return _gridLayout->numRows(); } uint numCols() const { return _gridLayout->numCols(); } void setFrame(Type type); diff --git a/src/common/gui/dialog.h b/src/common/gui/dialog.h index a28c607..f506411 100644 --- a/src/common/gui/dialog.h +++ b/src/common/gui/dialog.h @@ -9,7 +9,7 @@ #ifndef DIALOG_H #define DIALOG_H -#include <layout.h> +#include <tqlayout.h> #include <kdialogbase.h> #include <klistview.h> diff --git a/src/common/gui/editlistbox.cpp b/src/common/gui/editlistbox.cpp index ca2c675..b881e0f 100644 --- a/src/common/gui/editlistbox.cpp +++ b/src/common/gui/editlistbox.cpp @@ -53,7 +53,7 @@ void EditListBox::init(uint nbColumns, TQWidget *view) _moveDownButton = 0; _removeAllButton = 0; _resetButton = 0; - setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); + tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); TQGridLayout *grid = new TQGridLayout(this, 1, 1, 0, KDialog::spacingHint()); uint row = 0; diff --git a/src/common/gui/editlistbox.h b/src/common/gui/editlistbox.h index 57b156f..53b4294 100644 --- a/src/common/gui/editlistbox.h +++ b/src/common/gui/editlistbox.h @@ -19,7 +19,7 @@ #ifndef EDITLISTBOX_H #define EDITLISTBOX_H -#include <layout.h> +#include <tqlayout.h> #include <klineedit.h> #include <kpushbutton.h> #include <klistview.h> diff --git a/src/common/gui/hexword_gui.cpp b/src/common/gui/hexword_gui.cpp index 3030d65..bf1430c 100644 --- a/src/common/gui/hexword_gui.cpp +++ b/src/common/gui/hexword_gui.cpp @@ -125,12 +125,12 @@ bool GenericHexWordEditor::event(TQEvent *e) return TQLineEdit::event(e); } -TQSize GenericHexWordEditor::sizeHint() const +TQSize GenericHexWordEditor::tqsizeHint() const { return TQSize(maxCharWidth(NumberBase::Hex, font()) * (_nbChars+1), fontMetrics().height()); } -TQSize GenericHexWordEditor::minimumSizeHint() const +TQSize GenericHexWordEditor::tqminimumSizeHint() const { return TQSize(maxCharWidth(NumberBase::Hex, font()) * (_nbChars+1), fontMetrics().height()); } diff --git a/src/common/gui/hexword_gui.h b/src/common/gui/hexword_gui.h index 2be2a75..a973291 100644 --- a/src/common/gui/hexword_gui.h +++ b/src/common/gui/hexword_gui.h @@ -35,8 +35,8 @@ Q_OBJECT TQ_OBJECT public: GenericHexWordEditor(uint nbChars, bool hasBlankValue, TQWidget *parent); - virtual TQSize sizeHint() const; - virtual TQSize minimumSizeHint() const; + virtual TQSize tqsizeHint() const; + virtual TQSize tqminimumSizeHint() const; signals: void modified(); diff --git a/src/common/gui/key_gui.h b/src/common/gui/key_gui.h index f40c5d2..5afce35 100644 --- a/src/common/gui/key_gui.h +++ b/src/common/gui/key_gui.h @@ -77,7 +77,7 @@ public: ParentType::_widget->clear(); } void fixMinimumWidth() { - ParentType::_widget->setMinimumWidth(ParentType::_widget->sizeHint().width()); + ParentType::_widget->setMinimumWidth(ParentType::_widget->tqsizeHint().width()); } protected: diff --git a/src/common/gui/list_view.cpp b/src/common/gui/list_view.cpp index 1e0cb66..52bd32b 100644 --- a/src/common/gui/list_view.cpp +++ b/src/common/gui/list_view.cpp @@ -62,8 +62,8 @@ bool ListView::eventFilter(TQObject *o, TQEvent *e) break; } case TQEvent::FocusOut: { - //qDebug("focus out %i %i=%i", tqApp->focusWidget(), focusWidget(), (*it)->_editWidgets[i]); - if ( tqApp->focusWidget() && focusWidget()==(*it)->_editWidgets[i] ) break; + //qDebug("focus out %i %i=%i", tqApp->tqfocusWidget(), tqfocusWidget(), (*it)->_editWidgets[i]); + if ( tqApp->tqfocusWidget() && tqfocusWidget()==(*it)->_editWidgets[i] ) break; //qDebug("ext"); TQCustomEvent *e = new TQCustomEvent(9999); TQApplication::postEvent(o, e); @@ -95,7 +95,7 @@ void ListViewToolTip::maybeTip(const TQPoint &p) if ( _listView==0 ) return; const TQListViewItem* item = _listView->itemAt(p); if ( item==0 ) return; - TQRect rect = _listView->itemRect(item); + TQRect rect = _listView->tqitemRect(item); if ( !rect.isValid() ) return; int col = _listView->header()->sectionAt(p.x()); TQString text = _listView->tooltip(*item, col); @@ -149,7 +149,7 @@ void EditListViewItem::startRename() _renaming = true; _editWidgets.resize(lv->columns()); for (uint i=0; i<_editWidgets.count(); i++) { - TQRect r = lv->itemRect(this); + TQRect r = lv->tqitemRect(this); r = TQRect(lv->viewportToContents(r.topLeft()), r.size()); r.setLeft(lv->header()->sectionPos(i)); r.setWidth(lv->header()->sectionSize(i) - 1); @@ -162,7 +162,7 @@ void EditListViewItem::startRename() if ( _editWidgets[i]==0 ) continue; _editWidgets[i]->installEventFilter(lv); lv->addChild(_editWidgets[i], r.x(), r.y()); - uint w = TQMIN(r.width(), _editWidgets[i]->sizeHint().width()); + uint w = TQMIN(r.width(), _editWidgets[i]->tqsizeHint().width()); _editWidgets[i]->resize(w, r.height()); lv->viewport()->setFocusProxy(_editWidgets[i]); _editWidgets[i]->setFocus(); @@ -191,9 +191,9 @@ void EditListViewItem::removeEditBox() void EditListViewItem::editDone(int col, const TQWidget *edit) { - if ( edit->metaObject()->findProperty("text", true)!=-1 ) + if ( edit->tqmetaObject()->findProperty("text", true)!=-1 ) emit listView()->itemRenamed(this, col, edit->property("text").toString()); - else if ( edit->metaObject()->findProperty("currentText", true)!=-1 ) + else if ( edit->tqmetaObject()->findProperty("currentText", true)!=-1 ) emit listView()->itemRenamed(this, col, edit->property("currentText").toString()); } @@ -215,7 +215,7 @@ int EditListViewItem::width(const TQFontMetrics &fm, const TQListView *lv, int c int w = KListViewItem::width(fm, lv, col); TQWidget *edit = editWidgetFactory(col); if ( edit==0 ) return w; - w = TQMAX(w, edit->sizeHint().width()); + w = TQMAX(w, edit->tqsizeHint().width()); delete edit; return w; } diff --git a/src/common/gui/misc_gui.h b/src/common/gui/misc_gui.h index eea2e1f..8c6a2ee 100644 --- a/src/common/gui/misc_gui.h +++ b/src/common/gui/misc_gui.h @@ -9,7 +9,7 @@ #ifndef MISC_GUI_H #define MISC_GUI_H -#include <layout.h> +#include <tqlayout.h> #include <tqsplitter.h> #include <tqvaluevector.h> #include <tqvalidator.h> diff --git a/src/common/gui/pfile_ext.cpp b/src/common/gui/pfile_ext.cpp index 080421f..43f9e81 100644 --- a/src/common/gui/pfile_ext.cpp +++ b/src/common/gui/pfile_ext.cpp @@ -22,7 +22,7 @@ bool PURL::File::openForWrite() _tmp->setAutoDelete(true); if ( _tmp->status()!=0 ) { _error = i18n("Could not create temporary file."); - _log.sorry(_error, i18n("File: %1").arg(_tmp->name())); + _log.sorry(_error, i18n("File: %1").tqarg(_tmp->name())); return false; } return true; @@ -61,7 +61,7 @@ bool PURL::File::openForRead() _file->setName(tmp); if ( !_file->open(IO_ReadOnly) ) { _error = i18n("Could not open temporary file."); - _log.sorry(_error, i18n("File: %1").arg(_file->name())); + _log.sorry(_error, i18n("File: %1").tqarg(_file->name())); return false; } return true; @@ -92,7 +92,7 @@ bool PURL::TempFile::close() _tmp->close(); if ( _tmp->status()!=IO_Ok ) { _error = i18n("Could not write to temporary file."); - _log.sorry(_error, i18n("File: %1").arg(_tmp->name())); + _log.sorry(_error, i18n("File: %1").tqarg(_tmp->name())); return false; } } @@ -107,7 +107,7 @@ bool PURL::TempFile::openForWrite() _tmp->setAutoDelete(true); if ( _tmp->status()!=0 ) { _error = i18n("Could not create temporary file."); - _log.sorry(_error, i18n("File: %1").arg(_tmp->name())); + _log.sorry(_error, i18n("File: %1").tqarg(_tmp->name())); return false; } return true; diff --git a/src/common/gui/purl_gui.cpp b/src/common/gui/purl_gui.cpp index 0299bcb..0284682 100644 --- a/src/common/gui/purl_gui.cpp +++ b/src/common/gui/purl_gui.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ #include "purl_gui.h" -#include <layout.h> +#include <tqlayout.h> #include <kiconloader.h> #include <kpushbutton.h> #include <krun.h> @@ -40,7 +40,7 @@ PURL::Url PURL::getSaveUrl(const TQString &startDir, const TQString &filter, case NoSaveAction: break; case AskOverwrite: if ( url.exists() ) { - if ( !MessageBox::askContinue(i18n("File \"%1\" already exists. Overwrite ?").arg(url.pretty())) ) return Url(); + if ( !MessageBox::askContinue(i18n("File \"%1\" already exists. Overwrite ?").tqarg(url.pretty())) ) return Url(); } break; case CancelIfExists: |