Merged changes from branch "sput" r50:55 back into trunk.

[quassel.git] / gui / settings.cpp

diff --git a/network/buffer.cpp b/gui/settings.cpp
similarity index 89%
rename from network/buffer.cpp
rename to gui/settings.cpp
index d0b500a..a4efaea 100644 (file)
--- a/network/buffer.cpp
+++ b/gui/settings.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005/06 by The Quassel Team                             *
+ *   Copyright (C) 2005-07 by The Quassel Team                             *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,15 +18,9 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-/* OBSOLETE */
-
-#include "buffer.h"
-/*
-Buffer::Buffer(QString n) {
-  _name = n;
-
+#include "settings.h"
 
+SettingsDlg::SettingsDlg(QWidget *parent) : QDialog(parent) {
+  ui.setupUi(this);
 
 }
-
-*/
\ No newline at end of file