Browse Source

Rename obsolete tq methods to standard names

tags/r14.0.0
Timothy Pearson 8 years ago
parent
commit
bdde494bd0
5 changed files with 13 additions and 13 deletions
  1. +2
    -2
      src/editor.cpp
  2. +1
    -1
      src/evaluator.cpp
  3. +8
    -8
      src/mainwindow.cpp
  4. +1
    -1
      src/mainwindow.h
  5. +1
    -1
      src/resultlistview.cpp

+ 2
- 2
src/editor.cpp View File

@@ -147,7 +147,7 @@ void ChoiceItem::paint( TQPainter* painter )
//int xPos = fm.width( item );
int xPos = TQMAX(fm.width(item), minNameWidth);
if( !isSelected() )
painter->setPen( listBox()->tqpalette().disabled().text().dark() );
painter->setPen( listBox()->palette().disabled().text().dark() );
painter->drawText( 10 + xPos, yPos, desc );
}

@@ -268,7 +268,7 @@ TQSize Editor::sizeHint() const
int h = TQMAX(fm.lineSpacing(), 14);
int w = fm.width( 'x' ) * 20;
int m = frameWidth() * 2;
return( tqstyle().tqsizeFromContents(TQStyle::CT_LineEdit, this,
return( style().tqsizeFromContents(TQStyle::CT_LineEdit, this,
TQSize( w + m, h + m + 4 ).
expandedTo(TQApplication::globalStrut())));
}


+ 1
- 1
src/evaluator.cpp View File

@@ -140,7 +140,7 @@ static Token::Op matchOperator( const TQString& text )
if( text.length() == 1 )
{
TQChar p = text[0];
switch( p.tqunicode() )
switch( p.unicode() )
{
case '+': result = Token::Plus; break;
case '-': result = Token::Minus; break;


+ 8
- 8
src/mainwindow.cpp View File

@@ -54,13 +54,13 @@ MainWindow::MainWindow() : KMainWindow(0, "abakus-mainwindow"), m_popup(0), m_in
{
m_mainSplitter = new TQSplitter(this);
TQWidget *box = new TQWidget(m_mainSplitter);
TQVBoxLayout *tqlayout = new TQVBoxLayout(box);
m_layout = tqlayout;
tqlayout->setSpacing(6);
tqlayout->setMargin(6);
TQVBoxLayout *layout = new TQVBoxLayout(box);
m_layout = layout;
layout->setSpacing(6);
layout->setMargin(6);

TQWidget *configBox = new TQWidget(box);
tqlayout->addWidget(configBox);
layout->addWidget(configBox);

TQHBoxLayout *configLayout = new TQHBoxLayout(configBox);

@@ -90,7 +90,7 @@ MainWindow::MainWindow() : KMainWindow(0, "abakus-mainwindow"), m_popup(0), m_in
connect(m_radians, TQT_SIGNAL(clicked()), TQT_SLOT(slotRadians()));

m_history = new TQVBox(box);
tqlayout->addWidget(m_history);
layout->addWidget(m_history);
m_history->setSpacing(6);
m_history->setMargin(0);

@@ -103,10 +103,10 @@ MainWindow::MainWindow() : KMainWindow(0, "abakus-mainwindow"), m_popup(0), m_in
TQT_SLOT(slotResultSelected(const TQString &)));

m_history->setStretchFactor(m_result, 1);
tqlayout->setStretchFactor(m_history, 1);
layout->setStretchFactor(m_history, 1);

TQHBox *editBox = new TQHBox(box);
tqlayout->addWidget(editBox);
layout->addWidget(editBox);
editBox->setSpacing(6);

m_edit = new Editor(editBox);


+ 1
- 1
src/mainwindow.h View File

@@ -42,7 +42,7 @@ class ResultListViewText;

class AbakusIface;

// Main window class, handles events and tqlayout and stuff
// Main window class, handles events and layout and stuff
class MainWindow : public KMainWindow
{
Q_OBJECT


+ 1
- 1
src/resultlistview.cpp View File

@@ -129,7 +129,7 @@ void ResultListView::slotCopyResult()
if(!m_itemRightClicked)
return;

TQClipboard *clipboard = TQApplication::tqclipboard();
TQClipboard *clipboard = TQApplication::clipboard();

clipboard->setText(m_itemRightClicked->resultText(), TQClipboard::Clipboard);
}


Loading…
Cancel
Save