summaryrefslogtreecommitdiff
path: root/src/fqterm
diff options
context:
space:
mode:
Diffstat (limited to 'src/fqterm')
-rw-r--r--src/fqterm/fqterm_frame.cpp4
-rw-r--r--src/fqterm/fqterm_python.cpp4
-rw-r--r--src/fqterm/fqterm_screen.cpp6
-rw-r--r--src/fqterm/fqterm_window.cpp8
-rw-r--r--src/fqterm/fqterm_window.h2
5 files changed, 12 insertions, 12 deletions
diff --git a/src/fqterm/fqterm_frame.cpp b/src/fqterm/fqterm_frame.cpp
index e5c863e..916ecb6 100644
--- a/src/fqterm/fqterm_frame.cpp
+++ b/src/fqterm/fqterm_frame.cpp
@@ -1306,7 +1306,7 @@ void FQTermFrame::keyClicked(int id) {
windowManager_->activeWindow()->runPythonScriptFile(scriptFile);
else
#endif
- windowManager_->activeWindow()->runScript(scriptFile.toAscii());
+ windowManager_->activeWindow()->runScript(scriptFile.toLatin1());
} else if (strTmp[0] == '2') { // program
runProgram(strTmp.mid(1));
}
@@ -2045,7 +2045,7 @@ void FQTermFrame::loadToolBarPosition()
QString strTmp = config_->getItemValue("global", "toolbarstate");
if (!strTmp.isEmpty())
{
- restoreState(QByteArray::fromHex(strTmp.toAscii()));
+ restoreState(QByteArray::fromHex(strTmp.toLatin1()));
} else {
addToolBar(Qt::TopToolBarArea, toolBarMdiConnectTools_);
insertToolBar(toolBarMdiConnectTools_,toolBarSetupKeys_);
diff --git a/src/fqterm/fqterm_python.cpp b/src/fqterm/fqterm_python.cpp
index 68b9385..b4d710e 100644
--- a/src/fqterm/fqterm_python.cpp
+++ b/src/fqterm/fqterm_python.cpp
@@ -20,7 +20,7 @@
-#include <QCustomEvent>
+#include <QEvent>
#include <QTextStream>
#include <QApplication>
#include <QDir>
@@ -823,4 +823,4 @@ FQTermPythonHelper::~FQTermPythonHelper() {
} // namespace FQTerm
-#endif //HAVE_PYTHON \ No newline at end of file
+#endif //HAVE_PYTHON
diff --git a/src/fqterm/fqterm_screen.cpp b/src/fqterm/fqterm_screen.cpp
index 339e666..de51381 100644
--- a/src/fqterm/fqterm_screen.cpp
+++ b/src/fqterm/fqterm_screen.cpp
@@ -912,7 +912,7 @@ void FQTermScreen::repaintScreen(QPaintEvent *pe, QPainter &painter) {
FQ_TRACE("screen", 5) << "Client area: " << pe->rect().width()
<< "x" << pe->rect().height();
- QRect rect = pe->rect().intersect(clientRectangle_);
+ QRect rect = pe->rect().intersected(clientRectangle_);
//painter.eraseRect(rect);
drawBackground(painter, rect, 0);
QPoint tlPoint = mapToChar(QPoint(rect.left(), rect.top()));
@@ -1446,7 +1446,7 @@ QImage &FQTermScreen::fade(QImage &img, float val, const QColor &color) {
if (img.depth() <= 8) {
// pseudo color
- for (int i = 0; i < img.numColors(); i++) {
+ for (int i = 0; i < img.colorCount(); i++) {
col = img.color(i);
cr = qRed(col);
cg = qGreen(col);
@@ -1646,7 +1646,7 @@ void FQTermScreen::updateWidgetRect(QPainter& painter) {
- QRect rect = widgetRect_.intersect(clientRectangle_);
+ QRect rect = widgetRect_.intersected(clientRectangle_);
if (rect.isEmpty())
return;
drawBackground(painter, rect, 0);
diff --git a/src/fqterm/fqterm_window.cpp b/src/fqterm/fqterm_window.cpp
index 59d5a48..f253a98 100644
--- a/src/fqterm/fqterm_window.cpp
+++ b/src/fqterm/fqterm_window.cpp
@@ -91,7 +91,7 @@ char FQTermWindow::directions_[][5] = {
"\x1b[D", // 6 LEFT
"\x1b[C" // 7 RIGHT
};
-
+/*
class FAQ: public QObject {
Q_OBJECT;
public slots:
@@ -102,12 +102,12 @@ class FAQ: public QObject {
private:
int a;
};
-
+*/
//constructor
FQTermWindow::FQTermWindow(FQTermConfig *config, FQTermFrame *frame, FQTermParam param,
int addressIndex, QWidget *parent,
- const char *name, Qt::WFlags wflags)
+ const char *name, Qt::WindowFlags wflags)
: QMainWindow(parent, wflags),
frame_(frame),
isSelecting_(false),
@@ -1800,7 +1800,7 @@ void FQTermWindow::startBlink() {
void FQTermWindow::stopBlink() {
if (tabBlinkTimer_->isActive()) {
tabBlinkTimer_->stop();
- emit blinkTheTab(this, TRUE);
+ emit blinkTheTab(this, true);
}
}
diff --git a/src/fqterm/fqterm_window.h b/src/fqterm/fqterm_window.h
index d01b9e9..7a736b3 100644
--- a/src/fqterm/fqterm_window.h
+++ b/src/fqterm/fqterm_window.h
@@ -88,7 +88,7 @@ class FQTermWindow : public QMainWindow,
Q_OBJECT;
public:
FQTermWindow(FQTermConfig *, FQTermFrame *frame, FQTermParam param, int addr = -1, QWidget
- *parent = 0, const char *name = 0, Qt::WFlags wflags = Qt::Window);
+ *parent = 0, const char *name = 0, Qt::WindowFlags wflags = Qt::Window);
~FQTermWindow();
void connectHost();