-rw-r--r-- | noncore/net/opieirc/config.in | 2 | ||||
-rw-r--r-- | noncore/net/opieirc/ircsettings.cpp | 6 | ||||
-rw-r--r-- | noncore/net/opieirc/ircsettings.h | 16 | ||||
-rw-r--r-- | noncore/net/opieirc/main.cpp | 3 | ||||
-rw-r--r-- | noncore/net/opieirc/opieirc.pro | 2 |
5 files changed, 17 insertions, 12 deletions
diff --git a/noncore/net/opieirc/config.in b/noncore/net/opieirc/config.in index 7c6949d..38fa347 100644 --- a/noncore/net/opieirc/config.in +++ b/noncore/net/opieirc/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config OPIEIRC | 1 | config OPIEIRC |
2 | boolean "opie-irc (chat via your favorite IRC server)" | 2 | boolean "opie-irc (chat via your favorite IRC server)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIEUI2 && LIBQTAUX |
diff --git a/noncore/net/opieirc/ircsettings.cpp b/noncore/net/opieirc/ircsettings.cpp index f69d2c4..13fcc24 100644 --- a/noncore/net/opieirc/ircsettings.cpp +++ b/noncore/net/opieirc/ircsettings.cpp | |||
@@ -3,14 +3,16 @@ | |||
3 | #include "irctab.h" | 3 | #include "irctab.h" |
4 | 4 | ||
5 | /* OPIE */ | 5 | /* OPIE */ |
6 | #include <opie/ocolorbutton.h> | 6 | #include <opie2/ocolorbutton.h> |
7 | #include <opie/otabwidget.h> | 7 | #include <opie2/otabwidget.h> |
8 | #include <qpe/qpeapplication.h> | 8 | #include <qpe/qpeapplication.h> |
9 | 9 | ||
10 | /* QT */ | 10 | /* QT */ |
11 | #include <qvalidator.h> | 11 | #include <qvalidator.h> |
12 | #include <qwhatsthis.h> | 12 | #include <qwhatsthis.h> |
13 | 13 | ||
14 | using namespace Opie; | ||
15 | using namespace Opie::Ui; | ||
14 | IRCSettings::IRCSettings(QWidget* parent, const char* name, bool modal, WFlags) : QDialog(parent, name, modal, WStyle_ContextHelp) | 16 | IRCSettings::IRCSettings(QWidget* parent, const char* name, bool modal, WFlags) : QDialog(parent, name, modal, WStyle_ContextHelp) |
15 | { | 17 | { |
16 | setCaption(tr("Settings") ); | 18 | setCaption(tr("Settings") ); |
diff --git a/noncore/net/opieirc/ircsettings.h b/noncore/net/opieirc/ircsettings.h index cb8d896..56e667b 100644 --- a/noncore/net/opieirc/ircsettings.h +++ b/noncore/net/opieirc/ircsettings.h | |||
@@ -25,7 +25,9 @@ | |||
25 | #include <qdialog.h> | 25 | #include <qdialog.h> |
26 | #include <qlineedit.h> | 26 | #include <qlineedit.h> |
27 | 27 | ||
28 | namespace Opie { | ||
28 | class OColorButton; | 29 | class OColorButton; |
30 | } | ||
29 | 31 | ||
30 | class IRCSettings : public QDialog { | 32 | class IRCSettings : public QDialog { |
31 | Q_OBJECT | 33 | Q_OBJECT |
@@ -36,13 +38,13 @@ protected slots: | |||
36 | void accept(); | 38 | void accept(); |
37 | protected: | 39 | protected: |
38 | Config *m_config; | 40 | Config *m_config; |
39 | OColorButton *m_background; | 41 | Opie::OColorButton *m_background; |
40 | OColorButton *m_text; | 42 | Opie::OColorButton *m_text; |
41 | OColorButton *m_error; | 43 | Opie::OColorButton *m_error; |
42 | OColorButton *m_self; | 44 | Opie::OColorButton *m_self; |
43 | OColorButton *m_server; | 45 | Opie::OColorButton *m_server; |
44 | OColorButton *m_other; | 46 | Opie::OColorButton *m_other; |
45 | OColorButton *m_notification; | 47 | Opie::OColorButton *m_notification; |
46 | QLineEdit *m_lines; | 48 | QLineEdit *m_lines; |
47 | }; | 49 | }; |
48 | 50 | ||
diff --git a/noncore/net/opieirc/main.cpp b/noncore/net/opieirc/main.cpp index da38024..f3cbecc 100644 --- a/noncore/net/opieirc/main.cpp +++ b/noncore/net/opieirc/main.cpp | |||
@@ -1,6 +1,7 @@ | |||
1 | #include "mainwindow.h" | 1 | #include "mainwindow.h" |
2 | 2 | ||
3 | #include <opie/oapplicationfactory.h> | 3 | #include <opie2/oapplicationfactory.h> |
4 | 4 | ||
5 | 5 | ||
6 | using namespace Opie::Core; | ||
6 | OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) | 7 | OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) |
diff --git a/noncore/net/opieirc/opieirc.pro b/noncore/net/opieirc/opieirc.pro index 537f810..9039ff8 100644 --- a/noncore/net/opieirc/opieirc.pro +++ b/noncore/net/opieirc/opieirc.pro | |||
@@ -18,7 +18,7 @@ SOURCES = ircchannel.cpp ircconnection.cpp \ | |||
18 | ircquerytab.cpp ircsettings.cpp ircmisc.cpp | 18 | ircquerytab.cpp ircsettings.cpp ircmisc.cpp |
19 | INCLUDEPATH += $(OPIEDIR)/include | 19 | INCLUDEPATH += $(OPIEDIR)/include |
20 | DEPENDPATH+= $(OPIEDIR)/include | 20 | DEPENDPATH+= $(OPIEDIR)/include |
21 | LIBS += -lqpe -lopie | 21 | LIBS += -lqpe -lopieui2 -lqtaux2 |
22 | 22 | ||
23 | TARGET= opieirc | 23 | TARGET= opieirc |
24 | 24 | ||