[X2Go-Commits] [pinentry-x2go] 01/01: common: update copyright notices, whitespace fixes. Happy new year!
git-admin at x2go.org
git-admin at x2go.org
Thu Jan 8 22:24:02 CET 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository pinentry-x2go.
commit 927536e8db272554018912c57ed05b6f6d0e3deb
Author: Mihai Moldovan <ionic at ionic.de>
Date: Thu Jan 8 22:23:57 2015 +0100
common: update copyright notices, whitespace fixes. Happy new year!
---
debian/copyright | 30 +++++++++++++++---------------
pinentry-x2go/main.cpp | 6 +++---
pinentry-x2go/pinentrydialog.cpp | 6 +++---
pinentry-x2go/pinentrydialog.h | 12 ++++++------
pinentry-x2go/pinlineedit.cpp | 2 +-
pinentry-x2go/pinlineedit.h | 9 +++++----
6 files changed, 33 insertions(+), 32 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index 572d896..1ea8c77 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,32 +7,32 @@ Upstream Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
Copyright (C) 2007 obviously nice - http://www.obviouslynice.de
-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
+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.,
51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-Copyright (C) 2007 Oleksandr Shneyder
+Copyright (C) 2007-2015 Oleksandr Shneyder
oleksandr.shneyder at obviously-nice.de
-Copyright (C) 2007 Heinz-Markus Graesing
+Copyright (C) 2007-2015 Heinz-Markus Graesing
heinz-m.graesing at obviously-nice.de
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
-The Debian packaging is (C) 2007, Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de> and
+The Debian packaging is (C) 2007-2015, Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de> and
is licensed under the GPL, see above.
Program: Pinentry
diff --git a/pinentry-x2go/main.cpp b/pinentry-x2go/main.cpp
index bcab4ba..ecbc812 100644
--- a/pinentry-x2go/main.cpp
+++ b/pinentry-x2go/main.cpp
@@ -2,7 +2,7 @@
/* main.cpp - Secure KDE dialog for PIN entry.
Copyright (C) 2002 Klarälvdalens Datakonsult AB
Copyright (C) 2003 g10 Code GmbH
- Copyright (C) 2007-2012 X2Go Project
+ Copyright (C) 2007-2015 X2Go Project
Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>.
Modified by Marcus Brinkmann <marcus at g10code.de>.
Modified for X2Go by Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
@@ -12,12 +12,12 @@
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
diff --git a/pinentry-x2go/pinentrydialog.cpp b/pinentry-x2go/pinentrydialog.cpp
index 0f92f01..fef03e4 100644
--- a/pinentry-x2go/pinentrydialog.cpp
+++ b/pinentry-x2go/pinentrydialog.cpp
@@ -1,6 +1,6 @@
/* pinentrydialog.cpp - A secure KDE dialog for PIN entry.
Copyright (C) 2002 Klarälvdalens Datakonsult AB
- Copyright (C) 2007-2012 X2Go Project
+ Copyright (C) 2007-2015 X2Go Project
Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>.
Modified for X2Go by Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
and Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
@@ -9,12 +9,12 @@
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
diff --git a/pinentry-x2go/pinentrydialog.h b/pinentry-x2go/pinentrydialog.h
index 0ed47d0..6741366 100644
--- a/pinentry-x2go/pinentrydialog.h
+++ b/pinentry-x2go/pinentrydialog.h
@@ -1,20 +1,20 @@
/* pinentrydialog.h - A secure KDE dialog for PIN entry.
Copyright (C) 2002 Klarälvdalens Datakonsult AB
- Copyright (C) 2007-2012 X2Go Project
+ Copyright (C) 2007-2015 X2Go Project
Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>.
Modified for X2Go by Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
and Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-
+
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., 51 Franklin Street - Fifth Floor, Boston, MA
@@ -53,7 +53,7 @@ public:
void setPrompt( const QString& );
QString prompt() const;
-
+
void setOkText( const QString& );
void setCancelText( const QString& );
@@ -72,7 +72,7 @@ private:
QLabel* _error;
PinLineEdit* _edit;
QPushButton* _ok;
- QPushButton* _cancel;
+ QPushButton* _cancel;
QPushButton* _bs;
QPushButton* _num[10];
bool _grabbed;
diff --git a/pinentry-x2go/pinlineedit.cpp b/pinentry-x2go/pinlineedit.cpp
index 5aeb631..bf72fbd 100644
--- a/pinentry-x2go/pinlineedit.cpp
+++ b/pinentry-x2go/pinlineedit.cpp
@@ -4,7 +4,7 @@
// Description:
//
//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2007-2012
+// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2007-2015
//
// Copyright: See COPYING file that comes with this distribution
//
diff --git a/pinentry-x2go/pinlineedit.h b/pinentry-x2go/pinlineedit.h
index 7c39b37..756f6d0 100644
--- a/pinentry-x2go/pinlineedit.h
+++ b/pinentry-x2go/pinlineedit.h
@@ -1,10 +1,10 @@
//
// C++ Interface: pinlineedit
//
-// Description:
+// Description:
//
//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2007-2012
+// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2007-2015
//
// Copyright: See COPYING file that comes with this distribution
//
@@ -15,17 +15,18 @@
#include <QLineEdit>
/**
- @author Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
+ @author Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
*/
class PinLineEdit : public QLineEdit
{
- Q_OBJECT
+ Q_OBJECT
public:
PinLineEdit(QWidget* parent = 0 );
~PinLineEdit();
protected:
virtual void keyPressEvent( QKeyEvent *e );
+
signals:
void bs_pressed();
void cancel_pressed();
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pinentry-x2go.git
More information about the x2go-commits
mailing list