summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/common')
-rw-r--r--src/common/global/process.cpp8
-rw-r--r--src/common/gui/editlistbox.cpp2
-rw-r--r--src/common/gui/hexword_gui.cpp4
-rw-r--r--src/common/gui/hexword_gui.h4
-rw-r--r--src/common/gui/key_gui.h2
-rw-r--r--src/common/gui/list_view.cpp16
-rw-r--r--src/common/nokde/nokde_kaboutdata.cpp6
-rw-r--r--src/common/nokde/nokde_kcmdlineargs.cpp2
-rw-r--r--src/common/port/parallel.cpp10
-rw-r--r--src/common/port/parallel.h2
-rw-r--r--src/common/port/serial.cpp2
11 files changed, 29 insertions, 29 deletions
diff --git a/src/common/global/process.cpp b/src/common/global/process.cpp
index ed63f86..238d336 100644
--- a/src/common/global/process.cpp
+++ b/src/common/global/process.cpp
@@ -146,13 +146,13 @@ bool Process::Base::isFilteredLine(const TQString &line)
//----------------------------------------------------------------------------
void Process::StringOutput::receivedStdout(KProcess*, char *data, int len)
{
- _stdout += TQString::tqfromLatin1(data, len);
+ _stdout += TQString::fromLatin1(data, len);
emit stdoutDataReceived();
}
void Process::StringOutput::receivedStderr(KProcess*, char *data, int len)
{
- _stderr += TQString::tqfromLatin1(data, len);
+ _stderr += TQString::fromLatin1(data, len);
emit stderrDataReceived();
}
@@ -164,7 +164,7 @@ void Process::LineBase::receivedStdout(KProcess*, char *data, int len)
if ( data[i]=='\n' ) {
if ( !isFilteredLine(_stdout) ) addStdoutLine(_stdout);
_stdout = TQString();
- } else _stdout += TQString::tqfromLatin1(data + i, 1);
+ } else _stdout += TQString::fromLatin1(data + i, 1);
}
if ( !_process->isRunning() && !isFilteredLine(_stdout) ) addStdoutLine(_stdout);
emit stdoutDataReceived();
@@ -177,7 +177,7 @@ void Process::LineBase::receivedStderr(KProcess*, char *data, int len)
if ( data[i]=='\n' ) {
if ( !isFilteredLine(_stderr) ) addStderrLine(_stderr);
_stderr = TQString();
- } else _stderr += TQString::tqfromLatin1(data + i, 1);
+ } else _stderr += TQString::fromLatin1(data + i, 1);
}
if ( !_process->isRunning() && !isFilteredLine(_stderr) ) addStderrLine(_stderr);
emit stderrDataReceived();
diff --git a/src/common/gui/editlistbox.cpp b/src/common/gui/editlistbox.cpp
index 1bf54cd..8df1564 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;
- tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
+ setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
TQGridLayout *grid = new TQGridLayout(this, 1, 1, 0, KDialog::spacingHint());
uint row = 0;
diff --git a/src/common/gui/hexword_gui.cpp b/src/common/gui/hexword_gui.cpp
index bf1430c..3030d65 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::tqsizeHint() const
+TQSize GenericHexWordEditor::sizeHint() const
{
return TQSize(maxCharWidth(NumberBase::Hex, font()) * (_nbChars+1), fontMetrics().height());
}
-TQSize GenericHexWordEditor::tqminimumSizeHint() const
+TQSize GenericHexWordEditor::minimumSizeHint() 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 a973291..2be2a75 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 tqsizeHint() const;
- virtual TQSize tqminimumSizeHint() const;
+ virtual TQSize sizeHint() const;
+ virtual TQSize minimumSizeHint() const;
signals:
void modified();
diff --git a/src/common/gui/key_gui.h b/src/common/gui/key_gui.h
index 5afce35..f40c5d2 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->tqsizeHint().width());
+ ParentType::_widget->setMinimumWidth(ParentType::_widget->sizeHint().width());
}
protected:
diff --git a/src/common/gui/list_view.cpp b/src/common/gui/list_view.cpp
index 52bd32b..1e0cb66 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->tqfocusWidget(), tqfocusWidget(), (*it)->_editWidgets[i]);
- if ( tqApp->tqfocusWidget() && tqfocusWidget()==(*it)->_editWidgets[i] ) break;
+ //qDebug("focus out %i %i=%i", tqApp->focusWidget(), focusWidget(), (*it)->_editWidgets[i]);
+ if ( tqApp->focusWidget() && focusWidget()==(*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->tqitemRect(item);
+ TQRect rect = _listView->itemRect(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->tqitemRect(this);
+ TQRect r = lv->itemRect(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]->tqsizeHint().width());
+ uint w = TQMIN(r.width(), _editWidgets[i]->sizeHint().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->tqmetaObject()->findProperty("text", true)!=-1 )
+ if ( edit->metaObject()->findProperty("text", true)!=-1 )
emit listView()->itemRenamed(this, col, edit->property("text").toString());
- else if ( edit->tqmetaObject()->findProperty("currentText", true)!=-1 )
+ else if ( edit->metaObject()->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->tqsizeHint().width());
+ w = TQMAX(w, edit->sizeHint().width());
delete edit;
return w;
}
diff --git a/src/common/nokde/nokde_kaboutdata.cpp b/src/common/nokde/nokde_kaboutdata.cpp
index 6dd8f33..62d0d3d 100644
--- a/src/common/nokde/nokde_kaboutdata.cpp
+++ b/src/common/nokde/nokde_kaboutdata.cpp
@@ -271,7 +271,7 @@ KAboutData::setProgramLogo(const TQImage& image)
TQString
KAboutData::version() const
{
- return TQString::tqfromLatin1(mVersion);
+ return TQString::fromLatin1(mVersion);
}
TQString
@@ -286,13 +286,13 @@ KAboutData::shortDescription() const
TQString
KAboutData::homepage() const
{
- return TQString::tqfromLatin1(mHomepageAddress);
+ return TQString::fromLatin1(mHomepageAddress);
}
TQString
KAboutData::bugAddress() const
{
- return TQString::tqfromLatin1(mBugEmailAddress);
+ return TQString::fromLatin1(mBugEmailAddress);
}
const TQValueList<KAboutPerson>
diff --git a/src/common/nokde/nokde_kcmdlineargs.cpp b/src/common/nokde/nokde_kcmdlineargs.cpp
index e73de61..4bc893c 100644
--- a/src/common/nokde/nokde_kcmdlineargs.cpp
+++ b/src/common/nokde/nokde_kcmdlineargs.cpp
@@ -880,7 +880,7 @@ KCmdLineArgs::usage(const char *id)
bool hasOptions = false;
TQString optionsHeader;
if (args->name)
- optionsHeader = optionHeaderString.tqarg(i18n("%1 options").tqarg(TQString::tqfromLatin1(args->name)));
+ optionsHeader = optionHeaderString.tqarg(i18n("%1 options").tqarg(TQString::fromLatin1(args->name)));
else
optionsHeader = i18n("\nOptions:\n");
diff --git a/src/common/port/parallel.cpp b/src/common/port/parallel.cpp
index daa0c6a..46e395b 100644
--- a/src/common/port/parallel.cpp
+++ b/src/common/port/parallel.cpp
@@ -100,12 +100,12 @@ const Port::Parallel::PPinData Port::Parallel::PIN_DATA[Nb_Pins] = {
{ Data, 0x20, Out, "D5" }, // data 5
{ Data, 0x40, Out, "D6" }, // data 6
{ Data, 0x80, Out, "D7" }, // data 7
- { tqStatus, 0x40, In, "/ACK" }, // !ack
- { tqStatus, 0x80, In, "BUSY" }, // busy
- { tqStatus, 0x20, In, "PAPER" }, // pout
- { tqStatus, 0x10, In, "SELin" }, // select
+ { Status, 0x40, In, "/ACK" }, // !ack
+ { Status, 0x80, In, "BUSY" }, // busy
+ { Status, 0x20, In, "PAPER" }, // pout
+ { Status, 0x10, In, "SELin" }, // select
{ Control, 0x02, Out, "LF" }, // !feed
- { tqStatus, 0x08, In, "/ERROR" }, // !error
+ { Status, 0x08, In, "/ERROR" }, // !error
{ Control, 0x04, Out, "PRIME" }, // !init
{ Control, 0x08, Out, "SELout" }, // !si
{ Nb_RequestTypes, 0x00, NoIO, "GND" }, // GND
diff --git a/src/common/port/parallel.h b/src/common/port/parallel.h
index 08741e1..d25529d 100644
--- a/src/common/port/parallel.h
+++ b/src/common/port/parallel.h
@@ -33,7 +33,7 @@ public:
enum Pin { DS = 0, D0, D1, D2, D3, D4, D5, D6, D7, ACK, BUSY, PAPER, SELin,
LF, ERROR, PRIME, SELout, P18, P19, P20, P21, P22, P23, P24, P25,
Nb_Pins };
- enum RequestType { Control = 0, tqStatus, Data, Nb_RequestTypes };
+ enum RequestType { Control = 0, Status, Data, Nb_RequestTypes };
struct PPinData {
RequestType rType;
uchar mask;
diff --git a/src/common/port/serial.cpp b/src/common/port/serial.cpp
index 2db84b9..2aaa7a8 100644
--- a/src/common/port/serial.cpp
+++ b/src/common/port/serial.cpp
@@ -387,7 +387,7 @@ bool Port::Serial::internalReadPin(Pin pin, LogicType type, bool &value)
return true;
#elif defined(Q_OS_WIN)
DWORD status;
- if ( GetCommModemtqStatus(_fd, &status)==0 ) return false;
+ if ( GetCommModemStatus(_fd, &status)==0 ) return false;
switch (pin) {
case DCD: value = (status & MS_RLSD_ON); break;
case DSR: value = (status & MS_DSR_ON); break;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-23 09:47:36 +0000