| -rw-r--r-- | noncore/tools/remote/dvdgroup.h | 1 | ||||
| -rw-r--r-- | noncore/tools/remote/mainview.cpp | 4 | ||||
| -rw-r--r-- | noncore/tools/remote/mainview.h | 1 | ||||
| -rw-r--r-- | noncore/tools/remote/remote.cpp | 1 | ||||
| -rw-r--r-- | noncore/tools/remote/vcrgroup.h | 1 |
5 files changed, 3 insertions, 5 deletions
diff --git a/noncore/tools/remote/dvdgroup.h b/noncore/tools/remote/dvdgroup.h index 04c301b..c9fe347 100644 --- a/noncore/tools/remote/dvdgroup.h +++ b/noncore/tools/remote/dvdgroup.h @@ -1,27 +1,26 @@ /* Opie-Remote. emulates remote controlls on an iPaq (and maybe a Zaurus) in Opie. Copyright (C) 2002 Thomas Stephens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later 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 <qwidget.h> #include <qpushbutton.h> #include <qlayout.h> -#include <qpe/resource.h> #include <qiconset.h> class DVDGroup : public QWidget { public: DVDGroup(QWidget *parent=0, const char *name=0); }; diff --git a/noncore/tools/remote/mainview.cpp b/noncore/tools/remote/mainview.cpp index eaba7df..724eba9 100644 --- a/noncore/tools/remote/mainview.cpp +++ b/noncore/tools/remote/mainview.cpp @@ -1,65 +1,67 @@ /* Opie-Remote. emulates remote controlls on an iPaq (and maybe a Zaurus) in Opie. Copyright (C) 2002 Thomas Stephens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later 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 "mainview.h" +#include <opie2/oresource.h> + MainView::MainView(QWidget *parent, const char *name) : QWidget(parent, name) { - setIcon( Resource::loadPixmap( "remote" ) ); + setIcon( Opie::Core::OResource::loadPixmap( "remote", Opie::Core::OResource::SmallIcon ) ); setCaption(tr("Remote") ); QVBoxLayout *layout = new QVBoxLayout(this); QTabWidget *tabs = new QTabWidget(this); layout->addWidget(tabs); remote = new RemoteTab(tabs); learn = new LearnTab(tabs); config = new ConfigTab(tabs); help = new HelpTab(tabs); connect(config, SIGNAL(remotesChanged()), this, SLOT(updateRemotesList()) ); remote->setIRSocket(fd); tabs->addTab(remote, tr("Remote") ); tabs->addTab(learn,tr("Learn") ); tabs->addTab(config,tr("Config") ); tabs->addTab(help, tr("Help") ); printf("1\n"); cfg = new Config("Remote"); printf("2\n"); remote->setConfig(cfg); config->setConfig(cfg); } int MainView::getIRSocket() { return fd; } void MainView::setIRSocket(int newfd) { fd = newfd; remote->setIRSocket(fd); } void MainView::updateRemotesList() { remote->updateRemotesList(); printf("MainView: got remotes changed signal\n"); } diff --git a/noncore/tools/remote/mainview.h b/noncore/tools/remote/mainview.h index e93da5c..7ea82a6 100644 --- a/noncore/tools/remote/mainview.h +++ b/noncore/tools/remote/mainview.h @@ -1,56 +1,55 @@ /* Opie-Remote. emulates remote controlls on an iPaq (and maybe a Zaurus) in Opie. Copyright (C) 2002 Thomas Stephens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later 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 <qpe/qpeapplication.h> -#include <qpe/resource.h> #include <qpe/config.h> #include <qpushbutton.h> #include <qtabwidget.h> #include <qlayout.h> #include <qmessagebox.h> #include <qpaintdevice.h> #include <qobject.h> #include <sys/socket.h> #include <sys/types.h> #include <sys/un.h> #include <unistd.h> #include <stdio.h> #include <signal.h> #include "remotetab.h" #include "learntab.h" #include "configtab.h" #include "helptab.h" #define BUFFERSIZE 256 class MainView : public QWidget { Q_OBJECT public: MainView(QWidget *parent=0, const char *name=0); int getIRSocket(); void setIRSocket(int newfd); public slots: void updateRemotesList(); private: int fd; RemoteTab *remote; ConfigTab *config; LearnTab *learn; HelpTab *help; Config *cfg; }; diff --git a/noncore/tools/remote/remote.cpp b/noncore/tools/remote/remote.cpp index 638629f..35d06bc 100644 --- a/noncore/tools/remote/remote.cpp +++ b/noncore/tools/remote/remote.cpp @@ -1,69 +1,68 @@ /* Opie-Remote. emulates remote controlls on an iPaq (and maybe a Zaurus) in Opie. Copyright (C) 2002 Thomas Stephens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later 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 "mainview.h" /* OPIE */ #include <qpe/qpeapplication.h> -#include <qpe/resource.h> #include <qpe/config.h> /* QT */ #include <qpushbutton.h> #include <qtabwidget.h> #include <qlayout.h> #include <qmessagebox.h> #include <qpaintdevice.h> #include <qobject.h> /* STD */ #include <sys/socket.h> #include <sys/types.h> #include <sys/un.h> #include <unistd.h> #include <stdio.h> #include <signal.h> /*void reconnect(int &fd) { // struct sockaddr_un addr; addr.sun_family=AF_UNIX; strcpy(addr.sun_path,"/dev/lircd"); fd = socket(AF_UNIX, SOCK_STREAM, 0); 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(); } } */ int main( int argc, char **argv ) { QPEApplication a( argc, argv ); MainView w; int fd; // struct sockaddr_un addr; // char read_buffer[BUFFERSIZE+1]; diff --git a/noncore/tools/remote/vcrgroup.h b/noncore/tools/remote/vcrgroup.h index fe40e42..dac31fd 100644 --- a/noncore/tools/remote/vcrgroup.h +++ b/noncore/tools/remote/vcrgroup.h @@ -1,27 +1,26 @@ /* Opie-Remote. emulates remote controlls on an iPaq (and maybe a Zaurus) in Opie. Copyright (C) 2002 Thomas Stephens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later 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 <qwidget.h> #include <qpushbutton.h> #include <qlayout.h> -#include <qpe/resource.h> #include <qiconset.h> class VCRGroup : public QWidget { public: VCRGroup(QWidget *parent=0, const char *name=0); }; |