11 files changed, 43 insertions, 45 deletions
diff --git a/noncore/todayplugins/stockticker/config.in b/noncore/todayplugins/stockticker/config.in index 83e7fbd..f0fd4aa 100644 --- a/noncore/todayplugins/stockticker/config.in +++ b/noncore/todayplugins/stockticker/config.in | |||
@@ -3,3 +3,3 @@ | |||
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && TODAY | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2PIM && LIBOPIE2UI && TODAY |
5 | 5 | ||
diff --git a/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control b/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control index 3e3bad1..f04ad64 100644 --- a/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control +++ b/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control | |||
@@ -6,3 +6,3 @@ Maintainer: L.J. Potter <lpotter@trolltech.com> | |||
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: libqte2, opie-today | 7 | Depends: libqte2, libopiecore2, libopiepim2, libopieui2, opie-today |
8 | Description: Stock ticker plugin for Today | 8 | Description: Stock ticker plugin for Today |
diff --git a/noncore/todayplugins/stockticker/stockticker/config.in b/noncore/todayplugins/stockticker/stockticker/config.in index d9e0f1f..1252b63 100644 --- a/noncore/todayplugins/stockticker/stockticker/config.in +++ b/noncore/todayplugins/stockticker/stockticker/config.in | |||
@@ -4,2 +4,2 @@ config TODAY_STOCKTICKERSUB | |||
4 | default "y" if TODAY_STOCKTICKER | 4 | default "y" if TODAY_STOCKTICKER |
5 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && TODAY | 5 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && TODAY |
diff --git a/noncore/todayplugins/stockticker/stockticker/inputDialog.cpp b/noncore/todayplugins/stockticker/stockticker/inputDialog.cpp index 64798f4..b3fa708 100644 --- a/noncore/todayplugins/stockticker/stockticker/inputDialog.cpp +++ b/noncore/todayplugins/stockticker/stockticker/inputDialog.cpp | |||
@@ -3,3 +3,2 @@ | |||
3 | #include <qapplication.h> | 3 | #include <qapplication.h> |
4 | |||
5 | #include <qlayout.h> | 4 | #include <qlayout.h> |
@@ -17,4 +16,2 @@ | |||
17 | 16 | ||
18 | #include <opie/oprocess.h> | ||
19 | |||
20 | #include <stdlib.h> | 17 | #include <stdlib.h> |
@@ -33,5 +30,5 @@ InputDialog::InputDialog( ) | |||
33 | LineEdit1->setFocus(); | 30 | LineEdit1->setFocus(); |
34 | 31 | ||
35 | layout->addMultiCellWidget( LineEdit1, 0, 0, 0, 3); | 32 | layout->addMultiCellWidget( LineEdit1, 0, 0, 0, 3); |
36 | 33 | ||
37 | QLabel *label; | 34 | QLabel *label; |
@@ -64,3 +61,3 @@ void InputDialog::doLookup() { | |||
64 | proc<<"-O"<< tempHtml<< url; | 61 | proc<<"-O"<< tempHtml<< url; |
65 | 62 | ||
66 | connect( &proc, SIGNAL( processExited(OProcess*)),this, SLOT( showBrowser(OProcess*))); | 63 | connect( &proc, SIGNAL( processExited(OProcess*)),this, SLOT( showBrowser(OProcess*))); |
@@ -74,4 +71,4 @@ void InputDialog::doLookup() { | |||
74 | LineEdit1->text(); | 71 | LineEdit1->text(); |
75 | 72 | ||
76 | 73 | ||
77 | } | 74 | } |
@@ -81,3 +78,3 @@ void InputDialog::showBrowser(OProcess*) { | |||
81 | QString tempHtml = "/tmp/stockticker.html"; | 78 | QString tempHtml = "/tmp/stockticker.html"; |
82 | 79 | ||
83 | HelpWindow *StockLookup = new HelpWindow( tempHtml,".",this, "SymbolLookup"); | 80 | HelpWindow *StockLookup = new HelpWindow( tempHtml,".",this, "SymbolLookup"); |
@@ -87,3 +84,3 @@ void InputDialog::showBrowser(OProcess*) { | |||
87 | LineEdit1->text(); | 84 | LineEdit1->text(); |
88 | 85 | ||
89 | } | 86 | } |
diff --git a/noncore/todayplugins/stockticker/stockticker/inputDialog.h b/noncore/todayplugins/stockticker/stockticker/inputDialog.h index 15c2f22..a1c00bd 100644 --- a/noncore/todayplugins/stockticker/stockticker/inputDialog.h +++ b/noncore/todayplugins/stockticker/stockticker/inputDialog.h | |||
@@ -4,2 +4,4 @@ | |||
4 | 4 | ||
5 | #include <opie2/oprocess.h> | ||
6 | |||
5 | #include <qvariant.h> | 7 | #include <qvariant.h> |
@@ -7,3 +9,2 @@ | |||
7 | #include <qmainwindow.h> | 9 | #include <qmainwindow.h> |
8 | #include <opie/oprocess.h> | ||
9 | 10 | ||
@@ -18,3 +19,3 @@ public: | |||
18 | ~InputDialog(); | 19 | ~InputDialog(); |
19 | 20 | ||
20 | private: | 21 | private: |
@@ -23,5 +24,5 @@ private slots: | |||
23 | void doLookup(); | 24 | void doLookup(); |
24 | void showBrowser(OProcess*); | 25 | void showBrowser(OProcess*); |
25 | protected slots: | 26 | protected slots: |
26 | 27 | ||
27 | }; | 28 | }; |
diff --git a/noncore/todayplugins/stockticker/stockticker/stockticker.pro b/noncore/todayplugins/stockticker/stockticker/stockticker.pro index 38a9425..a33c877 100644 --- a/noncore/todayplugins/stockticker/stockticker/stockticker.pro +++ b/noncore/todayplugins/stockticker/stockticker/stockticker.pro | |||
@@ -4,7 +4,7 @@ HEADERS = inputDialog.h helpwindow.h | |||
4 | SOURCES = inputDialog.cpp helpwindow.cpp main.cpp | 4 | SOURCES = inputDialog.cpp helpwindow.cpp main.cpp |
5 | INTERFACES = | 5 | INTERFACES = |
6 | TARGET = stockticker | 6 | TARGET = stockticker |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += $(OPIEDIR)/include | 8 | DEPENDPATH += $(OPIEDIR)/include |
9 | LIBS+= -lqpe -lopie | 9 | LIBS+= -lqpe -lopiecore2 |
10 | DESTDIR = $(OPIEDIR)/bin | 10 | DESTDIR = $(OPIEDIR)/bin |
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.cpp b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.cpp index 915233a..009d390 100644 --- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.cpp +++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.cpp | |||
@@ -17,3 +17,4 @@ | |||
17 | #include "stocktickerconfig.h" | 17 | #include "stocktickerconfig.h" |
18 | #include <opie/todayconfigwidget.h> | 18 | |
19 | #include <opie2/todayconfigwidget.h> | ||
19 | 20 | ||
@@ -22,3 +23,2 @@ | |||
22 | #include <qapplication.h> | 23 | #include <qapplication.h> |
23 | |||
24 | #include <qlayout.h> | 24 | #include <qlayout.h> |
@@ -46,5 +46,5 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* | |||
46 | // QWhatsThis::add( LineEdit1, tr("Enter the stock symbols you want to be shown here.")); | 46 | // QWhatsThis::add( LineEdit1, tr("Enter the stock symbols you want to be shown here.")); |
47 | 47 | ||
48 | layout->addMultiCellWidget( LineEdit1, 0, 0, 0, 4); | 48 | layout->addMultiCellWidget( LineEdit1, 0, 0, 0, 4); |
49 | 49 | ||
50 | Config cfg( "stockticker"); | 50 | Config cfg( "stockticker"); |
@@ -54,3 +54,3 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* | |||
54 | LineEdit1->setText(symbollist); | 54 | LineEdit1->setText(symbollist); |
55 | 55 | ||
56 | QLabel *label; | 56 | QLabel *label; |
@@ -67,3 +67,3 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* | |||
67 | QWhatsThis::add( timeCheck, tr("Toggles Time of current price field")); | 67 | QWhatsThis::add( timeCheck, tr("Toggles Time of current price field")); |
68 | 68 | ||
69 | dateCheck= new QCheckBox ( "Date", this ); | 69 | dateCheck= new QCheckBox ( "Date", this ); |
@@ -72,3 +72,3 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* | |||
72 | QWhatsThis::add(dateCheck, tr("Toggles date field")); | 72 | QWhatsThis::add(dateCheck, tr("Toggles date field")); |
73 | 73 | ||
74 | symbolCheck= new QCheckBox ( "Symbol", this ); | 74 | symbolCheck= new QCheckBox ( "Symbol", this ); |
@@ -125,3 +125,3 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* | |||
125 | layout->addMultiCellWidget( timerDelaySpin , 6, 6, 0, 0); | 125 | layout->addMultiCellWidget( timerDelaySpin , 6, 6, 0, 0); |
126 | 126 | ||
127 | QLabel *label2; | 127 | QLabel *label2; |
@@ -139,3 +139,3 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* | |||
139 | layout->addMultiCellWidget( scrollSpeed , 7, 7, 0, 0); | 139 | layout->addMultiCellWidget( scrollSpeed , 7, 7, 0, 0); |
140 | 140 | ||
141 | QLabel *label3; | 141 | QLabel *label3; |
@@ -153,3 +153,3 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* | |||
153 | layout->addMultiCellWidget( scrollLength , 8, 8, 0, 0); | 153 | layout->addMultiCellWidget( scrollLength , 8, 8, 0, 0); |
154 | 154 | ||
155 | QLabel *label4; | 155 | QLabel *label4; |
@@ -159,3 +159,3 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* | |||
159 | layout->addMultiCellWidget( label4, 8, 8, 1, 2); | 159 | layout->addMultiCellWidget( label4, 8, 8, 1, 2); |
160 | 160 | ||
161 | // lookupButton = new QPushButton(this, "LookupButton"); | 161 | // lookupButton = new QPushButton(this, "LookupButton"); |
@@ -164,3 +164,3 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* | |||
164 | // layout->addMultiCellWidget( lookupButton , 9, 9, 0, 0); | 164 | // layout->addMultiCellWidget( lookupButton , 9, 9, 0, 0); |
165 | 165 | ||
166 | QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding ); | 166 | QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding ); |
@@ -194,3 +194,3 @@ void StocktickerPluginConfig::writeConfig() { | |||
194 | cfg.writeEntry("ScrollSpeed",scrollSpeed->value()); | 194 | cfg.writeEntry("ScrollSpeed",scrollSpeed->value()); |
195 | 195 | ||
196 | cfg.write(); | 196 | cfg.write(); |
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.h b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.h index 10f9678..3c852ce 100644 --- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.h +++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.h | |||
@@ -19,4 +19,5 @@ | |||
19 | 19 | ||
20 | #include <opie2/todayconfigwidget.h> | ||
21 | |||
20 | #include <qwidget.h> | 22 | #include <qwidget.h> |
21 | #include <opie/todayconfigwidget.h> | ||
22 | #include <qstring.h> | 23 | #include <qstring.h> |
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro index bb22b4e..baf6430 100644 --- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro +++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro | |||
@@ -22,3 +22,3 @@ DEPENDPATH += $(OPIEDIR)/include \ | |||
22 | 22 | ||
23 | LIBS+= -lqpe -lopie -lpthread | 23 | LIBS+= -lqpe -lopiecore2 -lopiepim2 -lopieui2 -lpthread |
24 | TMAKE_CFLAGS += -D__UNIX__ | 24 | TMAKE_CFLAGS += -D__UNIX__ |
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerplugin.h b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerplugin.h index e88c687..42af821 100644 --- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerplugin.h +++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerplugin.h | |||
@@ -20,2 +20,6 @@ | |||
20 | 20 | ||
21 | #include <opie2/oclickablelabel.h> | ||
22 | #include <opie2/todayplugininterface.h> | ||
23 | #include <opie2/todayconfigwidget.h> | ||
24 | |||
21 | #include <qstring.h> | 25 | #include <qstring.h> |
@@ -23,7 +27,2 @@ | |||
23 | 27 | ||
24 | #include <opie/oclickablelabel.h> | ||
25 | |||
26 | #include <opie/todayplugininterface.h> | ||
27 | #include <opie/todayconfigwidget.h> | ||
28 | |||
29 | class StockTickerPlugin : public TodayPluginObject { | 28 | class StockTickerPlugin : public TodayPluginObject { |
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp index fedc79c..51113ba 100644 --- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp +++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp | |||
@@ -16,3 +16,3 @@ | |||
16 | 16 | ||
17 | #include <qlayout.h> | 17 | #include <opie2/oticker.h> |
18 | 18 | ||
@@ -20,5 +20,5 @@ | |||
20 | 20 | ||
21 | #include <opie/oticker.h> | 21 | #include <qlayout.h> |
22 | 22 | ||
23 | extern "C" { | 23 | extern "C" { |
24 | #include "libstocks/stocks.h" | 24 | #include "libstocks/stocks.h" |
@@ -212,3 +212,3 @@ void getStocks(char *blah) { | |||
212 | 212 | ||
213 | /* Simple function which help to browse in the stocks list */ | 213 | /* Simple function which help to browse in the stocks list */ |
214 | stocks_tmp = next_stock(stocks_tmp); | 214 | stocks_tmp = next_stock(stocks_tmp); |
@@ -284,3 +284,3 @@ void getStocks(char *blah) { | |||
284 | 284 | ||
285 | // if(Sock->state() == QSocket::Idle) { | 285 | // if(Sock->state() == QSocket::Idle) { |
286 | // Sock->connectToHost("finance.yahoo.com", 80); | 286 | // Sock->connectToHost("finance.yahoo.com", 80); |