author | ar <ar> | 2004-05-31 13:04:55 (UTC) |
---|---|---|
committer | ar <ar> | 2004-05-31 13:04:55 (UTC) |
commit | 27b09fe4f930b96e82cea9fb0eb1a9b87f7ec062 (patch) (unidiff) | |
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 | |||
@@ -53,13 +53,12 @@ using namespace Opie::Core; | |||
53 | #endif | 53 | #endif |
54 | 54 | ||
55 | #define strlcpy strcpy | 55 | #define strlcpy strcpy |
56 | #include "auth.h" | 56 | #include "auth.h" |
57 | #include "modem.h" | 57 | #include "modem.h" |
58 | #include "pppdata.h" | 58 | #include "pppdata.h" |
59 | #define qError qDebug | ||
60 | 59 | ||
61 | 60 | ||
62 | #define MY_ASSERT(x) if (!(x)) { \ | 61 | #define MY_ASSERT(x) if (!(x)) { \ |
63 | ofatal << "ASSERT: \"" << #x << "\" in " << __FILE__ << " (" << __LINE__ << ")\n" << oendl; \ | 62 | ofatal << "ASSERT: \"" << #x << "\" in " << __FILE__ << " (" << __LINE__ << ")\n" << oendl; \ |
64 | exit(1); } | 63 | exit(1); } |
65 | 64 | ||
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 @@ | |||
1 | #ifndef TABLISTVIEW_H | 1 | #ifndef TABLISTVIEW_H |
2 | #define TABLISTVIEW_H | 2 | #define TABLISTVIEW_H |
3 | 3 | ||
4 | /* OPIE */ | ||
5 | #include <opie2/odebug.h> | ||
6 | |||
7 | /* QT */ | ||
4 | #include <qlistview.h> | 8 | #include <qlistview.h> |
5 | #include <qcursor.h> | 9 | #include <qcursor.h> |
6 | #include <qapplication.h> | 10 | #include <qapplication.h> |
7 | 11 | ||
8 | class TabListView : public QListView { | 12 | class TabListView : public QListView { |
9 | Q_OBJECT | 13 | Q_OBJECT |
10 | 14 | ||
11 | signals: | 15 | signals: |
12 | void moveItem(QListViewItem *item, QListViewItem *newFolder); | 16 | void moveItem(QListViewItem *item, QListViewItem *newFolder); |
13 | 17 | ||
14 | public: | 18 | public: |
15 | TabListView( QWidget* parent = 0, const char* name = 0) : QListView(parent, name){ currentSelectedItem = NULL; | 19 | TabListView( QWidget* parent = 0, const char* name = 0) : QListView(parent, name){ currentSelectedItem = NULL; |
16 | connect(this, SIGNAL(pressed ( QListViewItem *)), this, SLOT(itemPressed(QListViewItem *))); | 20 | connect(this, SIGNAL(pressed ( QListViewItem *)), this, SLOT(itemPressed(QListViewItem *))); |
17 | internalCursor.setShape(0); | 21 | internalCursor.setShape(0); |
18 | }; | 22 | }; |
19 | 23 | ||
20 | protected: | 24 | protected: |
21 | void contentsMouseReleaseEvent(QMouseEvent* ){ | 25 | void contentsMouseReleaseEvent(QMouseEvent* ){ |
22 | QListViewItem *newGroup = this->currentItem(); | 26 | QListViewItem *newGroup = this->currentItem(); |
23 | // Make sure they are both real. | 27 | // Make sure they are both real. |
24 | if (currentSelectedItem == NULL || newGroup == NULL) | 28 | if (currentSelectedItem == NULL || newGroup == NULL) |
25 | return; | 29 | return; |
26 | // Make sure they are not the same | 30 | // Make sure they are not the same |
27 | if(this->isSelected(currentSelectedItem) == true) | 31 | if(this->isSelected(currentSelectedItem) == true) |
28 | return; | 32 | return; |
29 | 33 | ||
30 | // Ok we have two valid items. | 34 | // Ok we have two valid items. |
31 | if(newGroup->parent()) | 35 | if(newGroup->parent()) |
32 | newGroup = newGroup->parent(); | 36 | newGroup = newGroup->parent(); |
33 | 37 | ||
34 | // Just in case the parent was null | 38 | // Just in case the parent was null |
35 | if(newGroup == NULL) | 39 | if(newGroup == NULL) |
36 | return; | 40 | return; |
37 | 41 | ||
38 | // If the new folder and buddies current parent are the same don't do anything. | 42 | // If the new folder and buddies current parent are the same don't do anything. |
39 | if (newGroup != currentSelectedItem->parent()) | 43 | if (newGroup != currentSelectedItem->parent()) |
40 | moveItem(currentSelectedItem, newGroup); | 44 | moveItem(currentSelectedItem, newGroup); |
41 | currentSelectedItem = NULL; | 45 | currentSelectedItem = NULL; |
42 | qApp->restoreOverrideCursor(); | 46 | qApp->restoreOverrideCursor(); |
43 | }; | 47 | }; |
44 | 48 | ||
45 | private slots: | 49 | private slots: |
46 | void itemPressed(QListViewItem *item){ | 50 | void itemPressed(QListViewItem *item){ |
47 | if(item == NULL || !item->parent()){ | 51 | if(item == NULL || !item->parent()){ |
48 | if(item == NULL) | 52 | if(item == NULL) |
49 | qDebug("Item is NULL"); | 53 | odebug << "Item is NULL" << oendl; |
50 | return; | 54 | return; |
51 | } | 55 | } |
52 | 56 | ||
53 | currentSelectedItem = item; | 57 | currentSelectedItem = item; |
54 | internalCursor.setShape(13); | 58 | internalCursor.setShape(13); |
55 | qApp->setOverrideCursor(internalCursor); | 59 | qApp->setOverrideCursor(internalCursor); |
56 | }; | 60 | }; |
57 | 61 | ||
58 | 62 | ||
59 | private: | 63 | private: |
60 | QListViewItem *currentSelectedItem; | 64 | QListViewItem *currentSelectedItem; |
61 | QCursor internalCursor; | 65 | QCursor internalCursor; |
62 | }; | 66 | }; |
63 | 67 | ||
64 | #endif | 68 | #endif |
65 | 69 | ||