(0.2.1 RC)

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@83 b624d157-de02-0410-bad0-e51aec6abb33

src/lib/AutoType.h

@@ -24,14 +24,14 @@
 #include <QObject>
 #include <QWidget>
 #include <QString>
-//#ifdef Q_WS_X11
+#ifdef Q_WS_X11
 	#define XK_MISCELLANY
 	#define XK_XKB_KEYS
 	#define XK_3270
 	#include <X11/extensions/XTest.h>
 	#include <X11/keysymdef.h>
 	#include <X11/Xlib.h>
-//#endif
+#endif
 #include "Database.h"
 
 typedef struct tKeysymMap{
@@ -44,7 +44,7 @@ public:
  static QWidget* MainWin;
  static void perform(CEntry* entry,QString& errors);
 private:
-//#ifdef Q_WS_X11
+#ifdef Q_WS_X11
  static tKeysymMap KeysymMap[];
  static quint16 getKeysym(const QChar& unicode);
  static int getModifiers(Display*,KeySym,int);
@@ -52,7 +52,7 @@ private:
  static void releaseModifiers(Display*,int);
  static void templateToKeysyms(const QString& Template, QList<quint16>& KeySymList,CEntry* entry);
  static void stringToKeysyms(const QString& string,QList<quint16>& KeySymList);
-//#endif
+#endif
 
 
 

src/lib/AutoType_X11.cpp

@@ -22,9 +22,12 @@
 #include <QList>
 #include <QChar>
 
-
 QWidget* AutoType::MainWin=NULL; 
 
+
+#ifdef Q_WS_X11
+
+
 int AutoType::getModifiers(Display *d,KeySym keysym, int keycode){
 int SymsPerKey;
 KeySym* Syms=XGetKeyboardMapping(d,keycode,1,&SymsPerKey);
@@ -1149,3 +1152,11 @@ for(int i=0; i<MapSize;i++){
 //Q_ASSERT(false);
 return 0;
 }
+
+#endif // X11
+
+#ifdef Q_WS_MAC
+void AutoType::perform(CEntry* entry, QString& err){
+QMessageBox::warnig(NULL,"AutoType","Sorry, but Auto-Type does not work under Mac OS X yet.","OK");
+}
+#endif

src/lib/GroupView.h

@@ -32,7 +32,6 @@ class KeepassGroupView:public QTreeWidget{
 Q_OBJECT
 public:
  KeepassGroupView(QWidget* parent=0);
- void updateItems();
  bool isSearchResultGroup(GroupViewItem* item);
  void selectSearchGroup();
  Database *db;
@@ -41,6 +40,9 @@ public:
  QMenu *ContextMenu;
  QMenu *ContextMenuSearchGroup;
 
+public slots:
+ void updateItems();
+
 signals:
  void fileModified();
  void entryDropped();