diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-06 09:38:34 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-06 09:38:34 +0100 |
commit | 36328248309ebebee616452248d55923280deabb (patch) | |
tree | 3aec7576114f445dfe77ee1b59e332cf1f5fdc6c /vcl/unx/generic | |
parent | 4d6b9053a437dc128d186f8d100ef4a351136f54 (diff) |
loplugin:stringconstant: elide explicit ctor usage (automatic rewrite)
Change-Id: I7ac150458a72963f3336d30ef9d99d7c0d81c024
Diffstat (limited to 'vcl/unx/generic')
-rw-r--r-- | vcl/unx/generic/app/i18n_status.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/app/wmadaptor.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/X11_clipboard.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/X11_selection.cxx | 50 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/X11_transferable.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/generic/printer/cupsmgr.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/printer/printerinfomanager.cxx | 6 |
7 files changed, 37 insertions, 37 deletions
diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx index 24e3854a4c32..82fc6774cf6a 100644 --- a/vcl/unx/generic/app/i18n_status.cxx +++ b/vcl/unx/generic/app/i18n_status.cxx @@ -334,7 +334,7 @@ IIIMPStatusWindow::IIIMPStatusWindow( SalFrame* pParent, bool bOn ) : m_bShow( true ), m_bOn( bOn ) { - SetText( OUString( "IME Status" ) ); + SetText( "IME Status" ); layout(); diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx index 300954e89db3..3822d09beaae 100644 --- a/vcl/unx/generic/app/wmadaptor.cxx +++ b/vcl/unx/generic/app/wmadaptor.cxx @@ -880,8 +880,8 @@ bool WMAdaptor::getWMshouldSwitchWorkspace() const pWMA->m_bWMshouldSwitchWorkspace = true; vcl::SettingsConfigItem* pItem = vcl::SettingsConfigItem::get(); - OUString aSetting( pItem->getValue( OUString( "WM" ), - OUString( "ShouldSwitchWorkspace" ) ) ); + OUString aSetting( pItem->getValue( "WM", + "ShouldSwitchWorkspace" ) ); if( aSetting.isEmpty() ) { if( m_aWMName == "awesome" ) diff --git a/vcl/unx/generic/dtrans/X11_clipboard.cxx b/vcl/unx/generic/dtrans/X11_clipboard.cxx index 0ec568fadd4c..498374287ed7 100644 --- a/vcl/unx/generic/dtrans/X11_clipboard.cxx +++ b/vcl/unx/generic/dtrans/X11_clipboard.cxx @@ -71,7 +71,7 @@ X11Clipboard::create( SelectionManager& rManager, Atom aSelection ) else { rManager.registerHandler( XA_PRIMARY, *cb.get() ); - rManager.registerHandler( rManager.getAtom( OUString("CLIPBOARD") ), *cb.get() ); + rManager.registerHandler( rManager.getAtom( "CLIPBOARD" ), *cb.get() ); } return cb.get(); } @@ -88,7 +88,7 @@ X11Clipboard::~X11Clipboard() else { m_rSelectionManager.deregisterHandler( XA_PRIMARY ); - m_rSelectionManager.deregisterHandler( m_rSelectionManager.getAtom( OUString("CLIPBOARD") ) ); + m_rSelectionManager.deregisterHandler( m_rSelectionManager.getAtom( "CLIPBOARD" ) ); } } @@ -164,7 +164,7 @@ void SAL_CALL X11Clipboard::setContents( else { m_rSelectionManager.requestOwnership( XA_PRIMARY ); - m_rSelectionManager.requestOwnership( m_rSelectionManager.getAtom( OUString("CLIPBOARD") ) ); + m_rSelectionManager.requestOwnership( m_rSelectionManager.getAtom( "CLIPBOARD" ) ); } // notify old owner on loss of ownership diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index 427cb67a2c02..c42ca79ff33e 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -362,34 +362,34 @@ void SelectionManager::initialize( const Sequence< Any >& arguments ) throw (::c XSynchronize( m_pDisplay, True ); #endif // clipboard selection - m_nCLIPBOARDAtom = getAtom( OUString("CLIPBOARD") ); + m_nCLIPBOARDAtom = getAtom( "CLIPBOARD" ); // special targets - m_nTARGETSAtom = getAtom( OUString("TARGETS") ); - m_nTIMESTAMPAtom = getAtom( OUString("TIMESTAMP") ); - m_nTEXTAtom = getAtom( OUString("TEXT") ); - m_nINCRAtom = getAtom( OUString("INCR") ); - m_nCOMPOUNDAtom = getAtom( OUString("COMPOUND_TEXT") ); - m_nMULTIPLEAtom = getAtom( OUString("MULTIPLE") ); - m_nUTF16Atom = getAtom( OUString("ISO10646-1") ); - m_nImageBmpAtom = getAtom( OUString("image/bmp") ); + m_nTARGETSAtom = getAtom( "TARGETS" ); + m_nTIMESTAMPAtom = getAtom( "TIMESTAMP" ); + m_nTEXTAtom = getAtom( "TEXT" ); + m_nINCRAtom = getAtom( "INCR" ); + m_nCOMPOUNDAtom = getAtom( "COMPOUND_TEXT" ); + m_nMULTIPLEAtom = getAtom( "MULTIPLE" ); + m_nUTF16Atom = getAtom( "ISO10646-1" ); + m_nImageBmpAtom = getAtom( "image/bmp" ); // Atoms for Xdnd protocol - m_nXdndAware = getAtom( OUString("XdndAware") ); - m_nXdndEnter = getAtom( OUString("XdndEnter") ); - m_nXdndLeave = getAtom( OUString("XdndLeave") ); - m_nXdndPosition = getAtom( OUString("XdndPosition") ); - m_nXdndStatus = getAtom( OUString("XdndStatus") ); - m_nXdndDrop = getAtom( OUString("XdndDrop") ); - m_nXdndFinished = getAtom( OUString("XdndFinished") ); - m_nXdndSelection = getAtom( OUString("XdndSelection") ); - m_nXdndTypeList = getAtom( OUString("XdndTypeList") ); - m_nXdndProxy = getAtom( OUString("XdndProxy") ); - m_nXdndActionCopy = getAtom( OUString("XdndActionCopy") ); - m_nXdndActionMove = getAtom( OUString("XdndActionMove") ); - m_nXdndActionLink = getAtom( OUString("XdndActionLink") ); - m_nXdndActionAsk = getAtom( OUString("XdndActionAsk") ); - m_nXdndActionPrivate= getAtom( OUString("XdndActionPrivate") ); + m_nXdndAware = getAtom( "XdndAware" ); + m_nXdndEnter = getAtom( "XdndEnter" ); + m_nXdndLeave = getAtom( "XdndLeave" ); + m_nXdndPosition = getAtom( "XdndPosition" ); + m_nXdndStatus = getAtom( "XdndStatus" ); + m_nXdndDrop = getAtom( "XdndDrop" ); + m_nXdndFinished = getAtom( "XdndFinished" ); + m_nXdndSelection = getAtom( "XdndSelection" ); + m_nXdndTypeList = getAtom( "XdndTypeList" ); + m_nXdndProxy = getAtom( "XdndProxy" ); + m_nXdndActionCopy = getAtom( "XdndActionCopy" ); + m_nXdndActionMove = getAtom( "XdndActionMove" ); + m_nXdndActionLink = getAtom( "XdndActionLink" ); + m_nXdndActionAsk = getAtom( "XdndActionAsk" ); + m_nXdndActionPrivate= getAtom( "XdndActionPrivate" ); // initialize map with member none m_aAtomToString[ 0 ]= "None"; @@ -827,7 +827,7 @@ void SelectionManager::getNativeTypeList( const Sequence< DataFlavor >& rTypes, rOutTypeList.push_front( XA_STRING ); rOutTypeList.push_front( m_nCOMPOUNDAtom ); } - convertTypeToNative( OUString("text/plain;charset=utf-8"), targetselection, nFormat, rOutTypeList, true ); + convertTypeToNative( "text/plain;charset=utf-8", targetselection, nFormat, rOutTypeList, true ); } if( targetselection != m_nXdndSelection ) rOutTypeList.push_back( m_nMULTIPLEAtom ); diff --git a/vcl/unx/generic/dtrans/X11_transferable.cxx b/vcl/unx/generic/dtrans/X11_transferable.cxx index 45a38cd1c8e9..9bd683da0874 100644 --- a/vcl/unx/generic/dtrans/X11_transferable.cxx +++ b/vcl/unx/generic/dtrans/X11_transferable.cxx @@ -50,7 +50,7 @@ Any SAL_CALL X11Transferable::getTransferData( const DataFlavor& rFlavor ) Sequence< sal_Int8 > aData; bool bSuccess = m_rManager.getPasteData( m_aSelection ? m_aSelection : XA_PRIMARY, rFlavor.MimeType, aData ); if( ! bSuccess && m_aSelection == 0 ) - bSuccess = m_rManager.getPasteData( m_rManager.getAtom( OUString("CLIPBOARD") ), rFlavor.MimeType, aData ); + bSuccess = m_rManager.getPasteData( m_rManager.getAtom( "CLIPBOARD" ), rFlavor.MimeType, aData ); if( ! bSuccess ) { @@ -76,7 +76,7 @@ Sequence< DataFlavor > SAL_CALL X11Transferable::getTransferDataFlavors() Sequence< DataFlavor > aFlavorList; bool bSuccess = m_rManager.getPasteDataTypes( m_aSelection ? m_aSelection : XA_PRIMARY, aFlavorList ); if( ! bSuccess && m_aSelection == 0 ) - m_rManager.getPasteDataTypes( m_rManager.getAtom( OUString("CLIPBOARD") ), aFlavorList ); + m_rManager.getPasteDataTypes( m_rManager.getAtom( "CLIPBOARD" ), aFlavorList ); return aFlavorList; } diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx index 67d6da55b98a..5d171d8bb64d 100644 --- a/vcl/unx/generic/printer/cupsmgr.cxx +++ b/vcl/unx/generic/printer/cupsmgr.cxx @@ -491,7 +491,7 @@ const PPDParser* CUPSManager::createCUPSParser( const OUString& rPrinter ) if( ! pNewParser ) { // get the default PPD - pNewParser = PPDParser::getParser( OUString( "SGENPRT" ) ); + pNewParser = PPDParser::getParser( "SGENPRT" ); PrinterInfo& rInfo = m_aPrinters[ aPrinter ].m_aInfo; diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index 9018b5152c66..e4ddbc8d3ba6 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -194,7 +194,7 @@ void PrinterInfoManager::initialize() m_aGlobalDefaults = PrinterInfo(); // need a parser for the PPDContext. generic printer should do. - m_aGlobalDefaults.m_pParser = PPDParser::getParser( OUString( "SGENPRT" ) ); + m_aGlobalDefaults.m_pParser = PPDParser::getParser( "SGENPRT" ); m_aGlobalDefaults.m_aContext.setParser( m_aGlobalDefaults.m_pParser ); if( ! m_aGlobalDefaults.m_pParser ) @@ -211,7 +211,7 @@ void PrinterInfoManager::initialize() for( print_dir_it = aDirList.begin(); print_dir_it != aDirList.end(); ++print_dir_it ) { INetURLObject aFile( *print_dir_it, INetProtocol::File, INetURLObject::ENCODE_ALL ); - aFile.Append( OUString( PRINT_FILENAME ) ); + aFile.Append( PRINT_FILENAME ); Config aConfig( aFile.PathToFileName() ); if( aConfig.HasGroup( GLOBAL_DEFAULTS_GROUP ) ) { @@ -279,7 +279,7 @@ void PrinterInfoManager::initialize() { INetURLObject aDir( *print_dir_it, INetProtocol::File, INetURLObject::ENCODE_ALL ); INetURLObject aFile( aDir ); - aFile.Append( OUString( PRINT_FILENAME ) ); + aFile.Append( PRINT_FILENAME ); // check directory validity OUString aUniPath; |