author | ar <ar> | 2004-05-31 13:04:55 (UTC) |
---|---|---|
committer | ar <ar> | 2004-05-31 13:04:55 (UTC) |
commit | 27b09fe4f930b96e82cea9fb0eb1a9b87f7ec062 (patch) (side-by-side diff) | |
tree | 5b850ee6ad8b8a48b6c49f4a6ce10e75caf234e5 /noncore/settings | |
parent | 5bd7c2eee656e8f30635921f15770bd4a43da9e6 (diff) | |
download | opie-27b09fe4f930b96e82cea9fb0eb1a9b87f7ec062.zip opie-27b09fe4f930b96e82cea9fb0eb1a9b87f7ec062.tar.gz opie-27b09fe4f930b96e82cea9fb0eb1a9b87f7ec062.tar.bz2 |
- convert qDebug to odebug
-rw-r--r-- | noncore/settings/networksettings/ppp/modem.cpp | 1 | ||||
-rw-r--r-- | noncore/settings/tabmanager/tablistview.h | 24 |
2 files changed, 14 insertions, 11 deletions
diff --git a/noncore/settings/networksettings/ppp/modem.cpp b/noncore/settings/networksettings/ppp/modem.cpp index 3bc7d43..79f015b 100644 --- a/noncore/settings/networksettings/ppp/modem.cpp +++ b/noncore/settings/networksettings/ppp/modem.cpp @@ -47,25 +47,24 @@ using namespace Opie::Core; # include <arpa/nameser.h> # include <resolv.h> #endif #ifndef _PATH_RESCONF #define _PATH_RESCONF "/etc/resolv.conf" #endif #define strlcpy strcpy #include "auth.h" #include "modem.h" #include "pppdata.h" -#define qError qDebug #define MY_ASSERT(x) if (!(x)) { \ ofatal << "ASSERT: \"" << #x << "\" in " << __FILE__ << " (" << __LINE__ << ")\n" << oendl; \ exit(1); } static sigjmp_buf jmp_buffer; //Modem *Modem::modem = 0; diff --git a/noncore/settings/tabmanager/tablistview.h b/noncore/settings/tabmanager/tablistview.h index dfd88f7..54b87b6 100644 --- a/noncore/settings/tabmanager/tablistview.h +++ b/noncore/settings/tabmanager/tablistview.h @@ -1,65 +1,69 @@ #ifndef TABLISTVIEW_H #define TABLISTVIEW_H +/* OPIE */ +#include <opie2/odebug.h> + +/* QT */ #include <qlistview.h> #include <qcursor.h> #include <qapplication.h> -class TabListView : public QListView { +class TabListView : public QListView { Q_OBJECT - + signals: void moveItem(QListViewItem *item, QListViewItem *newFolder); public: TabListView( QWidget* parent = 0, const char* name = 0) : QListView(parent, name){ currentSelectedItem = NULL; connect(this, SIGNAL(pressed ( QListViewItem *)), this, SLOT(itemPressed(QListViewItem *))); internalCursor.setShape(0); }; protected: void contentsMouseReleaseEvent(QMouseEvent* ){ - QListViewItem *newGroup = this->currentItem(); + QListViewItem *newGroup = this->currentItem(); // Make sure they are both real. if (currentSelectedItem == NULL || newGroup == NULL) return; // Make sure they are not the same if(this->isSelected(currentSelectedItem) == true) return; - + // Ok we have two valid items. if(newGroup->parent()) newGroup = newGroup->parent(); - + // Just in case the parent was null if(newGroup == NULL) return; - - // If the new folder and buddies current parent are the same don't do anything. + + // If the new folder and buddies current parent are the same don't do anything. if (newGroup != currentSelectedItem->parent()) moveItem(currentSelectedItem, newGroup); currentSelectedItem = NULL; qApp->restoreOverrideCursor(); }; private slots: void itemPressed(QListViewItem *item){ if(item == NULL || !item->parent()){ if(item == NULL) - qDebug("Item is NULL"); + odebug << "Item is NULL" << oendl; return; } - + currentSelectedItem = item; internalCursor.setShape(13); qApp->setOverrideCursor(internalCursor); }; private: QListViewItem *currentSelectedItem; QCursor internalCursor; }; #endif - + |