diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-09-04 11:06:07 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-09-23 17:05:38 +0200 |
commit | 35231e9d2f06d098047dff1bb28b6a38fbb9343f (patch) | |
tree | 027fc433cb332aacf55ed90a7a55fe0e2a79b9fa | |
parent | 72c81f4be9f11f95dbe8b1dae3d9a30900fbcbf4 (diff) | |
download | qtactiveqt-35231e9d2f06d098047dff1bb28b6a38fbb9343f.tar.gz |
Remove remains of Windows CE and MSVC pre 2008.
Task-number: QTBUG-41127
Task-number: QTBUG-41130
Change-Id: I0907e92c99ed8861227e90beca579baeb25a06b4
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rw-r--r-- | examples/activeqt/activeqt.pro | 2 | ||||
-rw-r--r-- | examples/activeqt/webbrowser/main.cpp | 9 | ||||
-rw-r--r-- | examples/activeqt/webbrowser/mainwindow_windowsmobile.ui | 306 | ||||
-rw-r--r-- | examples/activeqt/webbrowser/webbrowser.pro | 1 | ||||
-rw-r--r-- | src/activeqt/activeqt.pro | 3 | ||||
-rw-r--r-- | src/activeqt/axshared.prx | 3 | ||||
-rw-r--r-- | src/activeqt/container/qaxbase.cpp | 16 | ||||
-rw-r--r-- | src/activeqt/container/qaxbase.h | 8 | ||||
-rw-r--r-- | src/activeqt/container/qaxobject.h | 8 | ||||
-rw-r--r-- | src/activeqt/container/qaxwidget.cpp | 60 | ||||
-rw-r--r-- | src/activeqt/container/qaxwidget.h | 8 | ||||
-rw-r--r-- | src/activeqt/control/qaxservermain.cpp | 8 | ||||
-rw-r--r-- | src/activeqt/shared/qaxtypefunctions.cpp | 2 | ||||
-rw-r--r-- | src/activeqt/shared/qaxtypes.cpp | 45 |
14 files changed, 4 insertions, 475 deletions
diff --git a/examples/activeqt/activeqt.pro b/examples/activeqt/activeqt.pro index 12501b3..1fe8bee 100644 --- a/examples/activeqt/activeqt.pro +++ b/examples/activeqt/activeqt.pro @@ -11,4 +11,4 @@ contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles2):!contains(QT_CONFIG, # For now only the contain examples with mingw, for the others you need # an IDL compiler -mingw|wince*:SUBDIRS = webbrowser +mingw:SUBDIRS = webbrowser diff --git a/examples/activeqt/webbrowser/main.cpp b/examples/activeqt/webbrowser/main.cpp index 76470bc..2f2992f 100644 --- a/examples/activeqt/webbrowser/main.cpp +++ b/examples/activeqt/webbrowser/main.cpp @@ -50,12 +50,7 @@ #include <QVariant> #include <QSettings> -#if defined(Q_WS_WINCE_WM) -#include "ui_mainwindow_windowsmobile.h" -#include <windows.h> -#else #include "ui_mainwindow.h" -#endif static const char qtProjectUrl[] = "qt-project.org"; static const char iWebBrowser2DocumentationUrl[] = "http://msdn.microsoft.com/en-us/library/aa752127%28v=vs.85%29.aspx"; @@ -336,11 +331,7 @@ int main(int argc, char ** argv) const QString url = arguments.size() > 1 ? arguments.at(1) : QString::fromLatin1(qtProjectUrl); w.navigate(url); -#if defined(Q_OS_WINCE) - w.showMaximized(); -#else w.show(); -#endif return a.exec(); } //! [4] diff --git a/examples/activeqt/webbrowser/mainwindow_windowsmobile.ui b/examples/activeqt/webbrowser/mainwindow_windowsmobile.ui deleted file mode 100644 index 29cdc6d..0000000 --- a/examples/activeqt/webbrowser/mainwindow_windowsmobile.ui +++ /dev/null @@ -1,306 +0,0 @@ -<ui version="4.0" stdsetdef="1" > - <class>MainWindow</class> - <widget class="QMainWindow" name="MainWindow" > - <property name="objectName" > - <string notr="true" >MainWindow</string> - </property> - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>812</width> - <height>605</height> - </rect> - </property> - <property name="windowTitle" > - <string>Qt WebBrowser</string> - </property> - <widget class="QWidget" name="centralWidget"> - <layout class="QHBoxLayout" > - <property name="objectName" > - <string notr="true" >unnamed</string> - </property> - <property name="margin" > - <number>0</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item> - <widget class="QFrame" name="Frame3" > - <property name="objectName" > - <string notr="true" >Frame3</string> - </property> - <property name="frameShape" > - <enum>QFrame::StyledPanel</enum> - </property> - <property name="frameShadow" > - <enum>QFrame::Sunken</enum> - </property> - <layout class="QVBoxLayout" > - <property name="objectName" > - <string notr="true" >unnamed</string> - </property> - <property name="margin" > - <number>1</number> - </property> - <property name="spacing" > - <number>0</number> - </property> - <item> - <widget class="QAxWidget" name="WebBrowser" > - <property name="objectName" > - <string notr="true" >WebBrowser</string> - </property> - <property name="focusPolicy" > - <enum>Qt::StrongFocus</enum> - </property> - <property name="control" > - <string>{F5AFC7EF-1571-48B6-A69C-F1833F4C3A44}</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - </layout> - </widget> - <widget class="QToolBar" name="tbNavigate" > - <property name="objectName" > - <string notr="true" >tbNavigate</string> - </property> - <property name="windowTitle" > - <string>Navigation</string> - </property> - <addaction name="actionBack" /> - <addaction name="actionForward" /> - <addaction name="actionStop" /> - <addaction name="actionRefresh" /> - <addaction name="actionHome" /> - <addaction name="separator" /> - <addaction name="actionSearch" /> - </widget> - <widget class="QToolBar" name="tbAddress" > - <property name="objectName" > - <string notr="true" >tbAddress</string> - </property> - <property name="windowTitle" > - <string>Address</string> - </property> - <addaction name="actionGo" /> - </widget> - <widget class="QMenuBar" name="menubar" > - <property name="objectName" > - <string notr="true" >menubar</string> - </property> - <widget class="QMenu" name="PopupMenu" > - <property name="objectName" > - <string notr="true" >PopupMenu</string> - </property> - <property name="title" > - <string>&File</string> - </property> - <widget class="QMenu" name="FileNewGroup_2" > - <property name="objectName" > - <string notr="true" >FileNewGroup_2</string> - </property> - <property name="title" > - <string>New</string> - </property> - <addaction name="actionNewWindow" /> - </widget> - <addaction name="FileNewGroup" /> - <addaction name="FileNewGroup_2" /> - <addaction name="separator" /> - <addaction name="actionFileClose" /> - </widget> - <widget class="QMenu" name="BookmarksMenu" > - <property name="objectName" > - <string notr="true" >BookmarksMenu</string> - </property> - <property name="title" > - <string>&Bookmarks</string> - </property> - <addaction name="actionAddBookmark" /> - <addaction name="separator" /> - </widget> - <widget class="QMenu" name="HistoryMenu" > - <property name="objectName" > - <string notr="true" >HistoryMenu</string> - </property> - <property name="title" > - <string>Hi&story</string> - </property> - </widget> - <widget class="QMenu" name="unnamed" > - <property name="objectName" > - <string notr="true" >unnamed</string> - </property> - <property name="title" > - <string>&Help</string> - </property> - <addaction name="actionAbout" /> - <addaction name="actionAboutQt" /> - </widget> - <addaction name="PopupMenu" /> - <addaction name="BookmarksMenu" /> - <addaction name="HistoryMenu" /> - <addaction name="unnamed" /> - </widget> - <action name="actionGo" > - <property name="objectName" > - <string>actionGo</string> - </property> - <property name="icon" > - <iconset>image0</iconset> - </property> - <property name="iconText" > - <string>Go</string> - </property> - </action> - <action name="actionBack" > - <property name="objectName" > - <string>actionBack</string> - </property> - <property name="icon" > - <iconset>image1</iconset> - </property> - <property name="iconText" > - <string>Back</string> - </property> - <property name="shortcut" > - <string>Backspace</string> - </property> - </action> - <action name="actionForward" > - <property name="objectName" > - <string>actionForward</string> - </property> - <property name="icon" > - <iconset>image2</iconset> - </property> - <property name="iconText" > - <string>Forward</string> - </property> - </action> - <action name="actionStop" > - <property name="objectName" > - <string>actionStop</string> - </property> - <property name="icon" > - <iconset>image3</iconset> - </property> - <property name="iconText" > - <string>Stop</string> - </property> - </action> - <action name="actionRefresh" > - <property name="objectName" > - <string>actionRefresh</string> - </property> - <property name="icon" > - <iconset>image4</iconset> - </property> - <property name="iconText" > - <string>Refresh</string> - </property> - </action> - <action name="actionHome" > - <property name="objectName" > - <string>actionHome</string> - </property> - <property name="icon" > - <iconset>image5</iconset> - </property> - <property name="iconText" > - <string>Home</string> - </property> - </action> - <action name="actionFileClose" > - <property name="objectName" > - <string>actionFileClose</string> - </property> - <property name="iconText" > - <string>Close</string> - </property> - <property name="text" > - <string>C&lose</string> - </property> - </action> - <action name="actionSearch" > - <property name="objectName" > - <string>actionSearch</string> - </property> - <property name="icon" > - <iconset>image6</iconset> - </property> - <property name="iconText" > - <string>Search</string> - </property> - </action> - <action name="actionAbout" > - <property name="objectName" > - <string>actionAbout</string> - </property> - <property name="iconText" > - <string>About</string> - </property> - </action> - <action name="actionAddBookmark" > - <property name="objectName" > - <string>actionAddBookmark</string> - </property> - <property name="text" > - <string>Add Bookmark</string> - </property> - </action> - <action name="actionAboutQt" > - <property name="objectName" > - <string>actionAboutQt</string> - </property> - <property name="iconText" > - <string>About Qt</string> - </property> - </action> - <actiongroup name="FileNewGroup" > - <action name="actionNewWindow" > - <property name="objectName" > - <string>actionNewWindow</string> - </property> - <property name="iconText" > - <string>Window</string> - </property> - <property name="shortcut" > - <string>Ctrl+N</string> - </property> - </action> - <property name="objectName" > - <string>FileNewGroup</string> - </property> - </actiongroup> - </widget> - <layoutdefault spacing="6" margin="11" /> - <images> - <image name="image0" > - <data format="XPM.GZ" length="1241" >789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade65232365200210543251d2e253d856405bffcbc54103b11c8563600020b03105719c4b530b08072f50880513560a09c080338d5209420294a4451a38c90426621ab5146d10de524a2aa417505445122861a547722bb0c971a3d2aa921c2ae446c6a9431fc85a9064551220e354009653dec00294e712a1ac4e97078a9a9b5e6020013b3f563</data> - </image> - <image name="image1" > - <data format="XPM.GZ" length="4494" >789ce596497332470c86effe15947573a5f4c1cc30cc542a07ef60bc808dd7540e3d9b6df006186c93ca7f8fba2535ce57be98dc9292313c487a2575f7ccf063a376d53baa6dfc589bbe9ad7fbbc96df99496da3983d3e7efcfec76f7faead87418dfe1a51500bd67f595befbfd6f2daf1f35369014e08a05e6fd4ab96e31e73d0282bc7a7cae23ff3ccfe8170ca6cee9843f51f3b4ec8cff9efccdebf2d2cf9b06bb9417a25c74f98bdff99390a84fb8e49af70f39891b2e40bfbf8b6b0917e87968346a8f5a6cc51c07ab02f2cf1983237552f709c86691e3bbd5be5821998a32067bd1765d13f67563d530a4b3df8b01c523d8ec74059faed086bfc82390e851b8ed3c86485e34365a9bfc5ece3df8433e10bcb5140f5dd3cf0e099f32f99e350cecb5858f2b1c1dc52fda663d334a277c0ecfd5d61c9373973120967969b548fd71b079e797d8e985b21eb63aecceb85e7c299f4ffaa2ce7739359ebc195631387c6ad1f5e302791ccbba72cf173e15cfa2d2cc7619cf1fa63c9dccaa4ff4bcfdc7fa82cfdf7999348f6bf299c4bfd4c59ea0f99535dafca71d60a65ffebca52ff8c3989e47cce98351fb785759e7bcbad65bf0be624ca9a8e87caac0fb1702ef191b2cc9731a7b9ec4f87d934659e27e142f8c671e6eb9d0ae7b2be07cc6924ccf999698a7e4f58f572e64cebb9f393444994e68e4365d9ff7be15caef70766ad678cb0f8f18359ebe109b3af27f199fadd794cf254eb196599774758e77d5496f5dd64a67959af122ef87c639b59eb81d34ba97fe3f4215196f3922acbbc28acf527cc792c7a857029ecf63bcded05efb8a52cf3cc9833ed2f66563dac0b8b1ebe3317ea77f73352173db8f6ccf54a66df0f30fb7c777d9bc214d2cf88d9cf73cfece3ddf3296b66da7fe199d7a32b5cc8feef31fbfe8f99bdde96b0faddf3272bac390665b99e90d9e7ef33972de9d73d7ff3d873255c49fc1b73257ee4f8d2eb5d336b3e8e8535ff86d9e7bbf35f2cf51366ef77cfeb6299df62563f3c0a8b1fdcf3d3569778773f756e66f7fcac967e175f797ffff5dfd9ff4103010d6698a35955030b2cb1c25bbcc3fbd5344861882352b8c5077c5c45836678c267ca7fc1314ebeaf81537cc599eb608e6ff88e1f2b682c705314b6486182dbb8f31d0ddca529f644619ff2db641d3cf82a8bfa9d62d7da670d3cc4233c760a63eaa08d2734478fac8f87ffc833788a6738c073bc20ebe3255eb1069d863e5e3b851bacfb7c6b0d0c30c488f24a3a2d4ddaf1986a3d600b13179be280ef597809e876e206000c69d8ec0e590f32c8a18012b7a0825b9799e018eee0de4e0b4318c103ff2ea2985b78c47d28a487ce276b634cca40356d1655801c3bf044af2136e0195ef8b711be4045ab50ff42e16bdbb6463d8e610253fe3d4855ec3ed80abd9f62397ef9c9e6cee835249bc31bbc731ff0010beacbcdbfaca29f2836a3e839fd1f3acb5cb6fd6e13b6605b34766097d6664cdf0d7faad9813dd827df08daf4de812ddaa7061c4017baf43ea6daef70c8fb0247704c932dc897b94e67da09553a811ef4a94a0f4ee10c069435216b630ae7a43b800b7fc6164ea543ea73ea75663b22a50e5cc215ec50956beaf606ead08080147b64c76403d20ebdc6142268528d3655ee3a1db6f88b535ee015b42081d4205ee1f4f335878501ea7644331dc81acecdb7ef63b86b32eae59956cff63237f92af7319c9a82669c989256bd0b6fa6fabe86bbfe0ecdadb9a399ce61b49a86355adfbedd45736756bc27b30afd161a9a9179585de33bf69fd2f8ebd7b5bf014644b906</data> - </image> - <image name="image2" > - <data format="XPM.GZ" length="4494" >789ce5965b4f23471085dff915d6d6db2aaac5e3b92aca037703cbc55c8c21ca43cf8c8d0dd85c6c307694ff9eeaaed3bd68771f968d14298a0a109fabebd4e99a9ef17cfad8e81d1f343e7e5a99cecc6c5435aaa1796a7cac9fc7e3c5ef7ffcf6e7ca8756d4909f661c35a20fbfac7ce8cc1a55e3f07ed2b7409702b4badaccfb996563020f5c7ecbf340b9a31c3591dff7ac7943e002cc8e73cf74acdcc27a8a2d37a5be4e1d9f04567f9fc105f25dcfea9726caad62a07c1158f58f94e3087e868ea57fa5fa0be590bfb11c3525affd4e03ebfa25b8507fbcaa1c47ca66e459fdf10c6c30af4dcfda8f5f9513dfffce71e1f5a956967adddfaeb25f4f7b60e8d199e596f42f6bc787ca213f554e5be06dc7a28ffdee282791cedb5c83d19fd795a55ecf4b3fb0ee07ebd312fae796e3283665e238524e2265de031bcc774d396d61be25b8c4fe1f02abfeab67f49f2867decfbd6393b6a03f03438f3bca19fa51cb33fc6f80fd7eae2c27e257e7cb4de5b4045f78d679f24960ddcfb172e6f73357ce63e88fc115ce43e558fcabbeb905fb7e47cae24ff5daca41af007bbd81e5b425f53aff6160d52f95f318f37d01a39ee7ca05f4790a469e0e1c97590bfa1b81f53c3e2bfbf5ecf697b532efe754398f31af437085eb65948b18e723f70cbf9e2bcc633db0f65b533609fcbafb372bf318fdcfc015e65b281731ee0ff6acf70767ca5e8f7be01abcab5cfa7e89e53cce2ba3fd1681b5df8172013f44e00acfbf4a39e8ef287b7dbe02234feefce795d727a36c12ccf75239d4b7c1bede9def42fcc0ef7960d5cbc05ebf543635aed752b94aa1ff02ee83ddf3b6a87c3d3f2b9b047a4fcaa17e0cf6f5eef928ab13f5476960d5eb7ac6f5dd07d7e04839e83d29d7be9ffbfe31b50dc723cfa87f08acf947e51a7ad457ee6760773ecaa4f47e36036bfd96673c3fb6c13578a01cf41f9505d5af3b2f655dc28fa93da33e550ef523e5e06f08861eb9e7b94cdfe7ddf753d50feb6f94437e00f67edcf3aa4e831ed8afe73bb05fefe655f7c37edcfd62bb81ddfb82935776cfeb41c87766ff2cfe7f1a4c6cb8e48ae91f68d4dce7015ff390473fad71c3b77cc7639ef03d3ffcb48f013ff293a84c79c6d54f693c8bc28b28589539bff2e2ed647e586389184bacf13a6ff0e6d71a32f92dde96bfdf9dbccc6387dba2d086caae4c668ff7bf68f0673ee0433ee263eef0099ff2199f8b62d0e32e5f704fea2fe5b70d3f57729556b91b349a1c718b634e64faa9fc7fc919e772220a91213254ca273b884bf72b4a54f1846ad925e93b1af56940d734a4110fe4efb5c40dddda907311734c7752d10b3a1ae289c634a17b7dafe331e995b3b124fbdfd25d85471763596fab7aa2a4f53d444653ded3773bb96e8faeae1de2ea8dff9da0b0ebfcd858e3357aa667bb1f68b4a5e7d256853559e8f56d64aefe85e6f44a0b5aea3bac5c2bebf74b8775fb6bfbb858771e7a6f1df09c36f89a36698bb6f53d5c4ef08ee4e6a2dd269b9d488729ed4a171b7bd40ece3228cce5d305edd3673ed7773139bd133a14d5233a96cff7a9237142a77446e7125dba900e70681564f5a6acdc1285ae9e0feaf150d675e8d2d59dd315ad52931fec2973d1a5489c6698e29c5a508829797bd629a52665bcf9fdd32ed95c1d50217b5c18b67390f34befb8e78873a9b6b39ad285216328a2de3bef5b32a59db5ccec42a6b565aaf7dffba6e663d3972b211ea86b065f3cbccbc7b53890399a21a55f677f5863e4f670c337df667f58e3d6dc99dbef3dd5ff6bdf73ff82c65fbfaefc0d4fb5b868</data> - </image> - <image name="image3" > - <data format="XPM.GZ" length="802" >789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade65232325500210543251d2e25658564056503300071f540dc3430007371012a492a830156496538c094848922c9c2259134c099304914e3604c8424aa5e6449b0044216ca824ba2da8b4512218b4d122e8b55520fee5974072164511da487ea490c7f22cba249e20d3efc018f3fcae0d2702eb5d2106992b5d65c00b9a48974</data> - </image> - <image name="image4" > - <data format="XPM.GZ" length="1241" >789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade65232365200210543251d2e253d856405bffcbc54105b19c8563600020b03103711c4b530b08072f50880513524ab518681443435ca984ae08ae06a94114a10ac443435ca3043904d4c4453a38ca604ae11590d9a0ab80bd0d46078914c35c4d885a608871a547f61f81d5d117a1862018930e5b8d5c0950c741a1b1e6a6aadb90086a9d853</data> - </image> - <image name="image5" > - <data format="XPM.GZ" length="5598" >789ca5985973db480ec7dff3295cc15b6a0b2351a428d6d63ef83e255bbe647b6a1fd02465dd872d9f53f3dd076c005dc926ce6a32eed8553f37fadf7fa0c1a69cdfbe6cdc9cb537befcf6e97145ab61be910fe861e34bf1349dbefdfedffffcf1e97323dae07f51bdbe117dfed7a7cfddd546bed199cfca0ae888016afeab62e8796ef110ee545caf05be16ae5bfc6ee096e7b6e756983f51b6f53b81257ecfb8eee7e9b162f66af1c78125fe48987f23f3fb81657e691cd5bddecc7316d555efd058f7eb2867aa771058f4de8c55cffb6dd4a34cf5b68d357e681c6515634db81a7e3ef59c35cccf5560bf9ef6953389c77660af074f15c751e05c38a6d81f2ef9f3a848f4e9d658f2c36b635dbfa54cc2383556bd33e12492fc70df38f1f3f8ae4cc2745a711285fda7caa4f95e06967a2d8c63f27a8fc2a60fa4acfa980a371b898f0767dc6cf8fdbc9f84c27e4de124d2fabe186b3dee8c75ff1365dbef2db0ccef0987fd2f2a6632fd576552fd2b63d57b08ecd7d39d70b321fd0560acfb6d1a4b7e3050764de7d79f08a70de937ea7b7689e68f4de1e0776e2c7ab8abecb47eb170aa7ee822b0e89f1b4b7fd24dc529abe9794f02cbf99e2b3badc7a5b1ee97089b3e0e8d253f3c364e253e5576120ff7c63a9f7966d2e771d358e75bca4ef3bb0e2cf9758db5fe47c6b21eeb81bd3f07c2ad58ebd130d67e6a194b3cf97e62b2fa24c67a1f5d2aab3f8781a53e17c6eaa7082cfa3de156acf9d5034b7e3563f1eb96c6eaf7c0b815fbf8d2739e3aedefb1b1de9723618b77a49cebf946c6e20f5f8d251e753e8b5bb9e74c980a4afc7a7fbf66b1ed8fb7c67a9ec7c2ad5cfd74038bdfa6b1f6cbd458fd2e84b358efbb0363f5b71358fccd8c33596f9c4bfddcc458fac78d8cf5797b3296f5f82c4c49e6f5c9bf9fb23ce41307967e3935d6f36c0b67b1ce3f188b5f3757367f5363b98fdc38b0cc0f8cf5f90bf3ea97028bfe50981289777d63edcf81b1c4439897f3c52d615738cfe0df371c1deb7db265acf98d8d253f7a50d67a60c758cfcbf4cc7f2fb0f8bf1736bfae30d6f35f1a4b3ce6c6e2df95ca85f6f7dc58f3db0e5c783e14e6ebc533e87e963fbe0873f9fd3cc97c91693fd028b0d4e3c558f3eb0b9b5f972bab3fe78c353f3056bfabc0e2371636bfe4cf9b29d1e76b69acfdb863accfd33cb0dc2fa7c6e2179e03cb79ae940b7dffbf1b6bfd1363f53b12367f581a6b3d1bca56df6e60a9bfc6e765def4ecef6bc7eafaf9e8d558fbb7a15ce87d7263acf7ffbdb1e40f33e1e0cf29ebfea8eb6d7ff29f17f8f4137dfe51d8fa0117ca65ee3fbfe3bd705116b2de9f775e3af50313e1a229f1f0682cf1b052e6e1d9dfbf1cddd4fd2363cdcfef5fb05b7d1f0c944bed4f67ac9f5f27c265bf4c3d9f07eefb787f1f96695eaa1e0a174d7d7f81b1ee4f81a5fe75e552d9bf1fca7e617e9e8d556f33b0c4fbcf5ffdb44c956bc6a2d75dfd6c2020fd3ce2ff69a0c31c0b2cff91461fef71804374bfaa81231ce3044b9ce2ecd734380fc2392e70890ff888bfa6f184cff8c24e5ef10ddf71f3a37c3ed6c015afdec26dfeb983bbb887fb78f0f734380fe031c7437f3247788c27d8fe713e1f6a1076f014cfb08be7ac7481977885d75c951fe4f3630dcea3c3eb7b9cc70d6b9ce12d9fee26de610debeb69b0fb578cb89a0d8c399711e794609373d9c39455f2b53466d8c20c17809c45cc7a3c00f011081cffccff379fef35388f1d0428a0c401f459e58c3d45700f0003cee71d8678fc730d7430e2557d3c8331f7568c37308129cc7006733e9d262c6008cb6ff3f94ea3c72bc678ca3f1fb80a637884154c71c974c55d72c91a4feca4fdf553f8ad46554d8e9ee30a9eb1efab31611f2ff0ca346427bb9c11e114debe7e7ebed328318702e7f0ce9dbee47a1c724655b745b0c94ea6b0c55519f059b98f73d19a6cc30eecc21eecfb7100877004c770026de8e070bdfe805338832e9cc3055cc2955f7b0d3de8f0cfebb5356ee016eea0c6a30e11342086049a907aadcd35355a90111250f5e5288706bfdb4bea572a78b49e06ddd3a0d2807a2502110d6944639ad09466ebf9e8ae684e0bf5b1a4075ab28f11ffa1df678dc7f57cb0c68a9ee899355e7c2ddbf40a31bdb1c63bcdfe86c6803669cb9f4555c76b38a76dcee57d5d1f5c8f1d5af0b9745581bb029a5c8f3eedd21eed73b70ebe56fa91061dd061f05139e9d1116b1cfb9aee55c4fcf6330d5cd289d778a6b65fdd831dea702e256b9cf2b974a84367d4fd580347744e17744957acc13e7cfc095d538f356ed8cd2ddd518dea147da4c1956890ffcf295ed5e4c83b4a59f182b9455935e3b801ab791c7fa4e188d7a4bcbee66353feaef9df8852ca2f3e9ee3ef73840f359cabfec22979f4ddbd1bf018ba118f318f899bf298b9b95bb8e537cffe9ffffef4171c39a0bf</data> - </image> - <image name="image6" > - <data format="XPM.GZ" length="3742" >789c8d96c9521c490c86ef3c458775734cc8ddd5b5c6c41c303b180cc60b66620eaacc2c9aa5599b7562de7da45fc5180c8e98fa39f091522e4a49c9bbb783bdedcdc1db77735733991d864198c8e5e06dbc9e4eeffffceb8fbfe7de64d9407f466531c8defc36f76667360883adb3d364c013051ae2039f8147266359068f4dc6740a2e4db05f05d726f0253898c017c6a3cc04ffafce79aa3af0143c36c17e055caa0aacbf06aeb2203e5f09ae4d185f75ce472de6e7737063c2fcb57356b702fed673e32c473d4bcf3760198f02e69325706b022f3a676df0f567e05035d1ed273dc79883e7c1d1045e70ae2456d84fd9738a589f0b703261bc72ae25e17ee4b0e7d8f3b5733374e603e32c37c11ff36970db12f193f7e07c1c6bec87c6e0c604ff0e1c4db03f36cec7e3a6f4fd2e38e779eee7bd05e7e350fa7e4fc0455ee6b84fb9eab913bfdf1c5ce5758efba54fffb1e75302d726f8af3817a5f8f922584cf06fc0211f951ebfd0b30afe07ce4510dfdf1e38e665e9f9f1e01c32cf1fda06a73c2f7c7eac5f8c8b61eef582f315b909dc82f1c17e07dc1459e5f1c77d953abb787e0ab832611cf957366dd9c707f556762a3fcf8673ddd6d8afdc1957b909fe98af2a65d4c787c08d09e3c8bfaad504f378de83a309e35fc049d9d747bda19c7dbe8f602d88d6fd11af3a33c1ffde398e02ec69178c0b04bb7fa12be03e08e7ab4b895e2f74ec1ca2e73f6d811b2d37df1feaa9969082f71ff4a73a98c01f9cdb3678fde27eea58f7f9cdc8bfba33c11efda2199ac01bcead048fd72678a4e9e3f6a86f6d172acc87fc69f290f9386f3d72f478a1bf348509fea8b7a66c9b80fec1a8b7a66a53f47cc2fe9b5ae77346fe35ad09e761703081d12f9b68c2fc57ce6d0c1e6fe463934ce0efc63234c11ffd5b4a13c66f9cb53d79fded832bcd27f47f5aeb59055e744eb1df3fe2251aeee4e7453f9264c27aa847b44f7f4f909fda3efb7ae30c5c84b65f1fef435b9a608ff7a4ad4c981ffb6b6b13d8fda5edfb37eff4dcb65e2f787f5a7cb0f7fd0413ecf13eb49d09f6783ff07cf97d8ec0a3f8d8df516f483faf07c45b1f27e9f30ff989e9fdbe11ff1034fd3c9eebe068c238fa9f6677f2fb27ac1f475dd3f97da25fc6c204be755673ef3f8db3360c1f1f824b13c651df2877c44fd0df511efe5ea39f44318151cf9a4e2ab0af870d63fee4dc55fdfe109f880ff3fb788a8ff98df733762630fa471aa6febda2839e5b3f0fe1bef4f18bc9fb01fa7dca4ce0bb9e5b671ef69c3cff18f99cc626d853cf551f3fe453ca531bbdde979cbb2c793e207f536102a39fa5ca0446bf4279f97b89feaabb5181511f38bedf2ffa47373461bdcfe0dc8471d46387860fc6fbaad155c11ef7a5d953747ede69cf2a30fe3fd06c5121fe88572726f8a37f68720ffbfdadf7ac02fb7e82098c7e85ebf2fde37dea92098cf7acc367bc33fbff7a6ecfc4c22d078eaac41d1ff0e4d7f66a7df84293e71ecfec858f9ee8d1fef8a9c733fb139ef2299ff1395ff0255fc167c233befee1f1cc3ef10ddff21ddff303cfabe77bd584177891971e3d7ed8db4e7b2df30aaff29a7aac3ff9ebe4a9bdf2067fe04ddee28ffafb36eff027de558fcfbaab2ffc95bf3db5578b3dfecefb3ce411673c56ceb9e0b23f47a5fbac7fb26f889988742f2a129e504b81a246e0c8ec293cb7a7441d0b1dd0840ee9883486744253bea4533a7bd5fe9c2ed4feb29fff4aff32a36b8dd5e92fe6bfa15bddcf1dddd303cd93c6911668aa2b5cbc363f3c16799f9630fbb2d20aadd21aadeb3d547a8617f6f0d8a00fb4495bfadb47daa61dfa84f977e933c597f64f6e6c9fbed057fa467bf49df669c8bb34a2eca53d8d35576ef88e722aa8a48a6a6a448320a20fd36bf3eb7f407c2c89efb5500f6422877224c77222533915e6b397fbd117f54ccee54275295732936bb9915bb9937b797869ff34e7649ecfe4bd2ce81a8bbc2a4bb2fc5a3dfe2c59915559fb75fdfe8f7affe7f7b97f011cdd9635</data> - </image> - </images> -</ui> diff --git a/examples/activeqt/webbrowser/webbrowser.pro b/examples/activeqt/webbrowser/webbrowser.pro index 9fa342b..0fd36c0 100644 --- a/examples/activeqt/webbrowser/webbrowser.pro +++ b/examples/activeqt/webbrowser/webbrowser.pro @@ -5,7 +5,6 @@ QT += widgets axcontainer HEADERS = webaxwidget.h SOURCES = main.cpp FORMS = mainwindow.ui -wincewm*: FORMS = mainwindow_windowsmobile.ui # install diff --git a/src/activeqt/activeqt.pro b/src/activeqt/activeqt.pro index 752bd21..c1da447 100644 --- a/src/activeqt/activeqt.pro +++ b/src/activeqt/activeqt.pro @@ -3,8 +3,7 @@ win32:!winrt { CONFIG += ordered axshared.file = axshared.prx - SUBDIRS = axshared container - !wince: SUBDIRS += control + SUBDIRS = axshared container control } else { # fake project for creating the documentation TEMPLATE = aux diff --git a/src/activeqt/axshared.prx b/src/activeqt/axshared.prx index 29fe833..6d335e9 100644 --- a/src/activeqt/axshared.prx +++ b/src/activeqt/axshared.prx @@ -7,8 +7,7 @@ MODULE_INCNAME = ActiveQt CONFIG += static QT += gui-private widgets -LIBS_PRIVATE += -lole32 -loleaut32 -!wince*: LIBS_PRIVATE += -luser32 -lgdi32 -ladvapi32 +LIBS_PRIVATE += -lole32 -loleaut32 -luser32 -lgdi32 -ladvapi32 mingw: LIBS_PRIVATE += -luuid HEADERS = \ diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp index d26cd6d..58d59f2 100644 --- a/src/activeqt/container/qaxbase.cpp +++ b/src/activeqt/container/qaxbase.cpp @@ -886,9 +886,6 @@ QAxBase::QAxBase(IUnknown *iface) d->ptr->AddRef(); d->initialized = true; } -#if defined(Q_OS_WINCE) - CoInitializeEx(0, COINIT_MULTITHREADED); -#endif } /*! @@ -898,9 +895,6 @@ QAxBase::QAxBase(IUnknown *iface) */ QAxBase::~QAxBase() { -#if defined(Q_OS_WINCE) - CoUninitialize(); -#endif clear(); @@ -1349,17 +1343,12 @@ bool QAxBase::initializeLicensedHelper(void *f, const QString &key, IUnknown **p */ bool QAxBase::initializeActive(IUnknown** ptr) { -#if defined(Q_OS_WINCE) - Q_UNUSED(ptr); - return false; -#else int at = control().lastIndexOf(QLatin1String("}&")); QString clsid(control().left(at)); GetActiveObject(QUuid(clsid), 0, ptr); return *ptr != 0; -#endif } #ifdef Q_CC_GNU @@ -1380,10 +1369,6 @@ bool QAxBase::initializeActive(IUnknown** ptr) */ bool QAxBase::initializeFromFile(IUnknown** ptr) { -#if defined(Q_OS_WINCE) - Q_UNUSED(ptr); - return false; -#else IStorage *storage = 0; ILockBytes * bytes = 0; HRESULT hres = ::CreateILockBytesOnHGlobal(0, TRUE, &bytes); @@ -1395,7 +1380,6 @@ bool QAxBase::initializeFromFile(IUnknown** ptr) bytes->Release(); return hres == S_OK; -#endif } diff --git a/src/activeqt/container/qaxbase.h b/src/activeqt/container/qaxbase.h index 16e8f50..e406183 100644 --- a/src/activeqt/container/qaxbase.h +++ b/src/activeqt/container/qaxbase.h @@ -160,21 +160,13 @@ private: bool dynamicCallHelper(const char *name, void *out, QList<QVariant> &var, QByteArray &type); }; -#if defined Q_CC_MSVC && _MSC_VER < 1300 -template <> inline QAxBase *qobject_cast_helper<QAxBase*>(const QObject *o, QAxBase *) -#else template <> inline QAxBase *qobject_cast<QAxBase*>(const QObject *o) -#endif { void *result = o ? const_cast<QObject *>(o)->qt_metacast("QAxBase") : 0; return (QAxBase*)(result); } -#if defined Q_CC_MSVC && _MSC_VER < 1300 -template <> inline QAxBase *qobject_cast_helper<QAxBase*>(QObject *o, QAxBase *) -#else template <> inline QAxBase *qobject_cast<QAxBase*>(QObject *o) -#endif { void *result = o ? o->qt_metacast("QAxBase") : 0; return (QAxBase*)(result); diff --git a/src/activeqt/container/qaxobject.h b/src/activeqt/container/qaxobject.h index ceb96ca..2c524dc 100644 --- a/src/activeqt/container/qaxobject.h +++ b/src/activeqt/container/qaxobject.h @@ -68,21 +68,13 @@ private: const QMetaObject *parentMetaObject() const; }; -#if defined Q_CC_MSVC && _MSC_VER < 1300 -template <> inline QAxObject *qobject_cast_helper<QAxObject*>(const QObject *o, QAxObject *) -#else template <> inline QAxObject *qobject_cast<QAxObject*>(const QObject *o) -#endif { void *result = o ? const_cast<QObject *>(o)->qt_metacast("QAxObject") : 0; return (QAxObject*)(result); } -#if defined Q_CC_MSVC && _MSC_VER < 1300 -template <> inline QAxObject *qobject_cast_helper<QAxObject*>(QObject *o, QAxObject *) -#else template <> inline QAxObject *qobject_cast<QAxObject*>(QObject *o) -#endif { void *result = o ? o->qt_metacast("QAxObject") : 0; return (QAxObject*)(result); diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp index 7c3a0a8..1ff6cc0 100644 --- a/src/activeqt/container/qaxwidget.cpp +++ b/src/activeqt/container/qaxwidget.cpp @@ -381,7 +381,6 @@ public: bool eventTranslated : 1; private: -#if !defined(Q_WS_WINCE) struct OleMenuItem { OleMenuItem(HMENU hm = 0, int ID = 0, QMenu *menu = 0) : hMenu(hm), id(ID), subMenu(menu) @@ -391,7 +390,6 @@ private: QMenu *subMenu; }; QMenu *generatePopup(HMENU subMenu, QWidget *parent); -#endif IOleObject *m_spOleObject; IOleControl *m_spOleControl; @@ -406,19 +404,15 @@ private: bool canHostDocument : 1; DWORD m_dwOleObject; -#if !defined(Q_WS_WINCE) HWND m_menuOwner; -#endif CONTROLINFO control_info; QSize sizehint; LONG ref; QAxWidget *widget; QAxHostWidget *host; -#if !defined(Q_WS_WINCE) QPointer<QMenuBar> menuBar; QMap<QAction*,OleMenuItem> menuItemMap; -#endif }; static const ushort mouseTbl[] = { @@ -461,11 +455,7 @@ static Qt::KeyboardModifiers translateModifierState(int s) return bst; } -#if defined(Q_WS_WINCE) -static int filter_ref = 0; -#else static const wchar_t *qaxatom = L"QAxContainer4_Atom"; -#endif // The filter procedure listening to user interaction on the control class QAxNativeEventFilter : public QAbstractNativeEventFilter @@ -552,10 +542,8 @@ QAxClientSite::QAxClientSite(QAxWidget *c) canHostDocument = false; m_dwOleObject = 0; -#if !defined(Q_WS_WINCE) m_menuOwner = 0; menuBar = 0; -#endif memset(&control_info, 0, sizeof(control_info)); } @@ -571,7 +559,6 @@ bool QAxClientSite::activateObject(bool initialized, const QByteArray &data) DWORD dwMiscStatus = 0; m_spOleObject->GetMiscStatus(DVASPECT_CONTENT, &dwMiscStatus); -#if !defined(Q_OS_WINCE) IOleDocument *document = 0; m_spOleObject->QueryInterface(IID_IOleDocument, (void**)&document); if (document) { @@ -595,7 +582,6 @@ bool QAxClientSite::activateObject(bool initialized, const QByteArray &data) } document->Release(); } -#endif if (!canHostDocument) { // activate as control @@ -630,7 +616,6 @@ bool QAxClientSite::activateObject(bool initialized, const QByteArray &data) if (spPS) { HGLOBAL hGlobal = GlobalAlloc(GMEM_MOVEABLE, data.length()); if (hGlobal) { -#if !defined(Q_OS_WINCE) BYTE* pbData = (BYTE*)GlobalLock(hGlobal); if (pbData) memcpy(pbData, data.data(), data.length()); @@ -647,7 +632,6 @@ bool QAxClientSite::activateObject(bool initialized, const QByteArray &data) pLockBytes->Release(); } GlobalFree(hGlobal); -#endif } spPS->Release(); } @@ -1066,9 +1050,7 @@ HRESULT WINAPI QAxClientSite::CanInPlaceActivate() HRESULT WINAPI QAxClientSite::OnInPlaceActivate() { AX_DEBUG(QAxClientSite::OnInPlaceActivate); -#if !defined(Q_OS_WINCE) OleLockRunning(m_spOleObject, true, false); -#endif if (!m_spInPlaceObject) { /* ### disabled for now m_spOleObject->QueryInterface(IID_IOleInPlaceObjectWindowless, (void**) &m_spInPlaceObject); @@ -1134,9 +1116,7 @@ HRESULT WINAPI QAxClientSite::OnInPlaceDeactivate() m_spInPlaceObject->Release(); m_spInPlaceObject = 0; inPlaceObjectWindowless = false; -#if !defined(Q_OS_WINCE) OleLockRunning(m_spOleObject, false, false); -#endif return S_OK; } @@ -1162,11 +1142,6 @@ HRESULT WINAPI QAxClientSite::OnPosRectChange(LPCRECT /*lprcPosRect*/) } //**** IOleInPlaceFrame -#if defined(Q_WS_WINCE) -HRESULT WINAPI QAxClientSite::InsertMenus(HMENU /*hmenuShared*/, LPOLEMENUGROUPWIDTHS /*lpMenuWidths*/) -{ - return E_NOTIMPL; -#else HRESULT WINAPI QAxClientSite::InsertMenus(HMENU /*hmenuShared*/, LPOLEMENUGROUPWIDTHS lpMenuWidths) { AX_DEBUG(QAxClientSite::InsertMenus); @@ -1200,7 +1175,6 @@ HRESULT WINAPI QAxClientSite::InsertMenus(HMENU /*hmenuShared*/, LPOLEMENUGROUPW lpMenuWidths->width[4] = windowMenu->actions().count(); return S_OK; -#endif } static int menuItemEntry(HMENU menu, int index, MENUITEMINFO item, QString &text, QPixmap &/*icon*/) @@ -1237,7 +1211,6 @@ static int menuItemEntry(HMENU menu, int index, MENUITEMINFO item, QString &text return -1; } -#if !defined(Q_OS_WINCE) QMenu *QAxClientSite::generatePopup(HMENU subMenu, QWidget *parent) { QMenu *popup = 0; @@ -1303,13 +1276,7 @@ QMenu *QAxClientSite::generatePopup(HMENU subMenu, QWidget *parent) } return popup; } -#endif -#if defined(Q_OS_WINCE) -HRESULT WINAPI QAxClientSite::SetMenu(HMENU /*hmenuShared*/, HOLEMENU /*holemenu*/, HWND /*hwndActiveObject*/) -{ - return E_NOTIMPL; -#else HRESULT WINAPI QAxClientSite::SetMenu(HMENU hmenuShared, HOLEMENU holemenu, HWND hwndActiveObject) { AX_DEBUG(QAxClientSite::SetMenu); @@ -1388,14 +1355,8 @@ HRESULT WINAPI QAxClientSite::SetMenu(HMENU hmenuShared, HOLEMENU holemenu, HWND OleSetMenuDescriptor(holemenu, widget ? hwndForWidget(widget) : 0, m_menuOwner, this, m_spInPlaceActiveObject); return S_OK; -#endif } -#if defined(Q_OS_WINCE) -int QAxClientSite::qt_metacall(QMetaObject::Call /*call*/, int isignal, void ** /*argv*/) -{ - return isignal; -#else int QAxClientSite::qt_metacall(QMetaObject::Call call, int isignal, void **argv) { if (!m_spOleObject || call != QMetaObject::InvokeMetaMethod || !menuBar) @@ -1411,15 +1372,11 @@ int QAxClientSite::qt_metacall(QMetaObject::Call call, int isignal, void **argv) if (oleItem.hMenu) ::PostMessage(m_menuOwner, WM_COMMAND, oleItem.id, 0); return -1; -#endif } HRESULT WINAPI QAxClientSite::RemoveMenus(HMENU /*hmenuShared*/) { -#if defined(Q_OS_WINCE) - return E_NOTIMPL; -#else AX_DEBUG(QAxClientSite::RemoveMenus); QMap<QAction*, OleMenuItem>::Iterator it; for (it = menuItemMap.begin(); it != menuItemMap.end(); ++it) { @@ -1429,7 +1386,6 @@ HRESULT WINAPI QAxClientSite::RemoveMenus(HMENU /*hmenuShared*/) } menuItemMap.clear(); return S_OK; -#endif } HRESULT WINAPI QAxClientSite::SetStatusText(LPCOLESTR pszStatusText) @@ -2009,23 +1965,14 @@ bool QAxWidget::createHostWindow(bool initialized) */ bool QAxWidget::createHostWindow(bool initialized, const QByteArray &data) { -#ifdef QT3_SUPPORT - QApplication::sendPostedEvents(0, QEvent::ChildInserted); -#endif container = new QAxClientSite(this); container->activateObject(initialized, data); -#if !defined(Q_OS_WINCE) ATOM filter_ref = FindAtom(qaxatom); -#endif if (!filter_ref) QAbstractEventDispatcher::instance()->installNativeEventFilter(s_nativeEventFilter()); -#if !defined(Q_OS_WINCE) AddAtom(qaxatom); -#else - ++filter_ref; -#endif if (parentWidget()) QApplication::postEvent(parentWidget(), new QEvent(QEvent::LayoutRequest)); @@ -2056,17 +2003,12 @@ void QAxWidget::clear() if (isNull()) return; if (!control().isEmpty()) { -#if !defined(Q_OS_WINCE) ATOM filter_ref = FindAtom(qaxatom); if (filter_ref) DeleteAtom(filter_ref); filter_ref = FindAtom(qaxatom); - if (!filter_ref) { -#else - if (!filter_ref && !--filter_ref) { -#endif + if (!filter_ref) QAbstractEventDispatcher::instance()->removeNativeEventFilter(s_nativeEventFilter()); - } } if (container) diff --git a/src/activeqt/container/qaxwidget.h b/src/activeqt/container/qaxwidget.h index 2c8817b..ba0bf98 100644 --- a/src/activeqt/container/qaxwidget.h +++ b/src/activeqt/container/qaxwidget.h @@ -92,21 +92,13 @@ private: const QMetaObject *parentMetaObject() const; }; -#if defined Q_CC_MSVC && _MSC_VER < 1300 -template <> inline QAxWidget *qobject_cast_helper<QAxWidget*>(const QObject *o, QAxWidget *) -#else template <> inline QAxWidget *qobject_cast<QAxWidget*>(const QObject *o) -#endif { void *result = o ? const_cast<QObject *>(o)->qt_metacast("QAxWidget") : 0; return (QAxWidget*)(result); } -#if defined Q_CC_MSVC && _MSC_VER < 1300 -template <> inline QAxWidget *qobject_cast_helper<QAxWidget*>(QObject *o, QAxWidget *) -#else template <> inline QAxWidget *qobject_cast<QAxWidget*>(QObject *o) -#endif { void *result = o ? o->qt_metacast("QAxWidget") : 0; return (QAxWidget*)(result); diff --git a/src/activeqt/control/qaxservermain.cpp b/src/activeqt/control/qaxservermain.cpp index 382ead1..7f24313 100644 --- a/src/activeqt/control/qaxservermain.cpp +++ b/src/activeqt/control/qaxservermain.cpp @@ -177,11 +177,7 @@ bool qax_stopServer() return true; } -#if defined(Q_OS_WINCE) -extern void __cdecl qWinMain(HINSTANCE, HINSTANCE, LPSTR, int, int &, QVector<char *> &); -#else extern void qWinMain(HINSTANCE, HINSTANCE, LPSTR, int, int &, QVector<char *> &); -#endif QT_END_NAMESPACE @@ -189,12 +185,8 @@ QT_END_NAMESPACE int qMain(int, char **); #define main qMain #else -#if defined(Q_OS_WINCE) -extern "C" int __cdecl main(int, char **); -#else extern "C" int main(int, char **); #endif -#endif EXTERN_C int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR, int nShowCmd) diff --git a/src/activeqt/shared/qaxtypefunctions.cpp b/src/activeqt/shared/qaxtypefunctions.cpp index 3dc96f8..1b6ab24 100644 --- a/src/activeqt/shared/qaxtypefunctions.cpp +++ b/src/activeqt/shared/qaxtypefunctions.cpp @@ -188,14 +188,12 @@ void clearVARIANT(VARIANT *var) case VT_UINT|VT_BYREF: delete var->puintVal; break; -#if !defined(Q_OS_WINCE) && defined(_MSC_VER) && _MSC_VER >= 1400 case VT_I8|VT_BYREF: delete var->pllVal; break; case VT_UI8|VT_BYREF: delete var->pullVal; break; -#endif case VT_CY|VT_BYREF: delete var->pcyVal; break; diff --git a/src/activeqt/shared/qaxtypes.cpp b/src/activeqt/shared/qaxtypes.cpp index 364e680..1697686 100644 --- a/src/activeqt/shared/qaxtypes.cpp +++ b/src/activeqt/shared/qaxtypes.cpp @@ -78,10 +78,6 @@ extern void *qax_createObjectWrapper(int metaType, IUnknown *iface); static IFontDisp *QFontToIFont(const QFont &font) { -#if defined(Q_OS_WINCE) - Q_UNUSED(font); - return 0; -#else FONTDESC fdesc; memset(&fdesc, 0, sizeof(fdesc)); fdesc.cbSizeofstruct = sizeof(FONTDESC); @@ -102,7 +98,6 @@ static IFontDisp *QFontToIFont(const QFont &font) #endif } return f; -#endif } static QFont IFontToQFont(IFont *f) @@ -134,10 +129,6 @@ static QFont IFontToQFont(IFont *f) static IPictureDisp *QPixmapToIPicture(const QPixmap &pixmap) { -#if defined(Q_OS_WINCE) - Q_UNUSED(pixmap); - return 0; -#else IPictureDisp *pic = 0; PICTDESC desc; @@ -161,7 +152,6 @@ static IPictureDisp *QPixmapToIPicture(const QPixmap &pixmap) #endif } return pic; -#endif } static QPixmap IPictureToQPixmap(IPicture *ipic) @@ -323,7 +313,6 @@ bool QVariantToVARIANT(const QVariant &var, VARIANT &arg, const QByteArray &type case QVariant::LongLong: if (out && arg.vt == (VT_CY|VT_BYREF)) { arg.pcyVal->int64 = qvar.toLongLong(); -#if !defined(Q_OS_WINCE) && defined(_MSC_VER) && _MSC_VER >= 1400 } else if (out && arg.vt == (VT_I8|VT_BYREF)) { *arg.pllVal = qvar.toLongLong(); } else { @@ -334,22 +323,11 @@ bool QVariantToVARIANT(const QVariant &var, VARIANT &arg, const QByteArray &type arg.vt |= VT_BYREF; } } -#else - } else { - arg.vt = VT_CY; - arg.cyVal.int64 = qvar.toLongLong(); - if (out) { - arg.pcyVal = new CY(arg.cyVal); - arg.vt |= VT_BYREF; - } - } -#endif break; case QVariant::ULongLong: if (out && arg.vt == (VT_CY|VT_BYREF)) { arg.pcyVal->int64 = qvar.toULongLong(); -#if !defined(Q_OS_WINCE) && defined(_MSC_VER) && _MSC_VER >= 1400 } else if (out && arg.vt == (VT_UI8|VT_BYREF)) { *arg.pullVal = qvar.toULongLong(); } else { @@ -360,18 +338,6 @@ bool QVariantToVARIANT(const QVariant &var, VARIANT &arg, const QByteArray &type arg.vt |= VT_BYREF; } } -#else - } else { - arg.vt = VT_CY; - arg.cyVal.int64 = qvar.toULongLong(); - if (out) { - arg.pcyVal = new CY(arg.cyVal); - arg.vt |= VT_BYREF; - } - } - -#endif - break; case QVariant::Bool: @@ -530,13 +496,8 @@ bool QVariantToVARIANT(const QVariant &var, VARIANT &arg, const QByteArray &type pElement = &variant.boolVal; break; case QVariant::LongLong: -#if !defined(Q_OS_WINCE) && defined(_MSC_VER) && _MSC_VER >= 1400 vt = VT_I8; pElement = &variant.llVal; -#else - vt = VT_CY; - pElement = &variant.cyVal; -#endif break; default: break; @@ -921,7 +882,6 @@ QVariant VARIANTToQVariant(const VARIANT &arg, const QByteArray &typeName, uint case VT_CY|VT_BYREF: var = arg.pcyVal->int64; break; -#if !defined(Q_OS_WINCE) && defined(_MSC_VER) && _MSC_VER >= 1400 case VT_I8: var = arg.llVal; break; @@ -934,7 +894,6 @@ QVariant VARIANTToQVariant(const VARIANT &arg, const QByteArray &typeName, uint case VT_UI8|VT_BYREF: var = *arg.pullVal; break; -#endif case VT_R4: var = arg.fltVal; break; @@ -1210,7 +1169,6 @@ QVariant VARIANTToQVariant(const VARIANT &arg, const QByteArray &typeName, uint break; #endif // QAX_SERVER default: -#if !defined(Q_OS_WINCE) // support for any SAFEARRAY(Type) where Type can be converted to a QVariant // -> QVariantList if (arg.vt & VT_ARRAY) { @@ -1238,10 +1196,8 @@ QVariant VARIANTToQVariant(const VARIANT &arg, const QByteArray &typeName, uint case VT_I1: pElement = &variant.cVal; break; case VT_I2: pElement = &variant.iVal; break; case VT_I4: pElement = &variant.lVal; break; -#if defined(_MSC_VER) && _MSC_VER >= 1400 case VT_I8: pElement = &variant.llVal; break; case VT_UI8: pElement = &variant.ullVal; break; -#endif case VT_INT: pElement = &variant.intVal; break; case VT_UI1: Q_ASSERT(false); break; // already covered case VT_UI2: pElement = &variant.uiVal; break; @@ -1274,7 +1230,6 @@ QVariant VARIANTToQVariant(const VARIANT &arg, const QByteArray &typeName, uint var = list; } -#endif break; } |