The_Great_Archive/xca
1
0
Fork 0
mirror of https://github.com/chris2511/xca.git synced 2026-09-14 11:06:19 +05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix some warnings

Browse Source
This commit is contained in:
Christian 2007-04-25 20:12:24 +02:00
parent 75a081605f
commit 34227bf680
10 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -24,10 +24,10 @@ all: headers xca$(SUFFIX) doc lang
re: clean all
xca.o: $(OBJECTS)
$(LD) $(OBJECTS) $(SLIBS) -r -o $@
$(LD) $(LDFLAGS) $(OBJECTS) -r -o $@ $(SLIBS)
xca$(SUFFIX): xca.o
$(CC) $(LDFLAGS) $(CFLAGS) $< $(LIBS) -o $@
$(CC) -static $(LDFLAGS) $(CFLAGS) $< $(LIBS) -o $@
doc:
$(MAKE) -C doc

6
lib/db_base.h
View File

@ -62,8 +62,8 @@ class db_base: public QAbstractItemModel
QPixmap *loadImg(const char *name);
void writeAll(void);
void dump(QString dirname);
virtual void showContextMenu(QContextMenuEvent * e,
const QModelIndex &index){};
virtual void showContextMenu(QContextMenuEvent * ,
const QModelIndex &) {};
QModelIndex index(int row, int column, const QModelIndex &parent)const;
QModelIndex index(pki_base *pki)const;
@ -87,7 +87,7 @@ class db_base: public QAbstractItemModel
void edit();
virtual void showItem();
virtual void store(){};
virtual void showPki(pki_base *pki) { };
virtual void showPki(pki_base *) {};
virtual void showItem(const QModelIndex &index);
virtual void showItem(const QString keyname);

2
lib/load_obj.cpp
View File

@ -20,7 +20,7 @@ load_base::load_base()
caption = "";
}
pki_base * load_base::loadItem(QString s)
pki_base * load_base::loadItem(QString)
{
return NULL;
}

11
lib/pki_base.h
View File

@ -37,20 +37,19 @@ class pki_base : public QObject
public:
QList<pki_base*> childItems;
pki_base(const QString d = "", pki_base *p = NULL);
virtual void fload(const QString name){};
virtual void writeDefault(const QString fname){};
//virtual void fload(const QString name);
virtual void writeDefault(const QString){};
static int get_pki_counter(void);
virtual void fromData(const unsigned char *p, db_header_t *head){};
virtual void fromData(const unsigned char *, db_header_t *){};
virtual void oldFromData(unsigned char *p, int size);
virtual unsigned char *toData(int *size){return NULL;}
virtual bool compare(pki_base *ref){return false;}
virtual unsigned char *toData(int *) { return NULL; }
virtual bool compare(pki_base *) { return false; };
virtual ~pki_base();
QString getIntName() const;
QString getUnderlinedName() const;
void setIntName(const QString &d);
QString getClassName();
static QString rmslashdot(const QString &fname);
//virtual void updateView();
int getVersion();
enum pki_type getType();

4
lib/pki_key.cpp
View File

@ -61,7 +61,7 @@ void pki_key::init(int type)
cols=5;
}
void pki_key::incProgress(int a, int b, void *progress)
void pki_key::incProgress(int, int, void *progress)
{
int i = ((QProgressBar *)progress)->value();
((QProgressBar *)progress)->setValue(++i);
@ -517,7 +517,7 @@ void pki_key::writePKCS8(const QString fname, const EVP_CIPHER *enc,
fclose(fp);
}
static int mycb(char *buf, int size, int rwflag, void *userdata)
static int mycb(char *buf, int size, int, void *)
{
strncpy(buf, pki_key::passwd, size);
return strlen(pki_key::passwd);

12
lib/pki_temp.cpp
View File

@ -94,7 +94,7 @@ void pki_temp::fromData(const unsigned char *p, db_header_t *head )
fromData(p, size, version);
}
void pki_temp::fromData(const unsigned char *p, int size, int version)
void pki_temp::fromData(const unsigned char *p, int size, int)
{
const unsigned char *p1 = p;
@ -251,8 +251,8 @@ pki_temp::~pki_temp()
int pki_temp::dataSize()
{
int s = 9 * sizeof(int) +
8 * sizeof(char) +
xname.derSize() + (
8 * sizeof(char) +
xname.derSize() + (
subAltName.length() +
issAltName.length() +
crlDist.length() +
@ -270,10 +270,10 @@ int pki_temp::dataSize()
}
bool pki_temp::compare(pki_base *ref)
bool pki_temp::compare(pki_base *)
{
// we don't care if templates with identical contents
// are stored in the database ...
// we don't care if templates with identical contents
// are stored in the database ...
return false;
}

1
widgets/MW_database.cpp
View File

@ -120,7 +120,6 @@ void MainWindow::undelete()
ImportMulti *dlgi = new ImportMulti(this);
db_header_t head;
db mydb(dbfile);
int items = 0;
for (mydb.first(DBFLAG_OUTDATED); !mydb.eof(); mydb.next(DBFLAG_OUTDATED)) {
mydb.get_header(&head);

6
widgets/MainWindow.cpp
View File

@ -274,7 +274,7 @@ int MainWindow::initPass()
// Static Password Callback functions
int MainWindow::passRead(char *buf, int size, int rwflag, void *userdata)
int MainWindow::passRead(char *buf, int size, int, void *userdata)
{
int ret = -1;
pass_info *p = (pass_info *)userdata;
@ -297,7 +297,7 @@ int MainWindow::passRead(char *buf, int size, int rwflag, void *userdata)
}
int MainWindow::passWrite(char *buf, int size, int rwflag, void *userdata)
int MainWindow::passWrite(char *buf, int size, int, void *userdata)
{
int ret = -1;
pass_info *p = (pass_info *)userdata;
@ -365,5 +365,5 @@ void MainWindow::connNewX509(NewX509 *nx)
* segfaults. Thus I include the file here and remove it from the Makefile
* and the linker works.
* There is a FIXME and a warning */
#warning inclde "MW_menu.cpp"
#warning include "MW_menu.cpp"
#include "MW_menu.cpp"

2
widgets/Makefile
View File

@ -7,7 +7,7 @@ MOC_NAMES=MainWindow KeyDetail clicklabel XcaTreeView ExportKey NewX509 \
validity v3ext ReqDetail distname CertDetail CertExtend ExportCert \
ImportMulti CrlDetail ExportDer
#NAMES=$(MOC_NAMES) NewX509_ext MW_menu MW_help MW_database
NAMES=$(MOC_NAMES) NewX509_ext MW_menu MW_help MW_database
NAMES=$(MOC_NAMES) NewX509_ext MW_help MW_database
OBJS=$(patsubst %,moc_%.o,$(MOC_NAMES)) $(patsubst %,%.o,$(NAMES))
DELFILES=$(patsubst %,moc_%.cpp,$(MOC_NAMES))

6
widgets/NewX509.cpp
View File

@ -379,12 +379,12 @@ void NewX509::toggleOkBut()
okButton->setEnabled(ok);
}
void NewX509::on_description_textChanged(QString text)
void NewX509::on_description_textChanged(QString)
{
toggleOkBut();
}
void NewX509::on_countryName_textChanged(QString text)
void NewX509::on_countryName_textChanged(QString)
{
toggleOkBut();
}
@ -400,7 +400,7 @@ void NewX509::on_genKeyBUT_clicked()
emit genKey();
}
void NewX509::on_certList_currentIndexChanged(int index)
void NewX509::on_certList_currentIndexChanged(int)
{
a1time snb, sna;
pki_x509 *cert = getSelectedSigner();