[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/kpilot/kpilot
From:       Pino Toscano <toscano.pino () tiscali ! it>
Date:       2007-07-12 12:57:04
Message-ID: 1184245024.247056.19177.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 686933 by pino:

less qt3support


 M  +2 -1      dbAppInfoEditor.cc  
 M  +2 -1      dbRecordEditor.cc  
 M  +3 -3      dbviewerWidget.cc  
 M  +4 -2      internalEditorAction.cc  
 M  +1 -1      logFile.cc  
 M  +3 -3      memoWidget.cc  


--- trunk/KDE/kdepim/kpilot/kpilot/dbAppInfoEditor.cc #686932:686933
@@ -70,7 +70,8 @@
 	{
 		QLabel*tmpW = new QLabel( i18n("To view the Application info block data, please \
install a hex editor (e.g. khexedit from kdeutils)."), this );  \
                tmpW->setBackgroundMode( Qt::PaletteMid );
-		tmpW->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter | Qt::TextWordWrap);
+		tmpW->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter );
+		tmpW->setWordWrap( true );
 		tmpW->setFrameShape( Q3Frame::Panel );
 		tmpW->setFrameShadow( Q3Frame::Sunken );
 		fAppInfoEdit = tmpW;
--- trunk/KDE/kdepim/kpilot/kpilot/dbRecordEditor.cc #686932:686933
@@ -209,7 +209,8 @@
 	{
 		QLabel*tmpW = new QLabel( i18n("To view and edit the record data, please install a \
hex editor (e.g. kbytesedit from kdeutils)."), fWidget );  tmpW->setBackgroundMode( \
                Qt::PaletteMid );
-		tmpW->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter | Qt::TextWordWrap);
+		tmpW->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter );
+		tmpW->setWordWrap( true );
 		tmpW->setFrameShape( Q3Frame::Panel );
 		tmpW->setFrameShadow( Q3Frame::Sunken );
 		fRecordData = tmpW;
--- trunk/KDE/kdepim/kpilot/kpilot/dbviewerWidget.cc #686932:686933
@@ -287,12 +287,12 @@
 	switch (mode)
 	{
 		case 1:
-			dir.setNameFilter(CSL1("*.prc")); break;
+			dir.setNameFilters(QStringList() << CSL1("*.prc")); break;
 		case 2:
-			dir.setNameFilter(CSL1("*.pdb")); break;
+			dir.setNameFilters(QStringList() << CSL1("*.pdb")); break;
 		case 0:
 		default:
-			dir.setNameFilter(CSL1("*.pdb;*.prc")); break;
+			dir.setNameFilters(QStringList() << CSL1("*.pdb;*.prc")); break;
 	}
 	QStringList l = dir.entryList();
 	fDBList->insertStringList(l);
--- trunk/KDE/kdepim/kpilot/kpilot/internalEditorAction.cc #686932:686933
@@ -266,7 +266,8 @@
 		{
 			QLabel*tmpW = new QLabel( i18n("To view and edit the record data, please install \
a hex editor (e.g. khexedit from kdeutils)."), page );  tmpW->setBackgroundMode( \
                Qt::PaletteMid );
-			tmpW->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter | Qt::TextWordWrap);
+			tmpW->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter );
+			tmpW->setWordWrap( true );
 			tmpW->setFrameShape( Q3Frame::Panel );
 			tmpW->setFrameShadow( Q3Frame::Sunken );
 			hexEdit = tmpW;
@@ -294,7 +295,8 @@
 		{
 			QLabel*tmpW = new QLabel( i18n("To view and edit the record data, please install \
a hex editor (e.g. khexedit from kdeutils)."), page );  tmpW->setBackgroundMode( \
                Qt::PaletteMid );
-			tmpW->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter | Qt::TextWordWrap);
+			tmpW->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter );
+			tmpW->setWordWrap( true );
 			tmpW->setFrameShape( Q3Frame::Panel );
 			tmpW->setFrameShadow( Q3Frame::Sunken );
 			hexEdit = tmpW;
--- trunk/KDE/kdepim/kpilot/kpilot/logFile.cc #686932:686933
@@ -96,7 +96,7 @@
 	if (fSyncing) 
 	{
 		logMessage(i18n("HotSync finished."));
-		fLogStream.unsetDevice();
+		fLogStream.setDevice(0);
 		if (fOutfile) fOutfile->close();
 		KPILOT_DELETE(fOutfile)
 		fSyncing=false;
--- trunk/KDE/kdepim/kpilot/kpilot/memoWidget.cc #686932:686933
@@ -408,7 +408,7 @@
 	FUNCTIONSETUP;
 	if (!isVisible() || !d->fMemoAppInfo ) return;
 
-	if (fCatList->currentItem() == -1)
+	if (fCatList->currentIndex() == -1)
 	{
 #ifdef DEBUG
 		DEBUGKPILOT << fname << ": No category selected.\n";
@@ -539,7 +539,7 @@
 	if (!isVisible()) return;
 
 	if (-1 == lastSelectedMemo) return;
-	if (!fTextWidget->isModified()) return;
+	if (!fTextWidget->document()->isModified()) return;
 
 #ifdef DEBUG
 	DEBUGKPILOT << fname
@@ -624,7 +624,7 @@
 		}
 
 		QTextStream stream(&importFile);
-		QString memoText = stream.read();
+		QString memoText = stream.readAll();
 		addMemo(memoText, currentCatID);
 	}
 }


[prev in list] [next in list] [prev in thread] [next in thread]