summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/vcardformatplugin.cpp2
-rw-r--r--libkdepim/ksyncmanager.cpp24
-rw-r--r--microkde/kconfig.cpp4
-rw-r--r--microkde/kdecore/kstandarddirs.cpp2
-rw-r--r--microkde/kdeui/kactioncollection.cpp5
-rw-r--r--microkde/kdeui/klistview.cpp2
6 files changed, 18 insertions, 21 deletions
diff --git a/kabc/vcardformatplugin.cpp b/kabc/vcardformatplugin.cpp
index bc18690..8db8c11 100644
--- a/kabc/vcardformatplugin.cpp
+++ b/kabc/vcardformatplugin.cpp
@@ -41,7 +41,7 @@ bool VCardFormatPlugin::load( Addressee &addressee, QFile *file )
41 41
42bool VCardFormatPlugin::loadAll( AddressBook *addressBook, Resource *resource, QFile *file ) 42bool VCardFormatPlugin::loadAll( AddressBook *addressBook, Resource *resource, QFile *file )
43{ 43{
44 qDebug("VCardFormatPlugin::loadAll"); 44 // qDebug("VCardFormatPlugin::loadAll");
45 return mImpl->loadAll( addressBook, resource, file ); 45 return mImpl->loadAll( addressBook, resource, file );
46} 46}
47 47
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 80fb147..df53235 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -574,7 +574,7 @@ void KSyncManager::syncRemote( KSyncProfile* prof, bool ask)
574 // 0 : okay 574 // 0 : okay
575 // 256: no such file or dir 575 // 256: no such file or dir
576 // 576 //
577 qDebug("KO: Remote copy result(0 = okay): %d ",result ); 577 qDebug("Sync: Remote copy result(0 = okay): %d ",result );
578 if ( result != 0 ) { 578 if ( result != 0 ) {
579 unsigned int len = maxlen; 579 unsigned int len = maxlen;
580 while ( len < preCommand.length() ) { 580 while ( len < preCommand.length() ) {
@@ -602,7 +602,7 @@ void KSyncManager::syncRemote( KSyncProfile* prof, bool ask)
602 } 602 }
603 mParent->topLevelWidget()->setCaption ( i18n( "Writing back file ..." ) ); 603 mParent->topLevelWidget()->setCaption ( i18n( "Writing back file ..." ) );
604 result = system ( postCommand ); 604 result = system ( postCommand );
605 qDebug("Writing back file result: %d ", result); 605 qDebug("Sync:Writing back file result: %d ", result);
606 if ( result != 0 ) { 606 if ( result != 0 ) {
607 mParent->topLevelWidget()->setCaption ( i18n( "Writing back file result: " )+QString::number( result ) ); 607 mParent->topLevelWidget()->setCaption ( i18n( "Writing back file result: " )+QString::number( result ) );
608 return; 608 return;
@@ -745,7 +745,7 @@ void KSyncManager::syncSharp()
745{ 745{
746 746
747 if ( ! syncExternalApplication("sharp") ) 747 if ( ! syncExternalApplication("sharp") )
748 qDebug("ERROR sync sharp ");; 748 qDebug("ERROR sync sharp ");
749} 749}
750 750
751bool KSyncManager::syncExternalApplication(QString resource) 751bool KSyncManager::syncExternalApplication(QString resource)
@@ -756,7 +756,7 @@ bool KSyncManager::syncExternalApplication(QString resource)
756 if ( mAskForPreferences ) 756 if ( mAskForPreferences )
757 edit_sync_options(); 757 edit_sync_options();
758 758
759 qDebug("sync %s", resource.latin1()); 759 qDebug("Sync extern %s", resource.latin1());
760 760
761 bool syncOK = mImplementation->syncExternal(this, resource); 761 bool syncOK = mImplementation->syncExternal(this, resource);
762 762
@@ -838,8 +838,6 @@ void KSyncManager::syncPi()
838 838
839void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) 839void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state)
840{ 840{
841 qDebug("MainWindow::deleteCommandSocket %d", state);
842
843 //enum { success, errorW, errorR, quiet }; 841 //enum { success, errorW, errorR, quiet };
844 if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ) { 842 if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ) {
845 mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") ); 843 mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") );
@@ -870,7 +868,6 @@ void KSyncManager::readFileFromSocket()
870 mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") ); 868 mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") );
871 if ( ! syncWithFile( fileName , true ) ) { 869 if ( ! syncWithFile( fileName , true ) ) {
872 mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") ); 870 mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") );
873 qDebug("Syncing failed ");
874 return; 871 return;
875 } 872 }
876 KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this ); 873 KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this );
@@ -922,10 +919,10 @@ void KServerSocket::readClient()
922 qDebug("ERROR::KServerSocket::readClient(): mSocket == 0 "); 919 qDebug("ERROR::KServerSocket::readClient(): mSocket == 0 ");
923 return; 920 return;
924 } 921 }
925 qDebug("KServerSocket readClient()"); 922 //qDebug("KServerSocket::readClient()");
926 if ( mSocket->canReadLine() ) { 923 if ( mSocket->canReadLine() ) {
927 QString line = mSocket->readLine(); 924 QString line = mSocket->readLine();
928 qDebug("KServerSocket readline: %s ", line.latin1()); 925 //qDebug("KServerSocket readline: %s ", line.latin1());
929 QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line ); 926 QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line );
930 if ( tokens[0] == "GET" ) { 927 if ( tokens[0] == "GET" ) {
931 if ( tokens[1] == mPassWord ) 928 if ( tokens[1] == mPassWord )
@@ -933,7 +930,7 @@ void KServerSocket::readClient()
933 send_file(); 930 send_file();
934 else { 931 else {
935 KMessageBox::error( 0, i18n("Got send file request\nwith invalid password")); 932 KMessageBox::error( 0, i18n("Got send file request\nwith invalid password"));
936 qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() ); 933 //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() );
937 } 934 }
938 } 935 }
939 if ( tokens[0] == "PUT" ) { 936 if ( tokens[0] == "PUT" ) {
@@ -944,7 +941,7 @@ void KServerSocket::readClient()
944 } 941 }
945 else { 942 else {
946 KMessageBox::error( 0, i18n("Got receive file request\nwith invalid password")); 943 KMessageBox::error( 0, i18n("Got receive file request\nwith invalid password"));
947 qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() ); 944 //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() );
948 } 945 }
949 } 946 }
950 if ( tokens[0] == "STOP" ) { 947 if ( tokens[0] == "STOP" ) {
@@ -973,7 +970,6 @@ void KServerSocket::send_file()
973 mSyncActionDialog->setFixedSize( 230, 120); 970 mSyncActionDialog->setFixedSize( 230, 120);
974 mSyncActionDialog->show(); 971 mSyncActionDialog->show();
975 mSyncActionDialog->raise(); 972 mSyncActionDialog->raise();
976 qDebug("KSS::saving ... ");
977 emit request_file(); 973 emit request_file();
978 qApp->processEvents(); 974 qApp->processEvents();
979 QString fileName = mFileName; 975 QString fileName = mFileName;
@@ -1036,7 +1032,7 @@ void KServerSocket::readBackFileFromSocket()
1036 if (!file.open( IO_WriteOnly ) ) { 1032 if (!file.open( IO_WriteOnly ) ) {
1037 delete mSyncActionDialog; 1033 delete mSyncActionDialog;
1038 mSyncActionDialog = 0; 1034 mSyncActionDialog = 0;
1039 qDebug("error open cal file "); 1035 qDebug("KSS:Error open read back file ");
1040 piFileString = ""; 1036 piFileString = "";
1041 emit file_received( false ); 1037 emit file_received( false );
1042 blockRC = false; 1038 blockRC = false;
@@ -1169,7 +1165,7 @@ void KCommandSocket::readFileFromSocket()
1169 if (!file.open( IO_WriteOnly ) ) { 1165 if (!file.open( IO_WriteOnly ) ) {
1170 mFileString = ""; 1166 mFileString = "";
1171 mRetVal = errorR; 1167 mRetVal = errorR;
1172 qDebug("Error open temp calender file for writing: %s",fileName.latin1() ); 1168 qDebug("KSS:Error open temp sync file for writing: %s",fileName.latin1() );
1173 deleteSocket(); 1169 deleteSocket();
1174 return ; 1170 return ;
1175 1171
diff --git a/microkde/kconfig.cpp b/microkde/kconfig.cpp
index ba41f6c..5b685d3 100644
--- a/microkde/kconfig.cpp
+++ b/microkde/kconfig.cpp
@@ -269,8 +269,8 @@ void KConfig::load()
269 269
270 QFile f( mFileName ); 270 QFile f( mFileName );
271 if ( !f.open( IO_ReadOnly ) ) { 271 if ( !f.open( IO_ReadOnly ) ) {
272 qDebug("KConfig: could not open file %s ",mFileName.latin1() ); 272 //qDebug("KConfig: could not open file %s ",mFileName.latin1() );
273 return; 273 return;
274 } 274 }
275 275
276 mBoolMap.clear(); 276 mBoolMap.clear();
diff --git a/microkde/kdecore/kstandarddirs.cpp b/microkde/kdecore/kstandarddirs.cpp
index 1c3e0ae..4c03c15 100644
--- a/microkde/kdecore/kstandarddirs.cpp
+++ b/microkde/kdecore/kstandarddirs.cpp
@@ -1556,7 +1556,7 @@ QString locateLocal( const char *type,
1556 if ( ccc > 13 ) 1556 if ( ccc > 13 )
1557 abort(); 1557 abort();
1558*/ 1558*/
1559 qDebug("locatelocal: %s" , path.latin1()); 1559 //qDebug("locatelocal: %s" , path.latin1());
1560 return path; 1560 return path;
1561 1561
1562/*US why do we put all files into one directory. It is quit complicated. 1562/*US why do we put all files into one directory. It is quit complicated.
diff --git a/microkde/kdeui/kactioncollection.cpp b/microkde/kdeui/kactioncollection.cpp
index b819e76..69e5d02 100644
--- a/microkde/kdeui/kactioncollection.cpp
+++ b/microkde/kdeui/kactioncollection.cpp
@@ -153,11 +153,12 @@ void KActionCollection::setWidget( QWidget* w )
153 //else 153 //else
154 if ( !d->m_widget ) { 154 if ( !d->m_widget ) {
155 d->m_widget = w; 155 d->m_widget = w;
156 qDebug("KActionCollection::setWidget: warning: KAccel is never used in microkde"); 156 //qDebug("KActionCollection::setWidget: warning: KAccel is never used in microkde");
157//US d->m_kaccel = new KAccel( w, this, "KActionCollection-KAccel" ); 157//US d->m_kaccel = new KAccel( w, this, "KActionCollection-KAccel" );
158 } 158 }
159 else if ( d->m_widget != w ) 159 else if ( d->m_widget != w )
160 kdWarning(129) << "KActionCollection::setWidget(): tried to change widget from " << d->m_widget << " to " << w << endl; 160 ;
161
161} 162}
162 163
163void KActionCollection::setAutoConnectShortcuts( bool b ) 164void KActionCollection::setAutoConnectShortcuts( bool b )
diff --git a/microkde/kdeui/klistview.cpp b/microkde/kdeui/klistview.cpp
index b53a88a..2856f2d 100644
--- a/microkde/kdeui/klistview.cpp
+++ b/microkde/kdeui/klistview.cpp
@@ -515,7 +515,7 @@ void KListView::slotOnViewport()
515 515
516void KListView::slotSettingsChanged(int category) 516void KListView::slotSettingsChanged(int category)
517{ 517{
518qDebug("KListView::slotSettingsChanged has to be verified"); 518 //qDebug("KListView::slotSettingsChanged has to be verified");
519/*US 519/*US
520 520
521 switch (category) 521 switch (category)