1 files changed, 5 insertions, 5 deletions

diff --git a/noncore/tools/remote/buttondialog.cpp b/noncore/tools/remote/buttondialog.cpp
index 7479e85..6ea4801 100644
--- a/noncore/tools/remote/buttondialog.cpp
+++ b/noncore/tools/remote/buttondialog.cpp
@@ -7,25 +7,25 @@ License as published by the Free Software Foundation; either version 2 of the Li
 version.
 
 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
 implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
 Public License for more details.
 
 You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
 Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
 #include "buttondialog.h"
 
-ButtonDialog::ButtonDialog(QString buttonName, QWidget *parent=0, const char*name=0, bool modal=FALSE, WFlags f=0):QDialog(parent, name, modal, f)
+ButtonDialog::ButtonDialog(QString buttonName, QWidget *parent, const char*name, bool modal, WFlags f):QDialog(parent, name, modal, f)
 {
         setCaption(tr(buttonName));
 
         QVBoxLayout *layout = new QVBoxLayout(this);
 
         QHBoxLayout *hlayout1 = new QHBoxLayout(this);
         QHBoxLayout *hlayout2 = new QHBoxLayout(this);
         QHBoxLayout *hlayout3 = new QHBoxLayout(this);
 
         layout->addSpacing(5);
         layout->addLayout(hlayout1);
         layout->addSpacing(5);
@@ -102,25 +102,25 @@ QStringList ButtonDialog::getRemotes()
         {
                 QMessageBox *mb = new QMessageBox("Error!",
                                                                                         "couldnt connect to socket",
                                                                                         QMessageBox::NoIcon,
                                                                                         QMessageBox::Ok,
                                                                                         QMessageBox::NoButton,
                                                                                         QMessageBox::NoButton);
                 mb->exec();
                 perror("ButtonDialog::GetRemotes");
                 return NULL;
         }
 
-        if(std::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1)
+        if(::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1)
         {
                 QMessageBox *mb = new QMessageBox("Error!",
                                                                                         "couldnt connect to socket",
                                                                                         QMessageBox::NoIcon,
                                                                                         QMessageBox::Ok,
                                                                                         QMessageBox::NoButton,
                                                                                         QMessageBox::NoButton);
                 mb->exec();
                 perror("ButtonDialog::GetRemotes");
                 return NULL;
         }
 
@@ -145,25 +145,25 @@ QStringList ButtonDialog::getRemotes()
         {
                 QMessageBox *mb = new QMessageBox("Error!",
                                                                                         "bad packet",
                                                                                         QMessageBox::NoIcon,
                                                                                         QMessageBox::Ok,
                                                                                         QMessageBox::NoButton,
                                                                                         QMessageBox::NoButton);
                 mb->exec();
                 perror("ButtonDialog::GetRemotes");
                 return NULL;
         }
 
-        std::close(fd);
+        ::close(fd);
         return list;
 }
 
 QStringList ButtonDialog::getButtons(const char *remoteName)
 {
         QString write_buffer = "LIST ";
         const char *readbuffer;
         int i, j, numlines;
         QStringList list;
         QString string;
 
         write_buffer += remoteName;
@@ -175,25 +175,25 @@ QStringList ButtonDialog::getButtons(const char *remoteName)
                 QMessageBox *mb = new QMessageBox("Error!",
                                                                                         "couldnt connect to socket",
                                                                                         QMessageBox::NoIcon,
                                                                                         QMessageBox::Ok,
                                                                                         QMessageBox::NoButton,
                                                                                         QMessageBox::NoButton);
                 mb->exec();
                 perror("ButtonDialog::GetButtons");
                 return NULL;
         }
 
 
-        if(std::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1)
+        if(::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1)
         {
                 QMessageBox *mb = new QMessageBox("Error!",
                                                                                         "couldnt connect to socket",
                                                                                         QMessageBox::NoIcon,
                                                                                         QMessageBox::Ok,
                                                                                         QMessageBox::NoButton,
                                                                                         QMessageBox::NoButton);
                 mb->exec();
                 perror("ButtonDialog::GetButtons");
                 return NULL;
         }
 
@@ -221,25 +221,25 @@ QStringList ButtonDialog::getButtons(const char *remoteName)
         {
                 QMessageBox *mb = new QMessageBox("Error!",
                                                                                         "bad packet",
                                                                                         QMessageBox::NoIcon,
                                                                                         QMessageBox::Ok,
                                                                                         QMessageBox::NoButton,
                                                                                         QMessageBox::NoButton);
                 mb->exec();
                 perror("ButtonDialog::GetButtons");
                 return NULL;
         }
 
-        std::close(fd);
+        ::close(fd);
         return list;
 }
 
 
 //this function was ripped for rc.c in xrc, it is available here: http://www.lirc.org/software.html
 const char *ButtonDialog::readPacket()
 {
         static char buffer[PACKET_SIZE+1]="";
         char *end;
         static int ptr=0,end_len=0;
         ssize_t ret;
         timeout = 0;