summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kabc/formatfactory.cpp5
-rw-r--r--kmicromail/libmailwrapper/settings.cpp1
-rw-r--r--korganizer/koagendaitem.cpp2
-rw-r--r--korganizer/korganizer.pro2
-rw-r--r--libkcal/calendar.cpp1
-rw-r--r--libkcal/event.cpp6
-rw-r--r--libkcal/todo.cpp4
-rw-r--r--libkdepim/ksyncmanager.cpp7
-rw-r--r--libkdepim/phoneaccess.cpp2
-rw-r--r--microkde/kapplication.cpp1
-rw-r--r--microkde/kdecore/klibloader.cpp10
-rw-r--r--microkde/kdeui/ktoolbar.cpp2
-rw-r--r--microkde/kdeui/ktoolbar.h2
13 files changed, 18 insertions, 27 deletions
diff --git a/kabc/formatfactory.cpp b/kabc/formatfactory.cpp
index f2f03c6..3ae1c27 100644
--- a/kabc/formatfactory.cpp
+++ b/kabc/formatfactory.cpp
@@ -56,7 +56,8 @@ FormatFactory::FormatFactory()
info->descriptionLabel = i18n( "vCard Format" );
mFormatList.insert( "vcard", info );
-/*US lets enter all resources directly instead of using teh desktopfiles.
+#if 0
+US lets enter all resources directly instead of using teh desktopfiles.
QStringList list = KGlobal::dirs()->findAllResources( "data" ,"kabc/formats/*.desktop", true, true );
for ( QStringList::ConstIterator it = list.begin(); it != list.end(); ++it )
@@ -79,7 +80,7 @@ FormatFactory::FormatFactory()
mFormatList.insert( type, info );
}
-*/
+#endif
//US we already have vcard as default format.
info = new FormatInfo;
info->library = i18n("microkabcformat_binary");
diff --git a/kmicromail/libmailwrapper/settings.cpp b/kmicromail/libmailwrapper/settings.cpp
index 8f909f9..9436d43 100644
--- a/kmicromail/libmailwrapper/settings.cpp
+++ b/kmicromail/libmailwrapper/settings.cpp
@@ -119,7 +119,6 @@ Account::Account()
connectionType = 1;
offline = false;
maxMailSize = 0;
- lastFetch;
leaveOnServer = false;
}
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index df7d612..6a312b3 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -317,7 +317,7 @@ void KOAgendaItem::paintMe( bool selected, QPainter* paint )
pa.begin( paintPix() );
}
int x, yy, w, h;
- float nfh;
+ float nfh = 7.0;
x = pos().x(); w = width(); h = height ();
if ( mAllDay )
yy = y();
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index 3c7a1fb..5e82721 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -1,5 +1,5 @@
TEMPLATE = app
-CONFIG += qt warn_off
+CONFIG += qt warn_on
TARGET = kopi
OBJECTS_DIR = _obj/
MOC_DIR = _moc
diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp
index 88351eb..dcfee5d 100644
--- a/libkcal/calendar.cpp
+++ b/libkcal/calendar.cpp
@@ -124,6 +124,7 @@ bool Calendar::undoDeleteIncidence()
return false;
addIncidence(mUndoIncidence);
mUndoIncidence = 0;
+ return true;
}
void Calendar::setOwner(const QString &os)
{
diff --git a/libkcal/event.cpp b/libkcal/event.cpp
index 7256f05..de8dceb 100644
--- a/libkcal/event.cpp
+++ b/libkcal/event.cpp
@@ -89,7 +89,7 @@ bool Event::contains ( Event* from )
QStringList cat = categories();
QStringList catFrom = from->categories();
QString nCat;
- int iii;
+ unsigned int iii;
for ( iii = 0; iii < catFrom.count();++iii ) {
nCat = catFrom[iii];
if ( !nCat.isEmpty() )
@@ -120,8 +120,6 @@ QDateTime Event::dtEnd() const
if (hasEndDate()) return mDtEnd;
if (hasDuration()) return dtStart().addSecs(duration());
- kdDebug(5800) << "Warning! Event '" << summary()
- << "' does have neither end date nor duration." << endl;
return dtStart();
}
@@ -185,7 +183,7 @@ QDateTime Event::getNextAlarmDateTime( bool * ok, int * offset ) const
bool enabled = false;
Alarm* alarm;
- int off;
+ int off = 0;
QDateTime alarmStart = QDateTime::currentDateTime().addDays( 3650 );;
// if ( QDateTime::currentDateTime() > incidenceStart ){
// *ok = false;
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp
index d81a68f..9c04a7e 100644
--- a/libkcal/todo.cpp
+++ b/libkcal/todo.cpp
@@ -96,7 +96,7 @@ bool Todo::contains ( Todo* from )
QStringList cat = categories();
QStringList catFrom = from->categories();
QString nCat;
- int iii;
+ unsigned int iii;
for ( iii = 0; iii < catFrom.count();++iii ) {
nCat = catFrom[iii];
if ( !nCat.isEmpty() )
@@ -375,7 +375,7 @@ QDateTime Todo::getNextAlarmDateTime( bool * ok, int * offset ) const
incidenceStart = dtDue();
bool enabled = false;
Alarm* alarm;
- int off;
+ int off = 0;
QDateTime alarmStart = QDateTime::currentDateTime().addDays( 3650 );;
// if ( QDateTime::currentDateTime() > incidenceStart ){
// *ok = false;
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 3adbf61..df5a0d9 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -59,7 +59,7 @@ QDateTime KSyncManager::mRequestedSyncEvent;
KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu)
- : QObject(), mParent(parent), mImplementation(implementation), mTargetApp(ta), mPrefs(prefs ),mSyncMenu(syncmenu)
+ : QObject(), mPrefs(prefs ), mParent(parent),mImplementation(implementation), mTargetApp(ta), mSyncMenu(syncmenu)
{
mServerSocket = 0;
bar = new QProgressBar ( 1, 0 );
@@ -460,10 +460,9 @@ bool KSyncManager::syncWithFile( QString fn , bool quick )
QFileInfo info;
info.setFile( fn );
QString mess;
- bool loadbup = true;
if ( !info. exists() ) {
mess = i18n( "Sync file \n...%1\ndoes not exist!\nNothing synced!\n").arg(fn.right( 30) );
- int result = QMessageBox::warning( mParent, i18n("Warning!"),
+ QMessageBox::warning( mParent, i18n("Warning!"),
mess );
return ret;
}
@@ -556,7 +555,7 @@ int KSyncManager::ringSync()
temp->setName(syncProfileNames[mCurrentSyncProfile]);
temp->readConfig(&config);
- bool includeInRingSync;
+ bool includeInRingSync = false;
switch(mTargetApp)
{
case (KAPI):
diff --git a/libkdepim/phoneaccess.cpp b/libkdepim/phoneaccess.cpp
index e24ad9e..89db22b 100644
--- a/libkdepim/phoneaccess.cpp
+++ b/libkdepim/phoneaccess.cpp
@@ -182,7 +182,7 @@ bool PhoneAccess::readFromPhone( QString fileName)
#else
QString command ="kammu --backup " + fileName + " -yes" ;
#endif
- int ret;
+ int ret = 1;
while ( ret != 0 ) {
QLabel* status = new QLabel( i18n(" This may take 1-3 minutes!"), 0 );
int w = 235;
diff --git a/microkde/kapplication.cpp b/microkde/kapplication.cpp
index 21aa0a4..f05b91b 100644
--- a/microkde/kapplication.cpp
+++ b/microkde/kapplication.cpp
@@ -86,6 +86,7 @@ bool KApplication::convert2latin1(QString fileName)
tsIn.setEncoding( QTextStream::Latin1 );
tsIn << text.latin1();
file.close();
+ return true;
}
diff --git a/microkde/kdecore/klibloader.cpp b/microkde/kdecore/klibloader.cpp
index 1394154..6d0475a 100644
--- a/microkde/kdecore/klibloader.cpp
+++ b/microkde/kdecore/klibloader.cpp
@@ -496,16 +496,8 @@ KLibrary* KLibLoader::library( const char *name )
//US if ( !handle )
if ( !qlib )
{
-//US const char* errmsg = lt_dlerror();
- char* errmsg;
- sprintf(errmsg, "KLibLoader::library could not load library: %s", libfile.latin1());
- qDebug(errmsg);
-
- if(errmsg)
- d->errorMessage = QString::fromLatin1(errmsg);
- else
+ qDebug( "KLibLoader::library could not load library: %s", libfile.latin1());
d->errorMessage = QString::null;
- kdWarning(150) << "library=" << name << ": file=" << libfile << ": " << d->errorMessage << endl;
return 0;
}
else
diff --git a/microkde/kdeui/ktoolbar.cpp b/microkde/kdeui/ktoolbar.cpp
index 1ad1728..09ad0c8 100644
--- a/microkde/kdeui/ktoolbar.cpp
+++ b/microkde/kdeui/ktoolbar.cpp
@@ -878,7 +878,7 @@ void KToolBar::setBarPos (BarPosition bpos)
}
-KToolBar::BarPosition KToolBar::barPos()
+KToolBar::BarPosition KToolBar::barPos() const
{
if ( !(QMainWindow*)mainWindow() )
return KToolBar::Top;
diff --git a/microkde/kdeui/ktoolbar.h b/microkde/kdeui/ktoolbar.h
index 61b5ea3..49ff856 100644
--- a/microkde/kdeui/ktoolbar.h
+++ b/microkde/kdeui/ktoolbar.h
@@ -746,7 +746,7 @@ public:
/**
* Returns position of toolbar.
*/
- BarPosition barPos();
+ BarPosition barPos() const;
/**
* @deprecated