Moving InputLine (ex-ChannelWidgetInput) to uisupport, since we'll need

it in QuasselTopia as well. Oh, and make Quassel compile again.

diff --git a/Quassel.kdevelop.filelist b/Quassel.kdevelop.filelist
index 8defbdb..4797cc9 100644 (file)
--- a/Quassel.kdevelop.filelist
+++ b/Quassel.kdevelop.filelist
@@ -197,8 +197,12 @@ src/uisupport/bufferview.cpp
 src/uisupport/bufferview.h
 src/uisupport/bufferviewfilter.cpp
 src/uisupport/bufferviewfilter.h
+src/uisupport/inputline.cpp
+src/uisupport/inputline.h
 src/uisupport/nickview.cpp
 src/uisupport/nickview.h
+src/uisupport/tabcompleter.cpp
+src/uisupport/tabcompleter.h
 src/uisupport/uistyle.cpp
 src/uisupport/uistyle.h
 src/uisupport/uisupport.pri

diff --git a/src/qtui/guisettings.h b/src/qtui/guisettings.h
index a34f57b..ba74115 100644 (file)
--- a/src/qtui/guisettings.h
+++ b/src/qtui/guisettings.h
@@ -24,7 +24,6 @@
 #include "clientsettings.h"
 
 class GuiSettings : public ClientSettings {
-  Q_OBJECT
 
   public:
     GuiSettings();
@@ -33,7 +32,6 @@ class GuiSettings : public ClientSettings {
 };
 
 class GuiProfile : public ClientSettings {
-  Q_OBJECT
 
   public:
     GuiProfile();

diff --git a/src/qtui/qtui.pri b/src/qtui/qtui.pri
index 4698119..948b237 100644 (file)
--- a/src/qtui/qtui.pri
+++ b/src/qtui/qtui.pri
@@ -1,14 +1,14 @@
 DEPMOD = uisupport common client
 QT_MOD = core gui network
 
-SRCS += bufferwidget.cpp channelwidgetinput.cpp chatline-old.cpp \
+SRCS += bufferwidget.cpp chatline-old.cpp \
         chatwidget.cpp coreconnectdlg.cpp configwizard.cpp \
         guisettings.cpp identities.cpp mainwin.cpp nicklistwidget.cpp qtui.cpp qtuistyle.cpp serverlist.cpp settingsdlg.cpp \
-        tabcompleter.cpp topicwidget.cpp
+        topicwidget.cpp
 
-HDRS += bufferwidget.h channelwidgetinput.h chatline-old.h chatwidget.h configwizard.h \
+HDRS += bufferwidget.h chatline-old.h chatwidget.h configwizard.h \
         coreconnectdlg.h guisettings.h identities.h mainwin.h nicklistwidget.h qtui.h qtuistyle.h serverlist.h settingsdlg.h \
-        settingspage.h tabcompleter.h topicwidget.h
+        settingspage.h topicwidget.h
 
 FORMNAMES = identitiesdlg.ui identitieseditdlg.ui networkeditdlg.ui mainwin.ui nickeditdlg.ui serverlistdlg.ui \
             servereditdlg.ui coreconnectdlg.ui bufferviewwidget.ui bufferwidget.ui nicklistwidget.ui settingsdlg.ui \

diff --git a/src/qtui/ui/bufferwidget.ui b/src/qtui/ui/bufferwidget.ui
index f62031e..fd14610 100644 (file)
--- a/src/qtui/ui/bufferwidget.ui
+++ b/src/qtui/ui/bufferwidget.ui
@@ -149,7 +149,7 @@ p, li { white-space: pre-wrap; }
       </widget>
      </item>
      <item>
-      <widget class="ChannelWidgetInput" name="inputEdit" >
+      <widget class="InputLine" name="inputEdit" >
        <property name="sizePolicy" >
         <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
          <horstretch>0</horstretch>
@@ -164,9 +164,9 @@ p, li { white-space: pre-wrap; }
  </widget>
  <customwidgets>
   <customwidget>
-   <class>ChannelWidgetInput</class>
+   <class>InputLine</class>
    <extends>QLineEdit</extends>
-   <header>channelwidgetinput.h</header>
+   <header>inputline.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>

diff --git a/src/qtui/channelwidgetinput.cpp b/src/uisupport/inputline.cpp
similarity index 87%
rename from src/qtui/channelwidgetinput.cpp
rename to src/uisupport/inputline.cpp
index 5ee0daa..535b3c2 100644 (file)
--- a/src/qtui/channelwidgetinput.cpp
+++ b/src/uisupport/inputline.cpp
@@ -18,22 +18,22 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include "channelwidgetinput.h"
+#include "inputline.h"
 
 #include "tabcompleter.h"
 
-ChannelWidgetInput::ChannelWidgetInput(QWidget *parent) : QLineEdit(parent) {
+InputLine::InputLine(QWidget *parent) : QLineEdit(parent) {
   idx = 0;
   connect(this, SIGNAL(returnPressed()), this, SLOT(enter()));
   tabComplete = new TabCompleter(this);
   connect(this, SIGNAL(nickListUpdated(QStringList)), tabComplete, SLOT(updateNickList(QStringList)));
 }
 
-ChannelWidgetInput::~ChannelWidgetInput() {
+InputLine::~InputLine() {
   delete tabComplete;
 }
 
-void ChannelWidgetInput::keyPressEvent(QKeyEvent * event) {
+void InputLine::keyPressEvent(QKeyEvent * event) {
   if(event->key() == Qt::Key_Tab) { // Tabcomplete
     tabComplete->complete();
     event->accept();
@@ -53,7 +53,7 @@ void ChannelWidgetInput::keyPressEvent(QKeyEvent * event) {
   }
 }
 
-bool ChannelWidgetInput::event(QEvent *e) {
+bool InputLine::event(QEvent *e) {
   if(e->type() == QEvent::KeyPress) {
     keyPressEvent(dynamic_cast<QKeyEvent*>(e));
     return true;
@@ -61,12 +61,12 @@ bool ChannelWidgetInput::event(QEvent *e) {
   return QLineEdit::event(e);
 }
 
-void ChannelWidgetInput::enter() {
+void InputLine::enter() {
   history << text();
   idx = history.count();
 }
 
-void ChannelWidgetInput::updateNickList(QStringList l) {
+void InputLine::updateNickList(QStringList l) {
   nickList = l;
   emit nickListUpdated(l);
 }

diff --git a/src/qtui/channelwidgetinput.h b/src/uisupport/inputline.h
similarity index 91%
rename from src/qtui/channelwidgetinput.h
rename to src/uisupport/inputline.h
index 5efebd8..b0d59bd 100644 (file)
--- a/src/qtui/channelwidgetinput.h
+++ b/src/uisupport/inputline.h
@@ -18,19 +18,19 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _CHANNELWIDGETINPUT_H_
-#define _CHANNELWIDGETINPUT_H_
+#ifndef _INPUTLINE_H_
+#define _INPUTLINE_H_
 
 #include <QtGui>
 
 class TabCompleter;
 
-class ChannelWidgetInput : public QLineEdit {
+class InputLine : public QLineEdit {
   Q_OBJECT
 
   public:
-    ChannelWidgetInput(QWidget *parent = 0);
-    ~ChannelWidgetInput();
+    InputLine(QWidget *parent = 0);
+    ~InputLine();
     
   protected:
     virtual bool event(QEvent *);

diff --git a/src/qtui/tabcompleter.cpp b/src/uisupport/tabcompleter.cpp
similarity index 100%
rename from src/qtui/tabcompleter.cpp
rename to src/uisupport/tabcompleter.cpp

diff --git a/src/qtui/tabcompleter.h b/src/uisupport/tabcompleter.h
similarity index 100%
rename from src/qtui/tabcompleter.h
rename to src/uisupport/tabcompleter.h

diff --git a/src/uisupport/uisupport.pri b/src/uisupport/uisupport.pri
index 910bd69..9ed3309 100644 (file)
--- a/src/uisupport/uisupport.pri
+++ b/src/uisupport/uisupport.pri
@@ -1,8 +1,8 @@
 DEPMOD = common client
 QT_MOD = core gui network
 
-SRCS += bufferview.cpp bufferviewfilter.cpp nickview.cpp uistyle.cpp
-HDRS += bufferview.h bufferviewfilter.h nickview.h uistyle.h
+SRCS += bufferview.cpp bufferviewfilter.cpp inputline.cpp nickview.cpp tabcompleter.cpp uistyle.cpp
+HDRS += bufferview.h bufferviewfilter.h inputline.h nickview.h tabcompleter.h uistyle.h
 
 FORMNAMES =