1 files changed, 4 insertions, 4 deletions

diff --git a/noncore/tools/remote/remotetab.cpp b/noncore/tools/remote/remotetab.cpp
index 64b8ee4..5b02e94 100644
--- a/noncore/tools/remote/remotetab.cpp
+++ b/noncore/tools/remote/remotetab.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 "remotetab.h"
 
-RemoteTab::RemoteTab(QWidget *parent=0, const char *name=0):QWidget(parent,name)
+RemoteTab::RemoteTab(QWidget *parent, const char *name):QWidget(parent,name)
 {
         QVBoxLayout *layout = new QVBoxLayout(this);
 
         topGroup = new TopGroup(this);
         //topGroup->setMaximumHeight(22);
         layout->addWidget(topGroup, 0, 0);
         printf("%d %d", topGroup->width(), topGroup->height());
 
         layout->addSpacing(1);
 
         dvdGroup = new DVDGroup(this);
         //dvdGroup->setMaximumHeight(68);
@@ -62,29 +62,29 @@ int RemoteTab::sendIR()
 
         fd = socket(AF_UNIX, SOCK_STREAM, 0);
         if(fd == -1)
         {
                 QMessageBox *mb = new QMessageBox("Error!",
                                                                                         "couldnt connect to socket",
                                                                                         QMessageBox::NoIcon,
                                                                                         QMessageBox::Ok,
                                                                                         QMessageBox::NoButton,
                                                                                         QMessageBox::NoButton);
                 mb->exec();
                 perror("RemoteTab::SendIR");
-                return NULL;
+                return 0;
         }
 
 
-        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("RemoteTab::SendIR");
         }
 
         printf("fd2: %d\n", fd);
@@ -94,25 +94,25 @@ int RemoteTab::sendIR()
         printf("%d\n", write(fd, write_buffer, strlen(write_buffer) ) );
         printf("2\n");
         while(!done)
         {
                 read_buffer=readPacket();
                 printf("%s\n", read_buffer);
                 if(strcasecmp(read_buffer, "END") == 0)
                 {
                         printf("done reading packet\n");
                         done=true;
                 }
         }
-        std::close(fd);
+        ::close(fd);
 }
 
         //      printf("%s\n", readPacket());
         //      printf("%d\n", read(fd, read_buffer,sizeof(read_buffer)) );
         //      printf("%s", read_buffer);
 
 //this function was ripped for rc.c in xrc, it is available here: http://www.lirc.org/software.html
 const char *RemoteTab::readPacket()
 {
         static char buffer[PACKET_SIZE+1]="";
         char *end;
         static int ptr=0,end_len=0;