VirtualBox

Changeset 54637 in vbox for trunk/src/VBox


Ignore:
Timestamp:
Mar 4, 2015 10:17:48 PM (10 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
98784
Message:

FE/Qt: Reverting r98781, r98782, r98783 as x11 still not happy enough.

Location:
trunk/src/VBox/Frontends/VirtualBox/src
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.cpp

    r54634 r54637  
    2121
    2222/* Qt includes: */
    23 # include <QSocketNotifier>
    24 
    25 /* GUI includes: */
     23# include <QObject>
     24
     25/* COM includes: */
    2626# include "COMDefs.h"
    27 
    28 /* COM includes: */
     27# include "UIDefs.h"
    2928# include "CVirtualBoxErrorInfo.h"
    3029
    3130#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
    3231
    33 /* VirtualBox interface declarations: */
    34 #ifndef VBOX_WITH_XPCOM
    35 # include "VirtualBox.h"
    36 #else /* !VBOX_WITH_XPCOM */
    37 # include "VirtualBox_XPCOM.h"
    38 #endif /* VBOX_WITH_XPCOM */
    39 
    40 /* Other VBox includes: */
    41 #include <iprt/log.h>
     32#include <QSocketNotifier>
    4233
    4334#ifdef VBOX_WITH_XPCOM

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.h

    r54636 r54637  
    9898#endif /* !defined(VBOX_WITH_XPCOM) */
    9999
     100
     101/* VirtualBox interfaces declarations */
     102#if !defined(VBOX_WITH_XPCOM)
     103    #include <VirtualBox.h>
     104#else /* !defined(VBOX_WITH_XPCOM) */
     105    #include <VirtualBox_XPCOM.h>
     106#endif /* !defined(VBOX_WITH_XPCOM) */
     107
    100108/////////////////////////////////////////////////////////////////////////////
    101109
    … …  
    629637        clear();
    630638        mIface = that.mIface;
    631         this->addref((IUnknown*)ptr());
     639        this->addref(ptr());
    632640    }
    633641
    … …  
    636644        clear();
    637645        setPtr(aIface);
    638         this->addref((IUnknown*)aIface);
     646        this->addref(aIface);
    639647    }
    640648
    … …  
    689697        /* be aware of self assignment */
    690698        I* amIface = ptr();
    691         this->addref((IUnknown*)aIface);
    692         this->release((IUnknown*)amIface);
     699        this->addref(aIface);
     700        this->release(amIface);
    693701        if (aIface)
    694702        {
    695703            amIface = NULL;
    696704            B::mRC = aIface->QueryInterface(COM_IIDOF(I), (void **)&amIface);
    697             this->release((IUnknown*)aIface);
     705            this->release(aIface);
    698706            setPtr(amIface);
    699707        }
    … …  
    712720#endif
    713721        /* be aware of self assignment */
    714         this->addref((IUnknown*)aIface);
    715         this->release((IUnknown*)ptr());
     722        this->addref(aIface);
     723        this->release(ptr());
    716724        setPtr(aIface);
    717725        B::mRC = S_OK;
    … …  
    724732       Assert(!mDead);
    725733#endif
    726        this->release((IUnknown*)ptr());
     734       this->release(ptr());
    727735       setPtr(NULL);
    728736    }

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/COMWrappers.xsl

    r54634 r54637  
    239239    <xsl:text> * Generator : src/VBox/Frontends/VirtualBox/include/COMWrappers.xsl&#x0A;</xsl:text>
    240240    <xsl:text> */&#x0A;&#x0A;</xsl:text>
    241     <xsl:text>/* VirtualBox interface declarations: */&#x0A;</xsl:text>
    242     <xsl:text>#ifndef VBOX_WITH_XPCOM&#x0A;</xsl:text>
    243     <xsl:text># include "VirtualBox.h"&#x0A;</xsl:text>
    244     <xsl:text>#else /* !VBOX_WITH_XPCOM */&#x0A;</xsl:text>
    245     <xsl:text># include "VirtualBox_XPCOM.h"&#x0A;</xsl:text>
    246     <xsl:text>#endif /* VBOX_WITH_XPCOM */&#x0A;&#x0A;</xsl:text>
    247241    <xsl:text>/* COM includes: */&#x0A;</xsl:text>
    248242    <xsl:text>#include "COMEnums.h"&#x0A;</xsl:text>
    … …  
    301295    <xsl:text>&#x0A;</xsl:text>
    302296
    303     <!-- Interface forward declaration: -->
    304     <xsl:text>/* Interface forward declaration: */&#x0A;</xsl:text>
    305     <xsl:text>struct I</xsl:text>
    306     <xsl:value-of select="substring(@name,2)"/>
    307     <xsl:text>;&#x0A;&#x0A;</xsl:text>
    308 
    309     <!-- Interface wrapper declaration: -->
    310     <xsl:text>/* Interface wrapper declaration: */&#x0A;</xsl:text>
     297    <!-- Interface declaration: -->
     298    <xsl:text>/* Interface declaration: */&#x0A;</xsl:text>
    311299    <xsl:text>class C</xsl:text>
    312300    <xsl:value-of select="substring(@name,2)"/>
    … …  
    342330    <xsl:text>Q_DECLARE_METATYPE(</xsl:text>
    343331    <xsl:value-of select="concat('C',substring(@name,2))"/>
    344     <xsl:text>);&#x0A;&#x0A;</xsl:text>
     332    <xsl:text>)&#x0A;&#x0A;</xsl:text>
    345333
    346334    <!-- Declare safe-array -->
    … …  
    478466  <xsl:text>    C</xsl:text>
    479467  <xsl:value-of select="substring(@name,2)"/>
    480   <xsl:text>();&#x0A;</xsl:text>
    481   <!-- default destructor -->
    482   <xsl:text>    ~C</xsl:text>
    483   <xsl:value-of select="substring(@name,2)"/>
    484   <xsl:text>();&#x0A;&#x0A;</xsl:text>
     468  <xsl:text>() {}&#x0A;&#x0A;</xsl:text>
    485469  <!-- constructor taking CWhatever -->
    486470  <xsl:text>    template&lt;class OI, class OB&gt; explicit C</xsl:text>
    … …  
    502486  <xsl:text>(const C</xsl:text>
    503487  <xsl:value-of select="substring(@name,2)"/>
    504   <xsl:text> &amp; that);&#x0A;&#x0A;</xsl:text>
     488  <xsl:text> &amp; that) : Base(that) {}&#x0A;&#x0A;</xsl:text>
    505489  <!-- constructor taking a raw iface pointer -->
    506490  <xsl:text>    template&lt;class OI&gt; explicit C</xsl:text>
    … …  
    512496  <xsl:text>(</xsl:text>
    513497  <xsl:value-of select="@name"/>
    514   <xsl:text> * aIface);&#x0A;&#x0A;</xsl:text>
     498  <xsl:text> * aIface) : Base(aIface) {}&#x0A;&#x0A;</xsl:text>
    515499  <!-- assignment taking CWhatever -->
    516500  <xsl:text>    template&lt;class OI, class OB&gt; C</xsl:text>
    … …  
    533517  <xsl:text> &amp; operator=(const C</xsl:text>
    534518  <xsl:value-of select="substring(@name,2)"/>
    535 <xsl:text> &amp; that);&#x0A;</xsl:text>
     519<xsl:text> &amp; that)
     520    {
     521        Base::operator=(that);
     522        return *this;
     523    }
     524</xsl:text>
    536525  <xsl:text>&#x0A;</xsl:text>
    537526  <!-- assignment taking a raw iface pointer -->
    … …  
    550539  <xsl:text> &amp; operator=(</xsl:text>
    551540  <xsl:value-of select="@name"/>
    552 <xsl:text> * aIface);&#x0A;</xsl:text>
     541<xsl:text> * aIface)
     542    {
     543        Base::operator=(aIface);
     544        return *this;
     545    }
     546</xsl:text>
    553547  <xsl:text>&#x0A;</xsl:text>
    554548
    … …  
    661655</xsl:template>
    662656
    663 <xsl:template name="defineConstructors">
    664 
    665   <!-- default constructor -->
    666   <xsl:text>C</xsl:text>
    667   <xsl:value-of select="substring(@name,2)"/>
    668   <xsl:text>::C</xsl:text>
    669   <xsl:value-of select="substring(@name,2)"/>
    670   <xsl:text>() {}&#x0A;&#x0A;</xsl:text>
    671 
    672   <!-- default destructor -->
    673   <xsl:text>C</xsl:text>
    674   <xsl:value-of select="substring(@name,2)"/>
    675   <xsl:text>::~C</xsl:text>
    676   <xsl:value-of select="substring(@name,2)"/>
    677   <xsl:text>() {}&#x0A;&#x0A;</xsl:text>
    678 
    679   <!-- copy constructor -->
    680   <xsl:text>C</xsl:text>
    681   <xsl:value-of select="substring(@name,2)"/>
    682   <xsl:text>::C</xsl:text>
    683   <xsl:value-of select="substring(@name,2)"/>
    684   <xsl:text>(const C</xsl:text>
    685   <xsl:value-of select="substring(@name,2)"/>
    686   <xsl:text> &amp;that) : Base(that) {}&#x0A;&#x0A;</xsl:text>
    687 
    688   <!-- copy constructor taking interface pointer -->
    689   <xsl:text>C</xsl:text>
    690   <xsl:value-of select="substring(@name,2)"/>
    691   <xsl:text>::C</xsl:text>
    692   <xsl:value-of select="substring(@name,2)"/>
    693   <xsl:text>(</xsl:text>
    694   <xsl:value-of select="@name"/>
    695   <xsl:text> *pIface) : Base(pIface) {}&#x0A;&#x0A;</xsl:text>
    696 
    697   <!-- operator= -->
    698   <xsl:text>C</xsl:text>
    699   <xsl:value-of select="substring(@name,2)"/>
    700   <xsl:text>&amp; </xsl:text>
    701   <xsl:text>C</xsl:text>
    702   <xsl:value-of select="substring(@name,2)"/>
    703   <xsl:text>::operator=(const C</xsl:text>
    704   <xsl:value-of select="substring(@name,2)"/>
    705 <xsl:text> &amp;that)
    706 {
    707     Base::operator=(that);
    708     return *this;
    709 }
    710 </xsl:text>
    711   <xsl:text>&#x0A;</xsl:text>
    712 
    713   <!-- operator= taking interface pointer -->
    714   <xsl:text>C</xsl:text>
    715   <xsl:value-of select="substring(@name,2)"/>
    716   <xsl:text>&amp; </xsl:text>
    717   <xsl:text>C</xsl:text>
    718   <xsl:value-of select="substring(@name,2)"/>
    719   <xsl:text>::operator=(</xsl:text>
    720   <xsl:value-of select="@name"/>
    721 <xsl:text> *pIface)
    722 {
    723     Base::operator=(pIface);
    724     return *this;
    725 }
    726 </xsl:text>
    727   <xsl:text>&#x0A;</xsl:text>
    728 
    729 </xsl:template>
    730 
    731657<xsl:template name="defineAttributes">
    732658
    … …  
    968894
    969895<xsl:template name="defineMembers">
    970   <xsl:call-template name="defineConstructors">
    971     <xsl:with-param name="iface" select="."/>
    972   </xsl:call-template>
    973896  <xsl:call-template name="defineAttributes">
    974897    <xsl:with-param name="iface" select="."/>

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

    r54634 r54637  
    134134
    135135#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
    136 
    137 /* VirtualBox interface declarations: */
    138 #ifndef VBOX_WITH_XPCOM
    139 # include "VirtualBox.h"
    140 #else /* !VBOX_WITH_XPCOM */
    141 # include "VirtualBox_XPCOM.h"
    142 #endif /* VBOX_WITH_XPCOM */
    143136
    144137#include <QLibraryInfo>

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp

    r54635 r54637  
    4646#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
    4747
    48 /* VirtualBox interface declarations: */
    49 #ifndef VBOX_WITH_XPCOM
    50 # include "VirtualBox.h"
    51 #else /* !VBOX_WITH_XPCOM */
    52 # include "VirtualBox_XPCOM.h"
    53 #endif /* VBOX_WITH_XPCOM */
    54 
    5548/* Other VBox includes: */
    5649#include <iprt/critsect.h>

  • trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.cpp

    r54634 r54637  
    4141#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
    4242
    43 /* VirtualBox interface declarations: */
    44 #ifndef VBOX_WITH_XPCOM
    45 # include "VirtualBox.h"
    46 #else /* !VBOX_WITH_XPCOM */
    47 # include "VirtualBox_XPCOM.h"
    48 #endif /* VBOX_WITH_XPCOM */
    4943
    5044UIGMachinePreview::UIGMachinePreview(QIGraphicsWidget *pParent)

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp

    r54634 r54637  
    4242# include "CUSBDeviceFilter.h"
    4343# include "CHostUSBDevice.h"
    44 # include "CHostUSBDeviceFilter.h"
    4544# include "CExtPackManager.h"
    4645# include "CExtPack.h"
    … …  
    4847#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
    4948
    50 /* VirtualBox interface declarations: */
    51 #ifndef VBOX_WITH_XPCOM
    52 # include "VirtualBox.h"
    53 #else /* !VBOX_WITH_XPCOM */
    54 # include "VirtualBox_XPCOM.h"
    55 #endif /* VBOX_WITH_XPCOM */
     49#include "CHostUSBDeviceFilter.h"
    5650
    5751

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

    r54634 r54637  
    3939#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
    4040
    41 /* VirtualBox interface declarations: */
    42 #ifndef VBOX_WITH_XPCOM
    43 # include "VirtualBox.h"
    44 #else /* !VBOX_WITH_XPCOM */
    45 # include "VirtualBox_XPCOM.h"
    46 #endif /* VBOX_WITH_XPCOM */
    4741
    4842/* Namespaces: */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic3.cpp

    r54634 r54637  
    3939#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
    4040
    41 /* VirtualBox interface declarations: */
    42 #ifndef VBOX_WITH_XPCOM
    43 # include "VirtualBox.h"
    44 #else /* !VBOX_WITH_XPCOM */
    45 # include "VirtualBox_XPCOM.h"
    46 #endif /* VBOX_WITH_XPCOM */
    4741
    4842UIWizardNewVMPage3::UIWizardNewVMPage3()
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette