(layout) fixes from zecke (for 0.99)

and some minor things...

1 files changed, 11 insertions, 11 deletions

diff --git a/core/pim/osearch/mainwindow.h b/core/pim/osearch/mainwindow.h
index cba11c5..1f5c4bb 100644
--- a/core/pim/osearch/mainwindow.h
+++ b/core/pim/osearch/mainwindow.h
@@ -13,22 +13,21 @@
 #define MAINWINDOW_H
 
 #include <qmainwindow.h>
-#include <qdialog.h>
-#include <qaction.h>
 #include <qlist.h>
-#include <qtimer.h>
-#include <qpopupmenu.h>
+#include <qmap.h>
 
+class QAction;
 class QPEToolBar;
+class QHBox;
 class QVBoxLayout;
-class QHBoxLayout;
 class QTextView;
 class QFrame;
-class QListViewItem;
 class OListView;
 class OListViewItem;
-class QHButtonGroup;
-
+class QListViewItem;
+class QPopupMenu;
+class QSignalMapper;
+class QTimer;
 class SearchGroup;
 
 class MainWindow : public QMainWindow
@@ -52,20 +51,21 @@ protected slots:
   void stopTimer( QListViewItem* );
   void searchStringChanged();
   void optionChanged(int);
-  
+
 private:
+  QHBox *buttonBox;
+  QMap<int, QButton*> buttonMap;
+  QSignalMapper* signalMapper;
   OListView *resultsList;
   QTextView *richEdit;
   OListViewItem *_currentItem;
   QVBoxLayout *mainLayout;
-  QHBoxLayout *buttonLayout;
   QFrame *detailsFrame;
   QTimer *popupTimer;
   QTimer *searchTimer;
 
   QString _searchString;
   QList<SearchGroup> searches;
-  QHButtonGroup *buttonGroupActions;
   QAction *SearchAllAction;
   QAction *actionCaseSensitiv;
   QAction *actionWildcards;