diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:21:44 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:21:44 -0600 |
commit | 44c7446efdcf042874a29fe211668da154051c2c (patch) | |
tree | df7c57513bfaaff9cb22deab15ad304205ad8f67 /tdenetworkmanager/src/main.cpp | |
parent | ff09977c014efe5dda4794bdd0005f256ff7929d (diff) | |
download | tdenetworkmanager-44c7446efdcf042874a29fe211668da154051c2c.tar.gz tdenetworkmanager-44c7446efdcf042874a29fe211668da154051c2c.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tdenetworkmanager/src/main.cpp')
-rw-r--r-- | tdenetworkmanager/src/main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tdenetworkmanager/src/main.cpp b/tdenetworkmanager/src/main.cpp index 51811f6..d7ff137 100644 --- a/tdenetworkmanager/src/main.cpp +++ b/tdenetworkmanager/src/main.cpp @@ -61,12 +61,12 @@ kdemain (int argc, char* argv[]) TDENetworkManager app; app.disableSessionManagement(); - if (!KGlobal::hardwareDevices()) { - printf("[ERROR] Unable to load tdenetworkmanager due to invalid KGlobal::hardwareDevices() object\n\r"); fflush(stdout); + if (!TDEGlobal::hardwareDevices()) { + printf("[ERROR] Unable to load tdenetworkmanager due to invalid TDEGlobal::hardwareDevices() object\n\r"); fflush(stdout); return -1; } - if (!KGlobal::networkManager()) { - printf("[ERROR] Unable to load tdenetworkmanager due to invalid KGlobal::hardwareDevices() object\n\r"); fflush(stdout); + if (!TDEGlobal::networkManager()) { + printf("[ERROR] Unable to load tdenetworkmanager due to invalid TDEGlobal::hardwareDevices() object\n\r"); fflush(stdout); return -1; } |