history functionality, tabs switch colors, extended settings dialog

16 files changed, 186 insertions, 66 deletions

diff --git a/noncore/net/opieirc/ircchanneltab.cpp b/noncore/net/opieirc/ircchanneltab.cpp
index ddd6cf1..f19e019 100644
--- a/noncore/net/opieirc/ircchanneltab.cpp
+++ b/noncore/net/opieirc/ircchanneltab.cpp
@@ -2,4 +2,5 @@
 #include <qpe/resource.h>
 #include <qcursor.h>
+#include <stdio.h>
 #include <qhbox.h>
 #include "ircchanneltab.h"
@@ -23,9 +24,11 @@ IRCChannelTab::IRCChannelTab(IRCChannel *channel, IRCServerTab *parentTab, MainW
     m_list->update();
     m_list->setMaximumWidth(LISTWIDTH);
-    m_field = new QLineEdit(this);
+    m_field = new IRCHistoryLineEdit(this);
     m_popup = new QPopupMenu(m_list);
+    m_lines = 0;
     /* Required so that embedded-style "right" clicks work */
     QPEApplication::setStylusOperation(m_list->viewport(), QPEApplication::RightOnHold);
     connect(m_list, SIGNAL(mouseButtonPressed(int, QListBoxItem *, const QPoint&)), this, SLOT(mouseButtonPressed(int, QListBoxItem *, const QPoint &)));
+
     /* Construct the popup menu */
     QPopupMenu *ctcpMenu = new QPopupMenu(m_list);
@@ -46,5 +49,14 @@ IRCChannelTab::IRCChannelTab(IRCChannel *channel, IRCServerTab *parentTab, MainW
 void IRCChannelTab::appendText(QString text) {
     /* not using append because it creates layout problems */
-    m_textview->setText(m_textview->text() + text);
+    QString txt = m_textview->text() + text + "\n";
+    if (m_maxLines > 0 && m_lines >= m_maxLines) {
+        int firstBreak = txt.find('\n');
+        if (firstBreak != -1) {
+            txt = "<qt bgcolor=\"" + m_backgroundColor + "\"/>" + txt.right(txt.length() - (firstBreak + 1));
+        }
+    } else {
+        m_lines++;
+    }
+    m_textview->setText(txt);
     m_textview->ensureVisible(0, m_textview->contentsHeight());
     emit changed(this);
@@ -77,4 +89,5 @@ void IRCChannelTab::processCommand() {
 void IRCChannelTab::settingsChanged() {
     m_textview->setText("<qt bgcolor=\"" + m_backgroundColor + "\"/>");
+    m_lines = 0;
 }
 
diff --git a/noncore/net/opieirc/ircchanneltab.h b/noncore/net/opieirc/ircchanneltab.h
index 971614b..a03ee3e 100644
--- a/noncore/net/opieirc/ircchanneltab.h
+++ b/noncore/net/opieirc/ircchanneltab.h
@@ -26,4 +26,5 @@
 #include "irctab.h"
 #include "ircsession.h"
+#include "ircmisc.h"
 #include "mainwindow.h"
 #include "ircchannellist.h"
@@ -57,13 +58,14 @@ protected slots:
     void popupWhois();
 protected:
-    IRCServerTab   *m_parentTab;
-    IRCChannel     *m_channel;
-    IRCChannelList *m_list;
-    QPushButton    *m_listButton;
-    MainWindow     *m_mainWindow;
-    QTextView      *m_textview;
-    QLineEdit      *m_field;
-    QPopupMenu     *m_popup;
-    bool            m_listVisible;
+    IRCServerTab       *m_parentTab;
+    IRCChannel         *m_channel;
+    IRCChannelList     *m_list;
+    QPushButton        *m_listButton;
+    MainWindow         *m_mainWindow;
+    QTextView          *m_textview;
+    IRCHistoryLineEdit *m_field;
+    QPopupMenu         *m_popup;
+    bool                m_listVisible;
+    int                 m_lines;
 };
 
diff --git a/noncore/net/opieirc/ircmessageparser.cpp b/noncore/net/opieirc/ircmessageparser.cpp
index a95c64e..e8d3b1a 100644
--- a/noncore/net/opieirc/ircmessageparser.cpp
+++ b/noncore/net/opieirc/ircmessageparser.cpp
@@ -518,4 +518,4 @@ void IRCMessageParser::parseNumericalTopic(IRCMessage *message) {
 }
 
-void IRCMessageParser::parseNumericalTopicWhoTime(IRCMessage *message) {
+void IRCMessageParser::parseNumericalTopicWhoTime(IRCMessage *) {
 }
diff --git a/noncore/net/opieirc/ircmisc.cpp b/noncore/net/opieirc/ircmisc.cpp
index dd7292c..2e7f316 100644
--- a/noncore/net/opieirc/ircmisc.cpp
+++ b/noncore/net/opieirc/ircmisc.cpp
@@ -31,19 +31,22 @@ QColor IRCFramedColorLabel::color() {
 }
 
+
 IRCTabBar::IRCTabBar(QWidget *parent, const char *name) : QTabBar(parent, name) {
 }
 
 int IRCTabBar::insertTab(QTab *tab, int index = -1) {
-    if (m_colors.size() == (unsigned int)count())
-        m_colors.resize(m_colors.size() * 2 + 1);
-    if (index == -1)
-        m_colors.insert(count(), &black);
-    else
-        m_colors.insert(index, &black);
-    return QTabBar::insertTab(tab, index);
+    /* FIXME: find some nicer way to do this */
+    QExtTab *ext = new QExtTab();
+    ext->color = black;
+    ext->label = tab->text();
+    ext->r = tab->rect();
+    ext->enabled = tab->isEnabled();
+    ext->iconset = tab->iconSet();
+    delete tab;
+    return QTabBar::insertTab(ext, index);
 }
 
-void IRCTabBar::setTabColor(int index, const QColor *color) {
-    m_colors.insert(index, color);
+void IRCTabBar::setTabColor(int index, QColor color) {
+    ((QExtTab *)tab(index))->color = color;
     update();
 }
@@ -54,5 +57,5 @@ void IRCTabBar::paintLabel(QPainter* p, const QRect& br, QTab* t, bool focus) co
     if (t->id == currentTab())
         r.setBottom(r.bottom() - style().defaultFrameWidth());
-    p->setPen(*m_colors.at(t->id));
+    p->setPen(((QExtTab *)t)->color);
     p->drawText(r, AlignCenter | ShowPrefix, t->label);
 }
@@ -62,5 +65,33 @@ IRCTabWidget::IRCTabWidget(QWidget *parent, const char *name) : QTabWidget(paren
 }
 
-void IRCTabWidget::setTabColor(int index, const QColor *color) {
+void IRCTabWidget::setTabColor(int index, QColor color) {
     ((IRCTabBar *)tabBar())->setTabColor(index, color);
 }
+
+
+IRCHistoryLineEdit::IRCHistoryLineEdit(QWidget *parent, const char *name) : QLineEdit(parent, name) {
+    m_index = -1;
+}
+
+void IRCHistoryLineEdit::keyPressEvent(QKeyEvent *event) {
+    int key = event->key();
+    if (key == Key_Up) {
+        if (m_history.count() > 0 && m_index < (signed int)m_history.count()-1) {
+            m_index++;
+            setText(m_history[m_index]);
+        }
+    } else if (key == Key_Down) {
+        if (m_history.count() > 0 && m_index > 0) {
+            m_index--;
+            setText(m_history[m_index]);
+        }
+        if (m_index == 0) {
+            m_index = -1;
+            setText("");
+        }
+    } else if (key == Key_Return) {
+        m_history.prepend(text());
+        m_index = -1;
+    }
+    QLineEdit::keyPressEvent(event);
+}
diff --git a/noncore/net/opieirc/ircmisc.h b/noncore/net/opieirc/ircmisc.h
index 4df6ce0..7151e6b 100644
--- a/noncore/net/opieirc/ircmisc.h
+++ b/noncore/net/opieirc/ircmisc.h
@@ -23,8 +23,9 @@
 
 #include <qtabwidget.h>
+#include <qlineedit.h>
 #include <qtabbar.h>
 #include <qlabel.h>
 #include <qcolor.h>
-#include <qvector.h>
+#include <qarray.h>
 
 /* IRCFramedColorLabel is used to display a color */
@@ -51,9 +52,14 @@ protected:
 /* Custom colored QTabWidget */
 
+class QExtTab : public QTab {
+public:
+    QColor color;
+};
+
 class IRCTabWidget : public QTabWidget {
     Q_OBJECT
 public:
     IRCTabWidget(QWidget *parent = 0, const char *name = 0);
-    void setTabColor(int index, const QColor *color);
+    void setTabColor(int index, QColor color);
 };
 
@@ -62,10 +68,23 @@ class IRCTabBar : public QTabBar {
 public:
     IRCTabBar(QWidget *parent = 0, const char *name = 0);
-    void setTabColor(int index, const QColor *color);
+    void setTabColor(int index, QColor color);
 protected:
     void paintLabel(QPainter*, const QRect&, QTab*, bool) const;
     int insertTab(QTab *, int index = -1);
 protected:
-    QVector<QColor> m_colors;
+    QArray<QColor> m_colors;
+};
+
+/* A QLineEdit with history functionality */
+
+class IRCHistoryLineEdit : public QLineEdit {
+    Q_OBJECT
+public:
+    IRCHistoryLineEdit(QWidget *parent = 0, const char *name = 0);
+protected:
+    void keyPressEvent(QKeyEvent *);
+protected:
+    QStringList m_history;
+    int         m_index;
 };
 
diff --git a/noncore/net/opieirc/ircquerytab.cpp b/noncore/net/opieirc/ircquerytab.cpp
index b946174..869e4f7 100644
--- a/noncore/net/opieirc/ircquerytab.cpp
+++ b/noncore/net/opieirc/ircquerytab.cpp
@@ -6,4 +6,5 @@ IRCQueryTab::IRCQueryTab(IRCPerson *person, IRCServerTab *parentTab, MainWindow
     m_mainWindow = mainWindow;
     m_parentTab = parentTab;
+    m_lines = 0;
     m_person = new IRCPerson(*person); /* We need this (the person might sign off and the original IRCPerson gets deleted) */
     m_description->setText(tr("Talking to ") + " <b>" + person->nick() + "</b>");
@@ -13,5 +14,5 @@ IRCQueryTab::IRCQueryTab(IRCPerson *person, IRCServerTab *parentTab, MainWindow
     m_textview->setVScrollBarMode(QScrollView::AlwaysOn);
     m_textview->setTextFormat(RichText);
-    m_field = new QLineEdit(this);
+    m_field = new IRCHistoryLineEdit(this);
     m_layout->add(hbox);
     hbox->show();
@@ -24,5 +25,14 @@ IRCQueryTab::IRCQueryTab(IRCPerson *person, IRCServerTab *parentTab, MainWindow
 void IRCQueryTab::appendText(QString text) {
     /* not using append because it creates layout problems */
-    m_textview->setText(m_textview->text() + text);
+    QString txt = m_textview->text() + text + "\n";
+    if (m_maxLines > 0 && m_lines >= m_maxLines) {
+        int firstBreak = txt.find('\n');
+        if (firstBreak != -1) {
+            txt = "<qt bgcolor=\"" + m_backgroundColor + "\"/>" + txt.right(txt.length() - (firstBreak + 1));
+        }
+    } else {
+        m_lines++;
+    }
+    m_textview->setText(txt);
     m_textview->ensureVisible(0, m_textview->contentsHeight());
     emit changed(this);
@@ -64,4 +74,5 @@ void IRCQueryTab::display(IRCOutput output) {
 void IRCQueryTab::settingsChanged() {
     m_textview->setText("<qt bgcolor=\"" + m_backgroundColor + "\"/>");
+    m_lines = 0;
 }
 
diff --git a/noncore/net/opieirc/ircquerytab.h b/noncore/net/opieirc/ircquerytab.h
index 07fa57f..f9cc8e1 100644
--- a/noncore/net/opieirc/ircquerytab.h
+++ b/noncore/net/opieirc/ircquerytab.h
@@ -22,6 +22,7 @@
 #define __IRCQUERYTAB_H
 
-#include "ircsession.h"
 #include "mainwindow.h"
+#include "ircsession.h"
+#include "ircmisc.h"
 
 class IRCServerTab;
@@ -47,5 +48,6 @@ protected:
     IRCPerson            *m_person;
     QTextView            *m_textview;
-    QLineEdit            *m_field;
+    IRCHistoryLineEdit   *m_field;
+    int                   m_lines;
 };
 
diff --git a/noncore/net/opieirc/ircservertab.cpp b/noncore/net/opieirc/ircservertab.cpp
index 4ed5364..5d1e290 100644
--- a/noncore/net/opieirc/ircservertab.cpp
+++ b/noncore/net/opieirc/ircservertab.cpp
@@ -8,4 +8,5 @@ IRCServerTab::IRCServerTab(IRCServer server, MainWindow *mainWindow, QWidget *pa
     m_mainWindow = mainWindow;
     m_close = FALSE;
+    m_lines = 0;
     m_description->setText(tr("Connection to")+" <b>" + server.hostname() + ":" + QString::number(server.port()) + "</b>");
     m_textview = new QTextView(this);
@@ -14,5 +15,5 @@ IRCServerTab::IRCServerTab(IRCServer server, MainWindow *mainWindow, QWidget *pa
     m_textview->setTextFormat(RichText);
     m_layout->add(m_textview);
-    m_field = new QLineEdit(this);
+    m_field = new IRCHistoryLineEdit(this);
     m_layout->add(m_field);
     connect(m_field, SIGNAL(returnPressed()), this, SLOT(processCommand()));
@@ -24,5 +25,14 @@ IRCServerTab::IRCServerTab(IRCServer server, MainWindow *mainWindow, QWidget *pa
 void IRCServerTab::appendText(QString text) {
     /* not using append because it creates layout problems */
-    m_textview->setText(m_textview->text() + text);
+    QString txt = m_textview->text() + text + "\n";
+    if (m_maxLines > 0 && m_lines >= m_maxLines) {
+        int firstBreak = txt.find('\n');
+        if (firstBreak != -1) {
+            txt = "<qt bgcolor=\"" + m_backgroundColor + "\"/>" + txt.right(txt.length() - (firstBreak + 1));
+        }
+    } else {
+        m_lines++;
+    }
+    m_textview->setText(txt);
     m_textview->ensureVisible(0, m_textview->contentsHeight());
     emit changed(this);
@@ -59,4 +69,5 @@ IRCServer *IRCServerTab::server() {
 void IRCServerTab::settingsChanged() {
     m_textview->setText("<qt bgcolor=\"" + m_backgroundColor + "\"/>");
+    m_lines = 0;
 }
 
diff --git a/noncore/net/opieirc/ircservertab.h b/noncore/net/opieirc/ircservertab.h
index 698689a..8d24cba 100644
--- a/noncore/net/opieirc/ircservertab.h
+++ b/noncore/net/opieirc/ircservertab.h
@@ -27,4 +27,5 @@
 #include "ircchanneltab.h"
 #include "ircquerytab.h"
+#include "ircmisc.h"
 
 class IRCServerTab : public IRCTab {
@@ -59,4 +60,5 @@ protected slots:
     void display(IRCOutput output);
 protected:
+    int                   m_lines;
     bool                  m_close;
     IRCServer             m_server;
@@ -64,5 +66,5 @@ protected:
     MainWindow           *m_mainWindow;
     QTextView            *m_textview;
-    QLineEdit            *m_field;
+    IRCHistoryLineEdit   *m_field;
     /* Channel tabs associated with this server tab */
     QList<IRCChannelTab>  m_channelTabs;
diff --git a/noncore/net/opieirc/ircsettings.cpp b/noncore/net/opieirc/ircsettings.cpp
index d1fef67..1903e87 100644
--- a/noncore/net/opieirc/ircsettings.cpp
+++ b/noncore/net/opieirc/ircsettings.cpp
@@ -1,42 +1,64 @@
 #include <qlayout.h>
+#include <qvalidator.h>
+#include <qscrollview.h>
 #include "ircsettings.h"
 #include "irctab.h"
 #include "ircmisc.h"
-#include <stdio.h>
 
 IRCSettings::IRCSettings(QWidget* parent, const char* name, bool modal, WFlags f) : QDialog(parent, name, modal, f) {
+    setCaption("Settings");
     m_config = new Config("OpieIRC");
     m_config->setGroup("OpieIRC");
-    
-    setCaption("Settings");
-    QGridLayout *layout = new QGridLayout(this, 7, 2, 5, 0);
-    QLabel *label = new QLabel(tr("Background color :"), this);
+    QHBoxLayout *l = new QHBoxLayout(this, 2, 2);
+    QTabWidget *tw = new QTabWidget(this);
+    l->addWidget(tw);
+    /* General Configuration */
+    QWidget *widget = new QWidget(tw);
+    QGridLayout *layout = new QGridLayout(widget, 1, 2, 5, 0);
+    QLabel *label = new QLabel(tr("Lines displayed :"), widget);
+    layout->addWidget(label, 0, 0);
+    m_lines = new QLineEdit(m_config->readEntry("Lines", "100"), widget);
+    QIntValidator *validator = new QIntValidator(this);
+    validator->setTop(10000);
+    validator->setBottom(0);
+    m_lines->setValidator(validator);
+    layout->addWidget(m_lines, 0, 1);
+    tw->addTab(widget, tr("General"));
+
+    /* Color configuration */
+    QScrollView *view = new QScrollView(tw);
+    view->setResizePolicy(QScrollView::AutoOneFit);
+    widget = new QWidget(view->viewport());
+    view->addChild(widget);
+    layout = new QGridLayout(widget, 7, 2, 5, 0);
+    label = new QLabel(tr("Background color :"), widget);
     layout->addWidget(label, 0, 0);
-    m_background = new IRCFramedColorLabel(QColor(m_config->readEntry("BackgroundColor", "#FFFFFF")), this);
+    m_background = new IRCFramedColorLabel(QColor(m_config->readEntry("BackgroundColor", "#FFFFFF")), widget);
     layout->addWidget(m_background, 0, 1);
-    label = new QLabel(tr("Normal text color :"), this);
+    label = new QLabel(tr("Normal text color :"), widget);
     layout->addWidget(label, 1, 0);
-    m_text = new IRCFramedColorLabel(m_config->readEntry("TextColor", "#000000"), this);
+    m_text = new IRCFramedColorLabel(m_config->readEntry("TextColor", "#000000"), widget);
     layout->addWidget(m_text, 1, 1);
-    label = new QLabel(tr("Error color :"), this);
+    label = new QLabel(tr("Error color :"), widget);
     layout->addWidget(label, 2, 0);
-    m_error = new IRCFramedColorLabel(m_config->readEntry("ErrorColor", "#FF0000"), this);
+    m_error = new IRCFramedColorLabel(m_config->readEntry("ErrorColor", "#FF0000"), widget);
     layout->addWidget(m_error, 2, 1);
-    label = new QLabel(tr("Text written by yourself :"), this);
+    label = new QLabel(tr("Text written by yourself :"), widget);
     layout->addWidget(label, 3, 0);
-    m_self = new IRCFramedColorLabel(m_config->readEntry("SelfColor", "#CC0000"), this);
+    m_self = new IRCFramedColorLabel(m_config->readEntry("SelfColor", "#CC0000"), widget);
     layout->addWidget(m_self, 3, 1);
-    label = new QLabel(tr("Text written by others :"), this);
+    label = new QLabel(tr("Text written by others :"), widget);
     layout->addWidget(label, 4, 0);
-    m_other = new IRCFramedColorLabel(m_config->readEntry("OtherColor", "#0000BB"), this);
+    m_other = new IRCFramedColorLabel(m_config->readEntry("OtherColor", "#0000BB"), widget);
     layout->addWidget(m_other, 4, 1);
-    label = new QLabel(tr("Text written by the server :"), this);
+    label = new QLabel(tr("Text written by the server :"), widget);
     layout->addWidget(label, 5, 0);
-    m_server = new IRCFramedColorLabel(m_config->readEntry("ServerColor", "#0000FF"), this);
+    m_server = new IRCFramedColorLabel(m_config->readEntry("ServerColor", "#0000FF"), widget);
     layout->addWidget(m_server, 5, 1);
-    label = new QLabel(tr("Notifications :"), this);
+    label = new QLabel(tr("Notifications :"), widget);
     layout->addWidget(label, 6, 0);
-    m_notification = new IRCFramedColorLabel(m_config->readEntry("NotificationColor", "#AAE300"), this);
+    m_notification = new IRCFramedColorLabel(m_config->readEntry("NotificationColor", "#AAE300"), widget);
     layout->addWidget(m_notification, 6, 1);
+    tw->addTab(view, tr("Colors"));
     showMaximized();
 }
@@ -57,4 +79,5 @@ void IRCSettings::accept() {
     IRCTab::m_serverColor = getColorString(m_server);
     IRCTab::m_notificationColor = getColorString(m_notification);
+    IRCTab::m_maxLines = m_lines->text().toInt();
     m_config->writeEntry("BackgroundColor", getColorString(m_background));
     m_config->writeEntry("TextColor", getColorString(m_text));
@@ -64,4 +87,5 @@ void IRCSettings::accept() {
     m_config->writeEntry("ServerColor", getColorString(m_server));
     m_config->writeEntry("NotificationColor", getColorString(m_notification));
+    m_config->writeEntry("Lines", m_lines->text());
     QDialog::accept();
 }
diff --git a/noncore/net/opieirc/ircsettings.h b/noncore/net/opieirc/ircsettings.h
index 1d3aeb7..190abaf 100644
--- a/noncore/net/opieirc/ircsettings.h
+++ b/noncore/net/opieirc/ircsettings.h
@@ -24,4 +24,5 @@
 #include <qpe/config.h>
 #include <qdialog.h>
+#include <qlineedit.h>
 
 class IRCSettings : public QDialog {
@@ -34,12 +35,13 @@ protected slots:
     void accept();
 protected:
-    Config  *m_config;
-    QWidget *m_background;
-    QWidget *m_text;
-    QWidget *m_error;
-    QWidget *m_self;
-    QWidget *m_server;
-    QWidget *m_other;
-    QWidget *m_notification;
+    Config    *m_config;
+    QWidget   *m_background;
+    QWidget   *m_text;
+    QWidget   *m_error;
+    QWidget   *m_self;
+    QWidget   *m_server;
+    QWidget   *m_other;
+    QWidget   *m_notification;
+    QLineEdit *m_lines;
 };
 
diff --git a/noncore/net/opieirc/irctab.cpp b/noncore/net/opieirc/irctab.cpp
index a4dd7e2..0bb9d4c 100644
--- a/noncore/net/opieirc/irctab.cpp
+++ b/noncore/net/opieirc/irctab.cpp
@@ -11,5 +11,5 @@ QString IRCTab::m_selfColor;
 QString IRCTab::m_otherColor;
 QString IRCTab::m_notificationColor;
-
+int IRCTab::m_maxLines;
 
 IRCTab::IRCTab(QWidget *parent, const char *name, WFlags f) : QWidget(parent, name, f) {
diff --git a/noncore/net/opieirc/irctab.h b/noncore/net/opieirc/irctab.h
index e3a1857..7a2d0a2 100644
--- a/noncore/net/opieirc/irctab.h
+++ b/noncore/net/opieirc/irctab.h
@@ -36,4 +36,5 @@ class IRCTab : public QWidget {
 public:
     IRCTab(QWidget *parent = 0, const char *name = 0, WFlags f = 0);
+    /* The ID is required to store the position of this IRCTab inside the IRCTabWidget */
     void setID(int id);
     int id();
@@ -59,4 +60,6 @@ public:
     static QString m_otherColor;
     static QString m_notificationColor;
+    /* Max number of lines to be displayed */
+    static int m_maxLines;
 };
 
diff --git a/noncore/net/opieirc/ircversion.h b/noncore/net/opieirc/ircversion.h
index f0f196e..ec6acfa 100644
--- a/noncore/net/opieirc/ircversion.h
+++ b/noncore/net/opieirc/ircversion.h
@@ -22,5 +22,5 @@
 #define __IRCVERSION_H
 
-#define APP_VERSION "OpieIRC 0.3"
+#define APP_VERSION "OpieIRC 0.4"
 #define APP_COPYSTR "(c) 2002 by Wenzel Jakob"
 
diff --git a/noncore/net/opieirc/mainwindow.cpp b/noncore/net/opieirc/mainwindow.cpp
index fe59c3b..bb03a1c 100644
--- a/noncore/net/opieirc/mainwindow.cpp
+++ b/noncore/net/opieirc/mainwindow.cpp
@@ -37,8 +37,9 @@ void MainWindow::loadSettings() {
     IRCTab::m_serverColor = config.readEntry("ServerColor", "#0000FF");
     IRCTab::m_notificationColor = config.readEntry("NotificationColor", "#AA3300");
+    IRCTab::m_maxLines = config.readNumEntry("Lines", 100);
 }
 
 void MainWindow::selected(QWidget *) {
-    m_tabWidget->setTabColor(m_tabWidget->currentPageIndex(), &black);
+    m_tabWidget->setTabColor(m_tabWidget->currentPageIndex(), black);
 }
 
@@ -53,5 +54,5 @@ void MainWindow::addTab(IRCTab *tab) {
 void MainWindow::changeEvent(IRCTab *tab) {
     if (tab->id() != m_tabWidget->currentPageIndex())
-        m_tabWidget->setTabColor(tab->id(), &blue);
+        m_tabWidget->setTabColor(tab->id(), blue);
 }
 
diff --git a/noncore/net/opieirc/opie-irc.control b/noncore/net/opieirc/opie-irc.control
index 9e93991..aada957 100644
--- a/noncore/net/opieirc/opie-irc.control
+++ b/noncore/net/opieirc/opie-irc.control
@@ -6,4 +6,3 @@ Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
-Description: The Opie IRC client lets you chat on your favorite
-    IRC server using your zaurus or ipaq
+Description: The Opie IRC client lets you chat on your favorite IRC server using your handheld computer