SSH Keys: libopie->libopie2

4 files changed, 4 insertions, 4 deletions

diff --git a/noncore/settings/sshkeys/opie-sshkeys.control b/noncore/settings/sshkeys/opie-sshkeys.control
index 4deccf4..08e3508 100644
--- a/noncore/settings/sshkeys/opie-sshkeys.control
+++ b/noncore/settings/sshkeys/opie-sshkeys.control
@@ -1,9 +1,9 @@
 Package: opie-sshkeys
 Files:  bin/sshkeys apps/Settings/sshkeys.desktop pics/sshkeys/sshkeys.png
 Priority: optional
 Section: opie/settings
 Maintainer: David Woodhouse <dwmw2@infradead.org>
 Architecture: arm
-Depends: task-opie-minimal, ssh, opie-sh-ssh-askpass
+Depends: task-opie-minimal, ssh, opie-sh-ssh-askpass, libopiecore2
 Description: Utility for managing ssh-agent keys.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/sshkeys/sshkeys.cpp b/noncore/settings/sshkeys/sshkeys.cpp
index 43e02af..e76fd6b 100644
--- a/noncore/settings/sshkeys/sshkeys.cpp
+++ b/noncore/settings/sshkeys/sshkeys.cpp
@@ -1,56 +1,55 @@
 /* 
  *  ssh-agent key manipulation utility
  *
  *  (C) 2002 David Woodhouse <dwmw2@infradead.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
 #include "sshkeys.h"
 
 #include <qpe/qpeapplication.h>
-#include <opie/oprocess.h>
 #include <qmultilineedit.h>
 #include <qpushbutton.h>
 #include <qlistview.h>
 #include <qcombobox.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <ctype.h>
 
 static char *keynames[] = { "identity", "id_rsa", "id_dsa" };
 
 SSHKeysApp::SSHKeysApp( QWidget* parent,  const char* name, WFlags fl )
     : SSHKeysBase( parent, name, fl )
 {
 	char *home = getenv("HOME");
 	unsigned i;
 
 	connect(AddButton, SIGNAL(clicked()), this, SLOT(doAddButton()));
 	connect(RefreshListButton, SIGNAL(clicked()), this, SLOT(doRefreshListButton()));
 	connect(RemoveAllButton, SIGNAL(clicked()), this, SLOT(doRemoveAllButton()));
 
 	connect(&addprocess, SIGNAL(receivedStdout(OProcess*,char*,int)),
 		this, SLOT(log_sshadd_output(OProcess*,char*,int)));
 	connect(&addprocess, SIGNAL(receivedStderr(OProcess*,char*,int)),
 		this, SLOT(log_sshadd_stderr(OProcess*,char*,int)));
 	connect(&addprocess, SIGNAL(processExited(OProcess*)),
 		this, SLOT(ssh_add_exited(OProcess*)));
 
 	connect(KeyFileName, SIGNAL(textChanged(const QString&)),
diff --git a/noncore/settings/sshkeys/sshkeys.h b/noncore/settings/sshkeys/sshkeys.h
index bbc6993..7483bbc 100644
--- a/noncore/settings/sshkeys/sshkeys.h
+++ b/noncore/settings/sshkeys/sshkeys.h
@@ -1,58 +1,59 @@
 /* 
  *  ssh-agent key manipulation utility
  *
  *  (C) 2002 David Woodhouse <dwmw2@infradead.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
 
 #ifndef SSHKEYSAPP_H
 #define SSHKEYSAPP_H
 
 #include "sshkeysbase.h"
-#include <opie/oprocess.h>
+
+#include <opie2/oprocess.h>
 
 class SSHKeysApp : public SSHKeysBase
 {
 	Q_OBJECT
 		
  public:
 	SSHKeysApp( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
 	~SSHKeysApp();
 
  private:
 	void log_text(const char *text);
 	void flush_sshadd_output(void);
 
 	enum { Noise, KeyName, KeySize, KeyFingerprint } keystate;
 	QString incoming_keyname;
 	QString incoming_keysize;
 	QString incoming_keyfingerprint;
 	QString incoming_noise;
 	OProcess addprocess;
 	QString pending_stdout;
 	QString pending_stderr;
 
  private slots:
 	void doAddButton();
 	void doRefreshListButton();
 	void doRemoveAllButton();
 	void get_list_keys_output(OProcess *proc, char *buffer, int buflen);
 	void log_sshadd_output(OProcess *proc, char *buffer, int buflen);
 	void log_sshadd_stderr(OProcess *proc, char *buffer, int buflen);
 	void ssh_add_exited(OProcess *proc);
 	void add_text_changed(const QString &text);
 };
diff --git a/noncore/settings/sshkeys/sshkeys.pro b/noncore/settings/sshkeys/sshkeys.pro
index e98df2e..273db3c 100644
--- a/noncore/settings/sshkeys/sshkeys.pro
+++ b/noncore/settings/sshkeys/sshkeys.pro
@@ -1,12 +1,12 @@
 TEMPLATE = app
 CONFIG += qt warn_on release
 HEADERS = sshkeys.h
 SOURCES = main.cpp sshkeys.cpp
 TARGET = sshkeys
 INTERFACES = sshkeysbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe -lopie
+LIBS += -lqpe -lopiecore2
 DESTDIR = $(OPIEDIR)/bin
 
 include ( $(OPIEDIR)/include.pro )