Merge branch 'adamierymenko-dev' into android-jni

Conflicts:
	.gitignore

1 files changed, 0 insertions, 37 deletions

diff --git a/attic/ZeroTierUI/onetimedialog.cpp b/attic/ZeroTierUI/onetimedialog.cpp
deleted file mode 100644
index 1c1d983b..00000000
--- a/attic/ZeroTierUI/onetimedialog.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "onetimedialog.h"
-#include "ui_onetimedialog.h"
-#include "main.h"
-
-OneTimeDialog::OneTimeDialog(QWidget *parent,const char *propName,const QString &title,const QString &message) :
-	QDialog(parent),
-	ui(new Ui::OneTimeDialog)
-{
-	ui->setupUi(this);
-
-	ui->label->setText(message);
-	this->setWindowTitle(title);
-	_propName = propName;
-
-#ifdef __WINDOWS__
-	QWidgetList widgets = this->findChildren<QWidget*>();
-	foreach(QWidget *widget, widgets) {
-		QFont font(widget->font());
-		font.setPointSizeF(font.pointSizeF() * 0.75);
-		widget->setFont(font);
-	}
-#endif
-}
-
-OneTimeDialog::~OneTimeDialog()
-{
-	delete ui;
-}
-
-void OneTimeDialog::on_pushButton_clicked()
-{
-	if (_propName) {
-		settings->setValue(_propName,ui->checkBox->isChecked());
-		settings->sync();
-	}
-	this->close();
-}