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

List:       kde-commits
Subject:    KDE/kdenetwork/kppp
From:       Laurent Montel <montel () kde ! org>
Date:       2005-11-09 16:32:56
Message-ID: 1131553976.721878.14091.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 479207 by mlaurent:

qt3support--

 M  +2 -2      accounting.cpp  
 M  +1 -1      accounts.cpp  
 M  +4 -4      connect.cpp  
 M  +2 -2      edit.cpp  
 M  +3 -3      logview/export.cpp  
 M  +1 -1      modems.cpp  
 M  +1 -1      ppplog.cpp  
 M  +1 -1      pppstatdlg.cpp  


--- trunk/KDE/kdenetwork/kppp/accounting.cpp #479206:479207
@@ -138,13 +138,13 @@
 	char c = 0;
 	f.readBlock(&c, 1);
 	if(c != '\n')
-	  f.writeBlock("\n", 1);
+	  f.write("\n", 1);
       } else
 	f.at(f.size());
     }
 
     Q3CString tmp = s.toLocal8Bit();
-    f.writeBlock(tmp, tmp.length());
+    f.write(tmp, tmp.length());
     f.close();
   }
 
--- trunk/KDE/kdenetwork/kppp/accounts.cpp #479206:479207
@@ -79,7 +79,7 @@
   edit_b->setWhatsThis( i18n("Allows you to modify the selected account"));
 
   min = edit_b->sizeHint().width();
-  min = QMAX(70,min);
+  min = qMax(70,min);
   edit_b->setMinimumWidth(min);
 
   l111->addWidget(edit_b);
--- trunk/KDE/kdenetwork/kppp/connect.cpp #479206:479207
@@ -121,7 +121,7 @@
   messg->setText(i18n("Unable to create modem lock file."));
   messg->setMinimumHeight(messg->sizeHint().height() + 5);
   int messw = (messg->sizeHint().width() * 12) / 10;
-  messw = QMAX(messw,280);
+  messw = qMax(messw,280);
   messg->setMinimumWidth(messw);
   messg->setText(i18n("Looking for modem..."));
   l0->addWidget(messg);
@@ -139,9 +139,9 @@
   cancel->setFocus();
   connect(cancel, SIGNAL(clicked()), SLOT(cancelbutton()));
 
-  int maxw = QMAX(cancel->sizeHint().width(),
+  int maxw = qMax(cancel->sizeHint().width(),
 		 debug->sizeHint().width());
-  maxw = QMAX(maxw,65);
+  maxw = qMax(maxw,65);
   debug->setFixedWidth(maxw);
   cancel->setFixedWidth(maxw);
   l1->addWidget(debug);
@@ -575,7 +575,7 @@
 	messg->setText(bm);
 	emit debugMessage(bm);
 
-	if (scriptArgument.lower() == "password") {
+	if (scriptArgument.toLower() == "password") {
 	  gpppdata.setPassword(scanvar);
 	  p_kppp->setPW_Edit(scanvar);
 	  if(gpppdata.storePassword())
--- trunk/KDE/kdenetwork/kppp/edit.cpp #479206:479207
@@ -660,7 +660,7 @@
   add = new QPushButton(i18n("&Add"), parent);
   connect(add, SIGNAL(clicked()), SLOT(adddns()));
   int width = add->sizeHint().width();
-  width = QMAX(width,60);
+  width = qMax(width,60);
   add->setMinimumWidth(width);
   l1->addWidget(add);
   l1->addStretch(1);
@@ -672,7 +672,7 @@
   remove = new QPushButton(i18n("&Remove"), parent);
   connect(remove, SIGNAL(clicked()), SLOT(removedns()));
   width = remove->sizeHint().width();
-  width = QMAX(width,60);
+  width = qMax(width,60);
   remove->setMinimumWidth(width);
   l1->addWidget(remove);
   remove->setWhatsThis(
--- trunk/KDE/kdenetwork/kppp/logview/export.cpp #479206:479207
@@ -131,9 +131,9 @@
   if ( i == -1 )
       return;
   // prepare filter: e.g.: HTML (*.html *.HTML)
-  QString filter = "*." + ExportFormats[i].ext + " *." + \
ExportFormats[i].ext.upper() + "|" + +  QString filter = "*." + ExportFormats[i].ext \
                + " *." + ExportFormats[i].ext.toUpper() + "|" +
                    i18n(ExportFormats[i].name.toUtf8()) + " (*." + \
                ExportFormats[i].ext + " *." +
-                   ExportFormats[i].ext.upper() + ")";
+                   ExportFormats[i].ext.toUpper() + ")";
 
   filename = KFileDialog::getSaveFileName(date + "." + ExportFormats[i].ext, filter, \
0, i18n("Please Choose File"));  if (filename.isEmpty()) // no file selected
@@ -171,7 +171,7 @@
 
 bool Export::closeFile() {
   bool ok = true;
-  if (file.writeBlock(buffer.toLocal8Bit(), buffer.length())<0)
+  if (file.write(buffer.toLocal8Bit(), buffer.length())<0)
     ok = false;
   file.close();
   return ok;
--- trunk/KDE/kdenetwork/kppp/modems.cpp #479206:479207
@@ -78,7 +78,7 @@
   edit_b->setWhatsThis( i18n("Allows you to modify the selected account"));
 
   min = edit_b->sizeHint().width();
-  min = QMAX(70,min);
+  min = qMax(70,min);
   edit_b->setMinimumWidth(min);
 
   l111->addWidget(edit_b);
--- trunk/KDE/kdenetwork/kppp/ppplog.cpp #479206:479207
@@ -272,7 +272,7 @@
 
   if(dlg->exec()) {
     QDir d = QDir::home();
-    QString s = d.absPath() + "/PPP-logfile";
+    QString s = d.absolutePath() + "/PPP-logfile";
     int old_umask = umask(0077);
 
     FILE *f = fopen(QFile::encodeName(s), "w");
--- trunk/KDE/kdenetwork/kppp/pppstatdlg.cpp #479206:479207
@@ -184,7 +184,7 @@
   cancelbutton->setFocus();
   connect(cancelbutton, SIGNAL(clicked()), this,SLOT(cancel()));
   cancelbutton->setFixedHeight(cancelbutton->sizeHint().height());
-  cancelbutton->setMinimumWidth(QMAX(cancelbutton->sizeHint().width(), 70));
+  cancelbutton->setMinimumWidth(qMax(cancelbutton->sizeHint().width(), 70));
   l12->addWidget(cancelbutton);
 
   if(gpppdata.graphingEnabled()) {


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