From 9f1968c0c1a39c967f8174cdd186d93907d64fbc Mon Sep 17 00:00:00 2001
From: VOROSKOI Andras <voroskoi@frugalware.org>
Date: Thu, 14 Jun 2007 01:27:52 +0200
Subject: [PATCH] cosmetics and some warning fixes

---
 kfpm_pacman.cpp | 7 ++++---
 kfpm_pacman.h   | 2 +-
 mainwidget.cpp  | 2 +-
 mainwidget.h    | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/kfpm_pacman.cpp b/kfpm_pacman.cpp
index 9a057c4..edff27a 100644
--- a/kfpm_pacman.cpp
+++ b/kfpm_pacman.cpp
@@ -15,7 +15,7 @@ QValueVector<PM_DB*> pm_dblist;
 
 FPM::FPM(char *root, char *configfile) {
 	pacman_init(root, configfile);
-	LocalDB = pacman_db_register("local");
+	LocalDB = pacman_db_register((char*)"local");
 }
 
 FPM::~FPM () {
@@ -58,9 +58,9 @@ QStrList FPM::sync_group(QValueVector<PM_DB*> syncs, QStrList *targets)
 			for(packages = (PM_LIST*)pacman_grp_getinfo(grp, PM_GRP_PKGNAMES); packages; packages = pacman_list_next(packages)) {
 				pkgnames.append((char*)pacman_list_getdata(packages));
 			}
-			return(pkgnames);
 		}
 	}
+	return(pkgnames);
 }
 
 void cb_db_register(char *section, PM_DB *db)
@@ -71,10 +71,11 @@ void cb_db_register(char *section, PM_DB *db)
 void FPM::pacman_init(char *root, char *configfile)
 {
 	pacman_initialize(root);
-	std::cout << "pacman_initialize called" << std::endl;
 	/* FIXME - exception handling */
 	if(pacman_parse_config(configfile, cb_db_register, "") != 0) {
 		std::cerr << "failed to parse config (" << pacman_strerror(pm_errno) << ")" << std::endl;
 	}
 	setSync(pm_dblist);
 }
+
+// vim: sw=4 ts=4 noet
diff --git a/kfpm_pacman.h b/kfpm_pacman.h
index 10995b7..c11a2dd 100644
--- a/kfpm_pacman.h
+++ b/kfpm_pacman.h
@@ -24,7 +24,7 @@ class FPM {
 		QValueVector<PM_DB*> Syncs;
 		void pacman_init(char*, char*);
 	public:
-		FPM(char *root = ROOTDIR, char *configfile = PACCONF);
+		FPM(char *root = (char *)ROOTDIR, char *configfile = (char *)PACCONF);
 		~FPM();
 		PM_DB *LocalDB;
 		void setSync(QValueVector<PM_DB*>);
diff --git a/mainwidget.cpp b/mainwidget.cpp
index f89438c..9d8f60b 100644
--- a/mainwidget.cpp
+++ b/mainwidget.cpp
@@ -25,7 +25,7 @@
 
 extern QPtrList<PM_DB> syncs;
 
-MainWidget::MainWidget(QWidget * parent, const char * name, WFlags f) : QWidget (parent, name)
+MainWidget::MainWidget(QWidget * parent, const char * name, WFlags f) : QWidget (parent, name, f)
 {
 	QVBoxLayout *topLayout = new QVBoxLayout(this);
 	Q_CHECK_PTR(topLayout);
diff --git a/mainwidget.h b/mainwidget.h
index 0a48408..0aceee1 100644
--- a/mainwidget.h
+++ b/mainwidget.h
@@ -22,7 +22,7 @@ class MainWidget : public QWidget
 	Q_OBJECT
 
 	public:
-		MainWidget(QWidget * parent = 0, const char * name = 0, WFlags f = 0);
+		MainWidget(QWidget * parent = 0, const char * name = 0, WFlags f = Qt::WType_TopLevel);
 		~MainWidget();
 	public slots:
 		void slot_initialize();
-- 
2.11.4.GIT