diff options
| author |  Szymon Tomasz Stefanek | 2007-02-20 04:10:04 +0000 |
|---|---|---|
| committer | Szymon Tomasz Stefanek | 2007-02-20 04:10:04 +0000 |
| commit | 9418a51b844c587db96f8c7d27c2b37dffadf5a6 (patch) | |
| tree | a804233844808a54d830c4a57fa5a583f7118a22 /src/modules/channelsjoin | |
| parent | *AUTOMATICALLY* updated KVI_SOURCES_DATE variable (diff) | |
| download | KVIrc-9418a51b844c587db96f8c7d27c2b37dffadf5a6.tar.gz KVIrc-9418a51b844c587db96f8c7d27c2b37dffadf5a6.tar.bz2 KVIrc-9418a51b844c587db96f8c7d27c2b37dffadf5a6.zip | |
More Qt4 port and some small fixes
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@351 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/channelsjoin')
| -rw-r--r-- | src/modules/channelsjoin/channelsjoinwindow.cpp | 13 | ||||
| -rw-r--r-- | src/modules/channelsjoin/channelsjoinwindow.h | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp index 01f4ab52f..00f138597 100644 --- a/src/modules/channelsjoin/channelsjoinwindow.cpp +++ b/src/modules/channelsjoin/channelsjoinwindow.cpp @@ -42,7 +42,12 @@ #include <qlayout.h> #include <qcheckbox.h> #include <qpushbutton.h> -#include <qheader.h> +#ifdef COMPILE_USE_QT4 + #include <q3header.h> +#else + #include <qheader.h> +#endif +#include <qevent.h> extern KviChannelsJoinWindow * g_pChannelsWindow; extern QRect g_rectChannelsJoinGeometry; @@ -69,7 +74,7 @@ KviChannelsJoinWindow::KviChannelsJoinWindow(QWidget * par, const char * name) connect(m_pListView,SIGNAL(doubleClicked(KviTalListViewItem *)),this,SLOT(itemDoubleClicked(KviTalListViewItem *))); - m_pGroupBox = new KviTalGroupBox(2,KviTalGroupBox::Horizontal,__tr2qs("Channel" ),this); + m_pGroupBox = new KviTalGroupBox(2,Qt::Horizontal,__tr2qs("Channel" ),this); QString szMsg = __tr2qs("Name"); szMsg.append(":"); QLabel * l = new QLabel(szMsg,m_pGroupBox); @@ -93,7 +98,11 @@ KviChannelsJoinWindow::KviChannelsJoinWindow(QWidget * par, const char * name) m_pJoinButton->setDefault(true); connect(m_pJoinButton,SIGNAL(clicked()),this,SLOT(joinClicked())); +#ifdef COMPILE_USE_QT4 + g->addMultiCellWidget(m_pJoinButton,2,2,0,1,Qt::AlignHCenter); +#else g->addMultiCellWidget(m_pJoinButton,2,2,0,1,AlignHCenter); +#endif m_pShowAtStartupCheck = new KviStyledCheckBox(__tr2qs("Show this window after connecting"),this); diff --git a/src/modules/channelsjoin/channelsjoinwindow.h b/src/modules/channelsjoin/channelsjoinwindow.h index c2f6df70a..27bf5cddf 100644 --- a/src/modules/channelsjoin/channelsjoinwindow.h +++ b/src/modules/channelsjoin/channelsjoinwindow.h @@ -31,9 +31,9 @@ class KviConsole; class KviTalGroupBox; class QPushButton; -class KviStyledCheckBox; class QLineEdit; +#include "kvi_styled_controls.h" #include "kvi_tal_listview.h" class KviChannelsJoinWindow : public QDialog |